xonotic/xonotic-maps.pk3dir.git
11 years agoi don't think glow maps are supposed to have alpha in them? (make the bg black instea...
FruitieX [Sat, 23 Oct 2010 09:35:42 +0000 (12:35 +0300)]
i don't think glow maps are supposed to have alpha in them? (make the bg black instead), also one gloss texture seems a bit weird => attempt fix

11 years agomisc improvements on runningmanctf
FruitieX [Sat, 23 Oct 2010 09:32:22 +0000 (12:32 +0300)]
misc improvements on runningmanctf

11 years agoMerge branch 'master' into fruitiex/runningmanctf
FruitieX [Sat, 23 Oct 2010 09:19:29 +0000 (12:19 +0300)]
Merge branch 'master' into fruitiex/runningmanctf

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/glowplant'
Rudolf Polzer [Fri, 22 Oct 2010 20:50:23 +0000 (22:50 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/glowplant'

11 years agoMap "Dance"
Rudolf Polzer [Fri, 22 Oct 2010 20:31:23 +0000 (22:31 +0200)]
Map "Dance"

11 years agoplayerclip the floor on the top of glowarena, it is ANNOYING to bump into those edges...
FruitieX [Fri, 22 Oct 2010 18:04:20 +0000 (21:04 +0300)]
playerclip the floor on the top of glowarena, it is ANNOYING to bump into those edges/ramps

11 years agoMerge branch 'master' into fruitiex/runningmanctf
FruitieX [Fri, 22 Oct 2010 17:14:17 +0000 (20:14 +0300)]
Merge branch 'master' into fruitiex/runningmanctf

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/waypoints'
Rudolf Polzer [Fri, 22 Oct 2010 16:03:05 +0000 (18:03 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/waypoints'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/stormkeepjumppadfix'
Rudolf Polzer [Fri, 22 Oct 2010 16:02:20 +0000 (18:02 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/stormkeepjumppadfix'

11 years agowarn texture on the strength pad
FruitieX [Fri, 22 Oct 2010 14:38:09 +0000 (17:38 +0300)]
warn texture on the strength pad

11 years agorotate the jumppad effect 180 degrees, it was moving down instead of up!
FruitieX [Fri, 22 Oct 2010 14:36:21 +0000 (17:36 +0300)]
rotate the jumppad effect 180 degrees, it was moving down instead of up!

11 years agoconvert mapinfo to new format
Rudolf Polzer [Fri, 22 Oct 2010 14:10:53 +0000 (16:10 +0200)]
convert mapinfo to new format

11 years agoMerge remote branch 'origin/fruitiex/glowplantdompoints'
Rudolf Polzer [Fri, 22 Oct 2010 14:10:00 +0000 (16:10 +0200)]
Merge remote branch 'origin/fruitiex/glowplantdompoints'

11 years agoremove extra quotes
FruitieX [Fri, 22 Oct 2010 13:29:41 +0000 (16:29 +0300)]
remove extra quotes

11 years agoadd kh and rune to g-23.mapinfo
FruitieX [Fri, 22 Oct 2010 13:25:15 +0000 (16:25 +0300)]
add kh and rune to g-23.mapinfo

11 years agoDOM points for glowplant
FruitieX [Fri, 22 Oct 2010 13:21:48 +0000 (16:21 +0300)]
DOM points for glowplant

11 years agoadd arena to glowplant, tdm to stormkeep
FruitieX [Fri, 22 Oct 2010 12:51:50 +0000 (15:51 +0300)]
add arena to glowplant, tdm to stormkeep

11 years agothree more rebuilds to fix the sampling
Rudolf Polzer [Fri, 22 Oct 2010 10:19:23 +0000 (12:19 +0200)]
three more rebuilds to fix the sampling

11 years agoalso bump stormkeep for randomsamples
Rudolf Polzer [Fri, 22 Oct 2010 07:37:49 +0000 (09:37 +0200)]
also bump stormkeep for randomsamples

11 years agowe no longer need explicit samples options, as I changed the default to use randomsam...
Rudolf Polzer [Fri, 22 Oct 2010 07:29:25 +0000 (09:29 +0200)]
we no longer need explicit samples options, as I changed the default to use randomsamples.

11 years agobot waypoints for glowplant
FruitieX [Thu, 21 Oct 2010 20:04:37 +0000 (23:04 +0300)]
bot waypoints for glowplant

11 years agobot waypoints and rtlights for stormkeep stolen from alienTRAP
FruitieX [Thu, 21 Oct 2010 19:43:18 +0000 (22:43 +0300)]
bot waypoints and rtlights for stormkeep stolen from alienTRAP

11 years agoremove stupid markers again
Rudolf Polzer [Thu, 21 Oct 2010 18:22:50 +0000 (20:22 +0200)]
remove stupid markers again

11 years agofix typo
FruitieX [Thu, 21 Oct 2010 17:24:41 +0000 (20:24 +0300)]
fix typo

11 years agolet's try something interesting: moving the warpzone glowy effect out a bit
FruitieX [Thu, 21 Oct 2010 16:59:19 +0000 (19:59 +0300)]
let's try something interesting: moving the warpzone glowy effect out a bit

11 years agojumppad models on stormkeep
FruitieX [Thu, 21 Oct 2010 16:58:22 +0000 (19:58 +0300)]
jumppad models on stormkeep

11 years agoMerge remote branch 'origin/fruitiex/stormkeepsounds'
Rudolf Polzer [Thu, 21 Oct 2010 16:31:35 +0000 (18:31 +0200)]
Merge remote branch 'origin/fruitiex/stormkeepsounds'

11 years agofix a sound path (desertfactory => wind)
FruitieX [Thu, 21 Oct 2010 16:30:47 +0000 (19:30 +0300)]
fix a sound path (desertfactory => wind)

11 years agosounds/ -> sound/
Rudolf Polzer [Thu, 21 Oct 2010 16:30:37 +0000 (18:30 +0200)]
sounds/ -> sound/

11 years agoMerge remote branch 'origin/fruitiex/g-23sounds'
Rudolf Polzer [Thu, 21 Oct 2010 16:29:55 +0000 (18:29 +0200)]
Merge remote branch 'origin/fruitiex/g-23sounds'

11 years agoMerge remote branch 'origin/fruitiex/glowplant'
Rudolf Polzer [Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)]
Merge remote branch 'origin/fruitiex/glowplant'

11 years agoMerge branch 'master' into fruitiex/glowplant
FruitieX [Thu, 21 Oct 2010 16:26:54 +0000 (19:26 +0300)]
Merge branch 'master' into fruitiex/glowplant

11 years agoadd type ca to stormkeep (not too sound-related, but i'm too lazy to create a separat...
FruitieX [Thu, 21 Oct 2010 16:26:15 +0000 (19:26 +0300)]
add type ca to stormkeep (not too sound-related, but i'm too lazy to create a separate branch)

11 years agoMerge branch 'master' into fruitiex/stormkeepsounds
FruitieX [Thu, 21 Oct 2010 16:24:34 +0000 (19:24 +0300)]
Merge branch 'master' into fruitiex/stormkeepsounds

11 years agoMerge branch 'master' into fruitiex/g-23sounds
Rudolf Polzer [Thu, 21 Oct 2010 16:16:43 +0000 (18:16 +0200)]
Merge branch 'master' into fruitiex/g-23sounds

Conflicts:
maps/g-23.map

11 years agonew .gitattributes file, and remove // comments from all .map files (done automatical...
Rudolf Polzer [Thu, 21 Oct 2010 16:08:59 +0000 (18:08 +0200)]
new .gitattributes file, and remove // comments from all .map files (done automatically in the future); this will trigger a recompile avalanche

11 years agoMerge branch 'master' into fruitiex/runningmanctf
Rudolf Polzer [Thu, 21 Oct 2010 11:29:57 +0000 (13:29 +0200)]
Merge branch 'master' into fruitiex/runningmanctf

Conflicts:
sound/wind/WindDesert-Loop.wav
sounds/wind/WindDesert-Loop.WAV
sounds/wind/WindDesert-Loop.wav

11 years agobump g-23 map compile to make sure
Rudolf Polzer [Thu, 21 Oct 2010 11:15:13 +0000 (13:15 +0200)]
bump g-23 map compile to make sure

11 years agoWAV -> wav
Rudolf Polzer [Thu, 21 Oct 2010 11:14:26 +0000 (13:14 +0200)]
WAV -> wav

11 years agog-23: use sound/
Rudolf Polzer [Thu, 21 Oct 2010 09:50:50 +0000 (11:50 +0200)]
g-23: use sound/

11 years agochange sounds/ to sound/
Rudolf Polzer [Thu, 21 Oct 2010 09:50:17 +0000 (11:50 +0200)]
change sounds/ to sound/

11 years agoget rid of ADPCM encoding in some wav files that oggenc cannot handle
Rudolf Polzer [Thu, 21 Oct 2010 09:49:26 +0000 (11:49 +0200)]
get rid of ADPCM encoding in some wav files that oggenc cannot handle

11 years agocorrect sound paths on stormkeep
FruitieX [Wed, 20 Oct 2010 18:25:50 +0000 (21:25 +0300)]
correct sound paths on stormkeep

11 years agotarget_speakers and other misc sounds
FruitieX [Wed, 20 Oct 2010 18:17:36 +0000 (21:17 +0300)]
target_speakers and other misc sounds

11 years agoambient sound on glowplant, also make the sand look less weird on stairs
FruitieX [Wed, 20 Oct 2010 18:00:31 +0000 (21:00 +0300)]
ambient sound on glowplant, also make the sand look less weird on stairs

11 years agoadd some target_speakers
FruitieX [Wed, 20 Oct 2010 17:38:05 +0000 (20:38 +0300)]
add some target_speakers

11 years agoMerge branch 'master' into fruitiex/runningmanctf
FruitieX [Wed, 20 Oct 2010 17:24:36 +0000 (20:24 +0300)]
Merge branch 'master' into fruitiex/runningmanctf

11 years agosome more detail around healpod
FruitieX [Wed, 20 Oct 2010 17:21:30 +0000 (20:21 +0300)]
some more detail around healpod

11 years agos/railgun/nex/
FruitieX [Wed, 20 Oct 2010 17:06:35 +0000 (20:06 +0300)]
s/railgun/nex/

11 years agowoops forgot the effect on one jumppad, also make blue jumppad models "skin" "1"
FruitieX [Wed, 20 Oct 2010 16:40:54 +0000 (19:40 +0300)]
woops forgot the effect on one jumppad, also make blue jumppad models "skin" "1"

11 years agomisc improvements, perhaps this map is going to look like something now :)
FruitieX [Wed, 20 Oct 2010 16:38:02 +0000 (19:38 +0300)]
misc improvements, perhaps this map is going to look like something now :)

11 years agoreplace the most insane textures, add healpods
FruitieX [Wed, 20 Oct 2010 16:25:49 +0000 (19:25 +0300)]
replace the most insane textures, add healpods

11 years agoRevert "g-23: nex -> rifle (NOTE: possibly have to change some bullets into cells...
Rudolf Polzer [Wed, 20 Oct 2010 15:57:09 +0000 (17:57 +0200)]
Revert "g-23: nex -> rifle (NOTE: possibly have to change some bullets into cells for this)"

This reverts commit 138c84f12cd927e42cee40eedbe422c4afd53978.

Poor poor build server.

11 years agog-23: nex -> rifle (NOTE: possibly have to change some bullets into cells for this)
Rudolf Polzer [Wed, 20 Oct 2010 15:52:36 +0000 (17:52 +0200)]
g-23: nex -> rifle (NOTE: possibly have to change some bullets into cells for this)

11 years agoRed Planet, first version
Rudolf Polzer [Wed, 20 Oct 2010 14:52:27 +0000 (16:52 +0200)]
Red Planet, first version

11 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/target_changelevel'
Rudolf Polzer [Tue, 19 Oct 2010 06:40:49 +0000 (08:40 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/target_changelevel'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/tenshihanpack'
Rudolf Polzer [Tue, 19 Oct 2010 06:37:34 +0000 (08:37 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/tenshihanpack'

11 years agolots of ambient map sounds from Tenshihan's GPL sound pack, rename ambient/ac_duct_wi...
FruitieX [Mon, 18 Oct 2010 23:25:11 +0000 (02:25 +0300)]
lots of ambient map sounds from Tenshihan's GPL sound pack, rename ambient/ac_duct_wind.ogg => wind/ac_duct_wind.ogg in g-23.map as well

11 years agoNOTRACE flag for misc_laser
Rudolf Polzer [Sun, 17 Oct 2010 20:03:11 +0000 (22:03 +0200)]
NOTRACE flag for misc_laser

11 years agoenable r_water on glowplant and stormkeep for the warpzones
Rudolf Polzer [Sat, 16 Oct 2010 12:05:44 +0000 (14:05 +0200)]
enable r_water on glowplant and stormkeep for the warpzones

11 years agoglowplant: improve the hint brushes to cull off the warpzone from the arena better
Rudolf Polzer [Sat, 16 Oct 2010 11:58:13 +0000 (13:58 +0200)]
glowplant: improve the hint brushes to cull off the warpzone from the arena better

11 years agoadd preliminary screenshots of stormkeep and glowplant, redo g-23 screenshot as it...
Rudolf Polzer [Fri, 15 Oct 2010 18:55:21 +0000 (20:55 +0200)]
add preliminary screenshots of stormkeep and glowplant, redo g-23 screenshot as it was stretched

11 years agocdtrack selection for g-23 and glowplant (g-23 yet to be uploaded)
Rudolf Polzer [Fri, 15 Oct 2010 17:41:40 +0000 (19:41 +0200)]
cdtrack selection for g-23 and glowplant (g-23 yet to be uploaded)

11 years agoshorten g-23's description so it fits in the menu
Rudolf Polzer [Fri, 15 Oct 2010 17:24:02 +0000 (19:24 +0200)]
shorten g-23's description so it fits in the menu

11 years agoAdded the map "glowplant" by Cuinnton, lighting settings and optimization by me,...
Rudolf Polzer [Wed, 13 Oct 2010 20:04:03 +0000 (22:04 +0200)]
Added the map "glowplant" by Cuinnton, lighting settings and optimization by me, edits and performance boosts by FruitieX

11 years agouse less lights for surfacelight (sorry, doing it "exact" simply compiles too slowly)
Rudolf Polzer [Sun, 10 Oct 2010 17:43:00 +0000 (19:43 +0200)]
use less lights for surfacelight (sorry, doing it "exact" simply compiles too slowly)

11 years agodocument the new warpzone related spawnflag
Rudolf Polzer [Sun, 10 Oct 2010 17:33:56 +0000 (19:33 +0200)]
document the new warpzone related spawnflag

11 years agofix light subdivision on the shaders
Rudolf Polzer [Wed, 6 Oct 2010 04:45:16 +0000 (06:45 +0200)]
fix light subdivision on the shaders

11 years agog-23: fix more lightmapscale; extragalactic_planets sky: make sun color similar to...
Rudolf Polzer [Wed, 6 Oct 2010 04:33:30 +0000 (06:33 +0200)]
g-23: fix more lightmapscale; extragalactic_planets sky: make sun color similar to its sun (experiment, maybe tone down later)

11 years agostormkeep: let there be bounce
Rudolf Polzer [Tue, 5 Oct 2010 19:22:15 +0000 (21:22 +0200)]
stormkeep: let there be bounce

11 years agofix the converter again
Rudolf Polzer [Tue, 5 Oct 2010 19:11:08 +0000 (21:11 +0200)]
fix the converter again

11 years agospeed up the converter by calling sed only once
Rudolf Polzer [Tue, 5 Oct 2010 19:06:51 +0000 (21:06 +0200)]
speed up the converter by calling sed only once

11 years agofix my shader messup, sorry
Rudolf Polzer [Tue, 5 Oct 2010 19:00:57 +0000 (21:00 +0200)]
fix my shader messup, sorry

11 years agofix my shader messup, sorry
Rudolf Polzer [Tue, 5 Oct 2010 18:58:55 +0000 (20:58 +0200)]
fix my shader messup, sorry

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Tue, 5 Oct 2010 18:52:07 +0000 (20:52 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

11 years agofix shader converter, and make it prevent a messup it did before
Rudolf Polzer [Tue, 5 Oct 2010 18:51:53 +0000 (20:51 +0200)]
fix shader converter, and make it prevent a messup it did before

11 years agog-23: try -samplesize 4 again. Maybe it's no longer smurfed now...
Rudolf Polzer [Tue, 5 Oct 2010 10:52:38 +0000 (12:52 +0200)]
g-23: try -samplesize 4 again. Maybe it's no longer smurfed now...

11 years agostormkeep shall be recompiled too
rpolzer [Mon, 4 Oct 2010 08:50:11 +0000 (10:50 +0200)]
stormkeep shall be recompiled too

11 years agouse -randomsamples on g-23
rpolzer [Mon, 4 Oct 2010 08:45:51 +0000 (10:45 +0200)]
use -randomsamples on g-23

11 years agoMerge branch 'savagex/g-23-relight' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Sun, 3 Oct 2010 17:30:29 +0000 (19:30 +0200)]
Merge branch 'savagex/g-23-relight' of ssh://git.xonotic.org/xonotic-maps.pk3dir

11 years agointroduce a normally culled variant of exx floor-grate04 to prevent that grate-surfac...
Maik Merten [Sun, 3 Oct 2010 17:15:58 +0000 (19:15 +0200)]
introduce a normally culled variant of exx floor-grate04 to prevent that grate-surface to be backlit
retweak lighting in computer room
replace some neon-light fixture with a spotlight behind a grate
tweaked lighting-grid for higher resolution

11 years ago-filter it is, then
Rudolf Polzer [Sun, 3 Oct 2010 14:19:13 +0000 (16:19 +0200)]
-filter it is, then

11 years ago-super 2 fails too on the deluxemap
Rudolf Polzer [Sun, 3 Oct 2010 12:53:54 +0000 (14:53 +0200)]
-super 2 fails too on the deluxemap

11 years agorename the proceduralx shaders in the map
FruitieX [Sat, 2 Oct 2010 21:07:53 +0000 (00:07 +0300)]
rename the proceduralx shaders in the map

11 years agoMerge remote branch 'origin/master' into fruitiex/runningmanctf
FruitieX [Sat, 2 Oct 2010 21:05:48 +0000 (00:05 +0300)]
Merge remote branch 'origin/master' into fruitiex/runningmanctf

11 years agoMerge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir...
FruitieX [Sat, 2 Oct 2010 21:05:22 +0000 (00:05 +0300)]
Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir into fruitiex/runningmanctf

Conflicts:
maps/runningmanctf.map

11 years agoI give you... running men!
FruitieX [Sat, 2 Oct 2010 21:03:24 +0000 (00:03 +0300)]
I give you... running men!

11 years agofinish map for cloning...
FruitieX [Sat, 2 Oct 2010 20:41:25 +0000 (23:41 +0300)]
finish map for cloning...

11 years agoif -samplesize 4 won't work, try another way to waste cycles on -light
Rudolf Polzer [Sat, 2 Oct 2010 20:18:55 +0000 (22:18 +0200)]
if -samplesize 4 won't work, try another way to waste cycles on -light

11 years agouse new name of the "floors" of proceduralx
Rudolf Polzer [Sat, 2 Oct 2010 19:50:54 +0000 (21:50 +0200)]
use new name of the "floors" of proceduralx

11 years agoMerge branch 'master' into fruitiex/runningmanctf
Rudolf Polzer [Sat, 2 Oct 2010 19:50:29 +0000 (21:50 +0200)]
Merge branch 'master' into fruitiex/runningmanctf

Conflicts:
scripts/proceduralx.shader

11 years agorevert to a working g-23
Rudolf Polzer [Sat, 2 Oct 2010 19:36:07 +0000 (21:36 +0200)]
revert to a working g-23

11 years agog-23: more samples ;)
Rudolf Polzer [Sat, 2 Oct 2010 18:30:21 +0000 (20:30 +0200)]
g-23: more samples ;)

11 years agolet there be bounce
Rudolf Polzer [Sat, 2 Oct 2010 18:03:32 +0000 (20:03 +0200)]
let there be bounce

11 years agoMerge remote branch 'origin/savagex/g-23-relight'
Rudolf Polzer [Sat, 2 Oct 2010 17:58:04 +0000 (19:58 +0200)]
Merge remote branch 'origin/savagex/g-23-relight'

11 years agointroduce variants of the extragalactics-planets sky shader with less intense lightin...
Maik Merten [Sat, 2 Oct 2010 17:21:01 +0000 (19:21 +0200)]
introduce variants of the extragalactics-planets sky shader with less intense lighting and use it on g-23

11 years agoMerge remote branch 'origin/savagex/g-23-relight'
Rudolf Polzer [Sat, 2 Oct 2010 16:55:49 +0000 (18:55 +0200)]
Merge remote branch 'origin/savagex/g-23-relight'

11 years agorework some lighting in the outer parts of the map
Maik Merten [Sat, 2 Oct 2010 16:01:41 +0000 (18:01 +0200)]
rework some lighting in the outer parts of the map

11 years agomore fancy lighting
Maik Merten [Sat, 2 Oct 2010 15:32:14 +0000 (17:32 +0200)]
more fancy lighting

11 years agobatch of runningmanctf changes
FruitieX [Sat, 2 Oct 2010 15:22:39 +0000 (18:22 +0300)]
batch of runningmanctf changes