xonotic/xonotic-maps.pk3dir.git
10 years agochange sounds/ to sound/
Rudolf Polzer [Thu, 21 Oct 2010 09:50:17 +0000 (11:50 +0200)]
change sounds/ to sound/

10 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

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

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

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

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

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

10 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

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

10 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

10 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

10 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

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

10 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

10 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

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

10 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

10 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

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

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

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

10 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

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

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

10 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

10 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

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

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

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

10 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

10 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

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

10 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

10 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

10 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

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

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

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

10 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

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

10 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

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

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

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

10 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

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

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

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

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

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

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

10 years agoalso fix *BITMAP in the ase files
Rudolf Polzer [Fri, 1 Oct 2010 11:10:33 +0000 (13:10 +0200)]
also fix *BITMAP in the ase files

10 years agoimport desertfactory assets
Rudolf Polzer [Fri, 1 Oct 2010 11:05:49 +0000 (13:05 +0200)]
import desertfactory assets

10 years agoex2x needs a quarter of its offsetmapping scale to not look over the top
Rudolf Polzer [Wed, 29 Sep 2010 18:03:27 +0000 (20:03 +0200)]
ex2x needs a quarter of its offsetmapping scale to not look over the top

10 years agoSquashed commit of the following:
Rudolf Polzer [Wed, 29 Sep 2010 08:50:47 +0000 (10:50 +0200)]
Squashed commit of the following:

commit aab33b915a80346378e8244e1b695cf4be349af7
Author: FruitieX <rasse@rasse-lappy.localdomain>
Date:   Sun Jul 25 01:35:43 2010 +0300

    purple pipe color

commit d0d5e2eff3a14133018eb2e0bb7c36c03e01024b
Author: FruitieX <rasse@rasse-lappy.localdomain>
Date:   Sat Jul 24 23:17:21 2010 +0300

    grate texture

commit 3dcf16c12c72a62f9e6ed0021af55e8f4302b47d
Author: FruitieX <rasse@rasse-lappy.localdomain>
Date:   Sat Jul 24 22:50:26 2010 +0300

    wrn01 colors

10 years agoMerge remote branch 'origin/morphed/narmorx'
Rudolf Polzer [Wed, 29 Sep 2010 08:48:28 +0000 (10:48 +0200)]
Merge remote branch 'origin/morphed/narmorx'

10 years agoMerge remote branch 'origin/morphed/containers'
Rudolf Polzer [Wed, 29 Sep 2010 08:48:02 +0000 (10:48 +0200)]
Merge remote branch 'origin/morphed/containers'

10 years agoBetter .def entry
Jakob MG [Tue, 28 Sep 2010 19:38:48 +0000 (21:38 +0200)]
Better .def entry

10 years agoMerge commit 'c87167c'
Rudolf Polzer [Tue, 28 Sep 2010 19:20:04 +0000 (21:20 +0200)]
Merge commit 'c87167c'

10 years agothese textures are all 'crete and stuff. Get rid of insane gloss parameters here.
Rudolf Polzer [Tue, 28 Sep 2010 13:02:10 +0000 (15:02 +0200)]
these textures are all 'crete and stuff. Get rid of insane gloss parameters here.

10 years agoMerge branch 'master' into morphed/narmorx
Rudolf Polzer [Tue, 28 Sep 2010 10:00:38 +0000 (12:00 +0200)]
Merge branch 'master' into morphed/narmorx

10 years agoexx: ungloss the 'crete
Rudolf Polzer [Mon, 27 Sep 2010 10:46:32 +0000 (12:46 +0200)]
exx: ungloss the 'crete

10 years agoOrganice and add shader for the "narmorx" textureset
Jakob MG [Sun, 26 Sep 2010 00:16:44 +0000 (02:16 +0200)]
Organice and add shader for the "narmorx" textureset

10 years agoLevel designers without imagination, fear no more ! There is a crate model now to...
Morphed [Sat, 25 Sep 2010 21:29:38 +0000 (23:29 +0200)]
Level designers without imagination, fear no more !  There is a crate model now to save you ;)

10 years agoits a barrel
Morphed [Sat, 25 Sep 2010 21:18:31 +0000 (23:18 +0200)]
its a barrel

10 years agodocument the new fields
Rudolf Polzer [Sat, 25 Sep 2010 19:58:46 +0000 (21:58 +0200)]
document the new fields

10 years agonew texture set, photos by narvik86, changed into textures by Morphed
Morphed [Sat, 25 Sep 2010 18:56:37 +0000 (20:56 +0200)]
new texture set, photos by narvik86, changed into textures by Morphed

10 years agolet's help the autoscreenshot maker a bit
Rudolf Polzer [Sat, 25 Sep 2010 18:04:23 +0000 (20:04 +0200)]
let's help the autoscreenshot maker a bit

10 years agostormkeep: make the warpzone stop eating projectiles
Rudolf Polzer [Sat, 25 Sep 2010 14:10:11 +0000 (16:10 +0200)]
stormkeep: make the warpzone stop eating projectiles

10 years agofix an accidental overtype
Rudolf Polzer [Sat, 25 Sep 2010 13:22:04 +0000 (15:22 +0200)]
fix an accidental overtype

10 years agohide lightning textures from radiant
Rudolf Polzer [Sat, 25 Sep 2010 13:19:33 +0000 (15:19 +0200)]
hide lightning textures from radiant

10 years agoadapt to shader naming convention
Rudolf Polzer [Sat, 25 Sep 2010 13:12:27 +0000 (15:12 +0200)]
adapt to shader naming convention

