xonotic/xonotic-maps.pk3dir.git
9 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

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

9 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'

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

9 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

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

9 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

9 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

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

9 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.

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

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

9 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

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

9 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'

9 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)

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

9 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'

9 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'

9 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

9 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)

9 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

9 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

9 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

9 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

9 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

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

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

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

9 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

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

9 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

9 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

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

9 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

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

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

9 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"

9 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 :)

9 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

9 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.

9 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)

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

9 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'

9 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'

9 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

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

9 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

9 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

9 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

9 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)

9 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

9 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

9 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)

9 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

9 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

9 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)

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

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

9 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

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

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

9 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

9 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

9 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...

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

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

9 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

9 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

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

9 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

9 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

9 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

9 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

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

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

9 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

9 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

9 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

9 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

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

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

9 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'

9 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

9 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'

9 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

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

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

9 years agoproceduralx textures by morphed
Rudolf Polzer [Sat, 2 Oct 2010 14:20:18 +0000 (16:20 +0200)]
proceduralx textures by morphed

9 years agoMerge remote branch 'origin/divVerent/fruitiex-textures' into fruitiex/runningmanctf
FruitieX [Sat, 2 Oct 2010 14:19:13 +0000 (17:19 +0300)]
Merge remote branch 'origin/divVerent/fruitiex-textures' into fruitiex/runningmanctf

9 years agoMerge remote branch 'origin/master' into fruitiex/runningmanctf
FruitieX [Sat, 2 Oct 2010 13:59:13 +0000 (16:59 +0300)]
Merge remote branch 'origin/master' into fruitiex/runningmanctf

9 years agoentities.def for target_changelevel
MirceaKitsune [Sat, 2 Oct 2010 13:52:19 +0000 (16:52 +0300)]
entities.def for target_changelevel

9 years agofirst round of relighting g-23
Maik Merten [Sat, 2 Oct 2010 13:22:31 +0000 (15:22 +0200)]
first round of relighting g-23

9 years agocommit so i can change branches :o
FruitieX [Sat, 2 Oct 2010 13:08:38 +0000 (16:08 +0300)]
commit so i can change branches :o

9 years agoMerge remote branch 'origin/fruitiex/effect_e8circle'
Rudolf Polzer [Sat, 2 Oct 2010 11:46:45 +0000 (13:46 +0200)]
Merge remote branch 'origin/fruitiex/effect_e8circle'

9 years agorespawn ring effect from the e8 set (could use some improvements perhaps)
FruitieX [Sat, 2 Oct 2010 11:35:59 +0000 (14:35 +0300)]
respawn ring effect from the e8 set (could use some improvements perhaps)

9 years agoremove some unused textures
Rudolf Polzer [Sat, 2 Oct 2010 08:37:46 +0000 (10:37 +0200)]
remove some unused textures

9 years agoremove unused shaders
Rudolf Polzer [Sat, 2 Oct 2010 08:32:48 +0000 (10:32 +0200)]
remove unused shaders

9 years agoadd basepurple to facility114x
Rudolf Polzer [Sat, 2 Oct 2010 08:31:33 +0000 (10:31 +0200)]
add basepurple to facility114x

9 years agoupdate converter
Rudolf Polzer [Fri, 1 Oct 2010 11:11:06 +0000 (13:11 +0200)]
update converter