10 years agosplit up xonotic-fx.shader
Rudolf Polzer [Sat, 25 Sep 2010 13:04:56 +0000 (15:04 +0200)]
split up xonotic-fx.shader

10 years agoMerge branch 'master' into cbrutail/shaders_fx_xonotic2
Rudolf Polzer [Sat, 25 Sep 2010 13:03:50 +0000 (15:03 +0200)]
Merge branch 'master' into cbrutail/shaders_fx_xonotic2

10 years agoshader-audit: convert to lower case
Rudolf Polzer [Sat, 25 Sep 2010 13:03:34 +0000 (15:03 +0200)]
shader-audit: convert to lower case

10 years agoMerge branch 'master' into cbrutail/shaders_fx_xonotic2
Rudolf Polzer [Sat, 25 Sep 2010 13:01:39 +0000 (15:01 +0200)]
Merge branch 'master' into cbrutail/shaders_fx_xonotic2

10 years agoadjust for the rename
Rudolf Polzer [Sat, 25 Sep 2010 12:00:06 +0000 (14:00 +0200)]
adjust for the rename

10 years agoalso rename the model (is nicer)
Rudolf Polzer [Sat, 25 Sep 2010 11:59:36 +0000 (13:59 +0200)]
also rename the model (is nicer)

10 years agomoving warpzone shaders to effects_warpzone part II
Rudolf Polzer [Sat, 25 Sep 2010 11:52:02 +0000 (13:52 +0200)]
moving warpzone shaders to effects_warpzone part II

10 years agomoving warpzone shaders to effects_warpzone
Rudolf Polzer [Sat, 25 Sep 2010 11:51:34 +0000 (13:51 +0200)]
moving warpzone shaders to effects_warpzone

10 years agoalso make liquids_* generic
Rudolf Polzer [Sat, 25 Sep 2010 11:45:01 +0000 (13:45 +0200)]
also make liquids_* generic

10 years agoalso allow effects_* as purpose named textures
Rudolf Polzer [Sat, 25 Sep 2010 11:43:55 +0000 (13:43 +0200)]
also allow effects_* as purpose named textures

10 years agoREALLY return exit status
Rudolf Polzer [Sat, 25 Sep 2010 11:33:59 +0000 (13:33 +0200)]
REALLY return exit status

10 years agostill output stuff!
Rudolf Polzer [Sat, 25 Sep 2010 10:55:21 +0000 (12:55 +0200)]
still output stuff!

10 years agoshader-audit: return a status
Rudolf Polzer [Sat, 25 Sep 2010 10:47:17 +0000 (12:47 +0200)]
shader-audit: return a status

10 years agostormkeep: use cdtrack 5 for now ("stairs")
Rudolf Polzer [Fri, 24 Sep 2010 21:59:36 +0000 (23:59 +0200)]
stormkeep: use cdtrack 5 for now ("stairs")

10 years agoadd some clip brushes to the jumppads to prevent accidentally getting stuck
Rudolf Polzer [Fri, 24 Sep 2010 19:23:27 +0000 (21:23 +0200)]
add some clip brushes to the jumppads to prevent accidentally getting stuck

10 years agostormkeep: add keyhunt support
Rudolf Polzer [Fri, 24 Sep 2010 15:18:06 +0000 (17:18 +0200)]
stormkeep: add keyhunt support

10 years agoLET THERE BE STORMKEEP
Rudolf Polzer [Fri, 24 Sep 2010 15:17:09 +0000 (17:17 +0200)]
LET THERE BE STORMKEEP

10 years agoexperimental water shader changes by Calinou (more transparent); please test
Rudolf Polzer [Tue, 21 Sep 2010 10:37:21 +0000 (12:37 +0200)]
experimental water shader changes by Calinou (more transparent); please test

10 years agobetter triggering for warpzones/teleports
Rudolf Polzer [Sun, 19 Sep 2010 13:27:15 +0000 (15:27 +0200)]
better triggering for warpzones/teleports

10 years agog-23.map.options: update : )
Rudolf Polzer [Fri, 17 Sep 2010 08:38:38 +0000 (10:38 +0200)]
g-23.map.options: update :   )

10 years agoshader-audit: do not complain
Rudolf Polzer [Fri, 17 Sep 2010 08:31:53 +0000 (10:31 +0200)]
shader-audit: do not complain

10 years agoturn off all preview models in entities.def as these do not work at the moment. Needs...
Rudolf Polzer [Mon, 13 Sep 2010 05:04:43 +0000 (07:04 +0200)]
turn off all preview models in entities.def as these do not work at the moment. Needs fixing later.

10 years agofix typos in the script
Rudolf Polzer [Sun, 12 Sep 2010 17:04:53 +0000 (19:04 +0200)]
fix typos in the script

10 years agoadd a shader name converter script for eX->exx, trak4->trak4x, trak5->trak5x
Rudolf Polzer [Sun, 12 Sep 2010 16:59:55 +0000 (18:59 +0200)]
add a shader name converter script for eX->exx, trak4->trak4x, trak5->trak5x

10 years agofix typo in exosystem2 shader file
Rudolf Polzer [Sun, 12 Sep 2010 16:36:33 +0000 (18:36 +0200)]
fix typo in exosystem2 shader file

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Sun, 12 Sep 2010 14:33:39 +0000 (16:33 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

10 years agoadd a high-elevation version of exosystem2 by savagex
Rudolf Polzer [Sun, 12 Sep 2010 14:33:29 +0000 (16:33 +0200)]
add a high-elevation version of exosystem2 by savagex

10 years agoa new cubemapped water shader
Rudolf Polzer [Sun, 12 Sep 2010 14:27:21 +0000 (16:27 +0200)]
a new cubemapped water shader