xonotic/xonotic-maps.pk3dir.git
9 years agoMerge remote branch 'origin/fruitiex/nexballarena'
Rudolf Polzer [Tue, 2 Nov 2010 15:14:50 +0000 (16:14 +0100)]
Merge remote branch 'origin/fruitiex/nexballarena'

9 years agoMerge remote branch 'origin/savagex/moarfixes'
Rudolf Polzer [Tue, 2 Nov 2010 14:42:15 +0000 (15:42 +0100)]
Merge remote branch 'origin/savagex/moarfixes'

9 years agoalso allow textures/logos/* (only in logos.shader)
Rudolf Polzer [Mon, 1 Nov 2010 23:01:41 +0000 (00:01 +0100)]
also allow textures/logos/* (only in logos.shader)

9 years agouse the lod jumppad model on dance
FruitieX [Sat, 30 Oct 2010 19:08:47 +0000 (22:08 +0300)]
use the lod jumppad model on dance

9 years agofix some trickjumps that were harder with the new jumpheight/stepheight
FruitieX [Sat, 30 Oct 2010 08:58:58 +0000 (11:58 +0300)]
fix some trickjumps that were harder with the new jumpheight/stepheight

9 years agoMerge remote branch 'origin/fruitiex/jumppadlod'
Rudolf Polzer [Mon, 1 Nov 2010 21:14:48 +0000 (22:14 +0100)]
Merge remote branch 'origin/fruitiex/jumppadlod'

9 years agofix paths in skin file
FruitieX [Sat, 30 Oct 2010 19:14:36 +0000 (22:14 +0300)]
fix paths in skin file

9 years agojumppad and launchpad lod models by morphed, all mappers: start using these (if they...
FruitieX [Sat, 30 Oct 2010 19:03:56 +0000 (22:03 +0300)]
jumppad and launchpad lod models by morphed, all mappers: start using these (if they even work!)

9 years agoclean up red-planet.map
Rudolf Polzer [Mon, 1 Nov 2010 21:05:40 +0000 (22:05 +0100)]
clean up red-planet.map

9 years agoshader-audit: support screens.shader too
Rudolf Polzer [Mon, 1 Nov 2010 21:04:25 +0000 (22:04 +0100)]
shader-audit: support screens.shader too

9 years agoMerge remote branch 'origin/mirceakitsune/red_planet'
Rudolf Polzer [Mon, 1 Nov 2010 21:01:06 +0000 (22:01 +0100)]
Merge remote branch 'origin/mirceakitsune/red_planet'

Conflicts:
scripts/shaderlist.txt

9 years agoI OBEY THE FRUITIEX (and put a fancy jumppad near the rocketlauncher)
Maik Merten [Mon, 1 Nov 2010 17:44:54 +0000 (18:44 +0100)]
I OBEY THE FRUITIEX (and put a fancy jumppad near the rocketlauncher)

9 years agoactually the light source I introduced in my last doesn't meet my high quality standa...
Maik Merten [Mon, 1 Nov 2010 16:51:24 +0000 (17:51 +0100)]
actually the light source I introduced in my last doesn't meet my high quality standards ;-) put a different light here. Also have misc_gamemodel cast shadows

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Mon, 1 Nov 2010 14:25:47 +0000 (15:25 +0100)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

9 years agonew shaderlist
Rudolf Polzer [Mon, 1 Nov 2010 16:03:13 +0000 (16:03 +0000)]
new shaderlist

9 years agosomebody forgot to add a dance mapinfo... please remove yours from data/data/maps/
MrBougo [Mon, 1 Nov 2010 13:34:15 +0000 (14:34 +0100)]
somebody forgot to add a dance mapinfo... please remove yours from data/data/maps/
made a default one to be completed later, to avoid having more clients autogenerate a wrong one

9 years agocaulk some hidden surface; detail docking bay a bit; introduce a new light source...
Maik Merten [Mon, 1 Nov 2010 11:20:06 +0000 (12:20 +0100)]
caulk some hidden surface; detail docking bay a bit; introduce a new light source in a badly lit area

9 years agodocument func_pendulum
Rudolf Polzer [Sun, 31 Oct 2010 21:35:21 +0000 (22:35 +0100)]
document func_pendulum

9 years agoMerge remote branch 'origin/cbrutail/moarmodels'
Rudolf Polzer [Sun, 31 Oct 2010 19:19:42 +0000 (20:19 +0100)]
Merge remote branch 'origin/cbrutail/moarmodels'

9 years agoSome more variations for jumppad models. Added new texture files, skin files and...
cbrutail [Sun, 31 Oct 2010 18:57:52 +0000 (19:57 +0100)]
Some more variations for jumppad models. Added new texture files, skin files and modified shader. We have now red, green, blue, yellow, orange, and purple jumppads!

9 years agofix some overcaulking
Maik Merten [Sun, 31 Oct 2010 13:21:15 +0000 (14:21 +0100)]
fix some overcaulking

9 years agorework "office" area of g-23 (now with fancy ceiling)
Maik Merten [Sun, 31 Oct 2010 12:09:23 +0000 (13:09 +0100)]
rework "office" area of g-23 (now with fancy ceiling)
retweak lighting a bit
remove a lot of hidden surfaces that were still lightmapped because of overuse of detail brushes

9 years agooops, need to recompile this one too
Rudolf Polzer [Sat, 30 Oct 2010 17:09:22 +0000 (19:09 +0200)]
oops, need to recompile this one too

9 years agoplease recompile the other maps with the q3map2 fix
Rudolf Polzer [Sat, 30 Oct 2010 16:10:00 +0000 (18:10 +0200)]
please recompile the other maps with the q3map2 fix

9 years agoglowplant: less insane sunlight, fixes badly lit pipes
Rudolf Polzer [Sat, 30 Oct 2010 16:08:12 +0000 (18:08 +0200)]
glowplant: less insane sunlight, fixes badly lit pipes

9 years agoMerge remote branch 'origin/fruitiex/stormkeep'
Rudolf Polzer [Sat, 30 Oct 2010 14:45:00 +0000 (16:45 +0200)]
Merge remote branch 'origin/fruitiex/stormkeep'

9 years agoMerge remote branch 'origin/savagex/glowplant-warpzonefix'
Rudolf Polzer [Sat, 30 Oct 2010 14:41:19 +0000 (16:41 +0200)]
Merge remote branch 'origin/savagex/glowplant-warpzonefix'

9 years agodefine a new shader for warpzone backdrops. This is displayed if the warpzones don...
Maik Merten [Sat, 30 Oct 2010 11:32:53 +0000 (13:32 +0200)]
define a new shader for warpzone backdrops. This is displayed if the warpzones don't render (no GLSL or r_water disabled). Use this shader on glowplant warpzones.

9 years agoSquashed commit of the following:
Rudolf Polzer [Sat, 30 Oct 2010 07:34:56 +0000 (09:34 +0200)]
Squashed commit of the following:

commit 4725fdca9bdceec1d7b94650e2b49bfa918a06af
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 27 20:48:15 2010 +0300

    argh of course i had to forget these jumppads...

commit fc0f26735ef7dad53effe76daf80b5970003236a
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 27 19:36:34 2010 +0300

    fix flipped jumppad effect, swap out nex for a camping rifle

commit 675006ab4f2dfccf2acd522bc3a93d755fc9468f
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 27 17:12:03 2010 +0300

    jumppad effect

commit 738c156a650dbd58cf3e0a6fc730e844ee39ecf7
Merge: ddfae64 431497d
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 27 16:52:14 2010 +0300

    Merge remote branch 'origin/master' into fruitiex/space_elevator

commit ddfae649829c68bbbefd655f8823661d2a6fc456
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 20 20:47:11 2010 +0300

    add a little detail

commit d093f9da1bf8f624ca812a80b6ae2ed03fbf2f06
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 20 20:44:55 2010 +0300

    fix the target_speaker paths on space-elevator

commit 4b8c57643d03972bb1f61eee86472351949a15d8
Merge: ed9a0f4 9e609a7
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 20 20:41:21 2010 +0300

    Merge branch 'master' into fruitiex/space_elevator

commit ed9a0f401a9b59f72c4d18c78656a89d02273642
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Wed Oct 13 20:34:56 2010 +0300

    warpzone start fade at 800, end at 1200. Don't allow jumping off the fail VIS obstructions.

commit de5c2ba1c284878d4e548d3c1c0c78918535f380
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Tue Oct 12 14:35:30 2010 +0300

    cdtrack jumpinginspace

commit 37698de59059d9173b5b5058bf41b0dc2d03e885
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sun Oct 10 11:41:43 2010 +0300

    this commit may or may not help performance on space-elevator

commit 425c9fdb1b503f473d05233d285d5660a12ec2b3
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sun Oct 10 03:07:50 2010 +0300

    another attempt at vis. This time, also add some obstacles to help VIS, and do other various fixes

commit 04142d2bec2a612c8da927fd50ecfd8bfa4f9d7c
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 9 22:12:26 2010 +0300

    fade the warpzones, now it should be theoretically impossible for more than 2 renders to take place in any position of the map :)

commit 017215a8adbf0d5020fa14668d1e9d7463f33e43
Merge: aedb481 200db72
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 9 16:51:18 2010 +0300

    Merge remote branch 'origin/fruitiex/space_elevator' into fruitiex/space_elevator

commit aedb481f1963aa5f7d97842ac0c5af973e5f103d
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 9 16:50:21 2010 +0300

    try improving culling of warpzones with hint brushes + small misc tweaks

commit 067758da0abb1538fe7af51aa20b0b4cdc447373
Merge: 7682df0 4a4b2aa
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 9 16:07:24 2010 +0300

    Merge remote branch 'origin/master' into fruitiex/space_elevator

    Conflicts:
     scripts/proceduralx.shader

commit 200db727fc6e7afc4f8b3e0c0ed5a850b96fb159
Merge: 7682df0 9475dac
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Oct 2 21:46:15 2010 +0200

    Merge branch 'master' into fruitiex/space_elevator

    Conflicts:
     scripts/proceduralx.shader

commit 7682df0a01fe5cf7b4d1fd9f33b56e3191e89bf3
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 16:54:07 2010 +0300

    try to improve performance by the addition of hint brushes

commit 234e2e27fea0a0d238032e4cff1d96580a656282
Merge: caa9b1b 2cde167
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 16:26:46 2010 +0300

    Merge remote branch 'origin/master' into fruitiex/space_elevator

commit caa9b1b43cc03807811011ecc62be9803ac24bdc
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 15:36:40 2010 +0300

    move the solar panels to the other side, where the sun is :P, take use of the -surfacelight shaders that someone (I?) had apparently created in the past

commit fd1b54f24afd23aadeb6d67027807d8fb850e03f
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 15:03:32 2010 +0300

    add a _cubemap variant for the purple gelslime, use this on space-elevator

commit e303230308aa1ba1b28dd66f3225f1c4cf7f137f
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 13:48:20 2010 +0300

    new solarpanels, hope i placed them on the correct side ;). warpzone glowy shader removed for now, it needs to be combined with the fuzzy shader somehow... in a better way

commit 40819310306a5db571b32ede9915fb8c0d250e8e
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 13:22:11 2010 +0300

    fix almost everything, now the only missing things should be a couple of models.

commit 7819fb095e0b45bf1984aff891963b3885eb4e54
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 12:57:07 2010 +0300

    some renames

commit 23ee3193e1b4ee47cc9aa6dcae5c573640ff6d9a
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 12:54:16 2010 +0300

    map specific textures

commit 34fe9d1766592b3151bf640b33a51515648ebd78
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 12:31:54 2010 +0300

    fruitiex-textures

commit 64ff2fe779b35b4d5e7ff216fdee1bbdf2bf3d43
Merge: 4d07aa9 a06213d
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 12:18:40 2010 +0300

    Merge remote branch 'origin/divVerent/fruitiex-textures' into fruitiex/space_elevator

commit 4d07aa933bac973e776f44f3d322f368639fb907
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Sat Oct 2 12:16:00 2010 +0300

    start fixing space_elevator

commit a06213d50dcf99ec79c1bd1f74011e4bea6dc625
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Sep 29 18:51:04 2010 +0200

    they all have _reflect

commit 7ed5ff669f255fd51ef6b48055a5c0ec3c842ede
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Sep 29 18:49:25 2010 +0200

    add a shader for floor05

commit cc9c24253261adaf6c00a4106773e6f350f86f25
Merge: 4b635fb 085e323
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Sep 29 18:47:25 2010 +0200

    Merge remote branch 'origin/morphed/fruitiex-textures' into divVerent/fruitiex-textures

commit 085e323b5038010327205340fa0d2003c7bff61a
Author: Morphed <Morphed@o2.pl>
Date:   Wed Sep 29 17:09:23 2010 +0200

    new floor textures

commit 4b635fbecbb0a8e4e6e5f6d19cf2b420ec87d244
Merge: ec58168 4dc230f
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Sep 29 10:52:21 2010 +0200

    Merge branch 'master' into divVerent/fruitiex-textures

commit ec581689958589d500fbfc2b01dc8d63ab2e8f5c
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 17:31:10 2010 +0200

    also better offsetmapping scale for the crete

commit 9355939998a4f48824d7098ab94b6ce467766374
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 17:29:08 2010 +0200

    reduce offsetmapping scale and THIS IS 'CRETE

commit b5d44d87cf4da213617e3c5cb82c94496d8a0a50
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 16:55:58 2010 +0200

    adapt to shader naming convention

commit 1df528a925d78dca18246e0e067446c60e3197b9
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 16:50:46 2010 +0200

    also give height to the floor normalmaps

commit 8e923fa264638aa322849bb0bdfc98e468479e0c
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 16:45:56 2010 +0200

    make better normalmaps for fruitconcrete (now with height info)

commit 9501ca170fab9359b6e78ecd6f302c034eb0f43b
Merge: aab33b9 ac62d27
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 16:35:04 2010 +0200

    Merge branch 'master' into divVerent/archived/fruitiex/textures

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

    purple pipe color

commit eba2f28948daf19098b6abb85924ddcf13813eec
Author: FruitieX <rasse@rasse-lappy.localdomain>
Date:   Sat Jul 24 23:18:50 2010 +0300

    gloss texture

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

    grate texture

commit d9ab860ed085d94dbe203e372db2b6a3f033db65
Author: FruitieX <rasse@rasse-lappy.localdomain>
Date:   Sat Jul 24 22:52:53 2010 +0300

    shader

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

    wrn01 colors

commit 8f10cfc94b322f0c638e7a6039ab8fe5eaa05e18
Author: FruitieX <rasse@rasse-lappy.localdomain>
Date:   Sat Jul 24 22:38:32 2010 +0300

    morphed's procedural textures

9 years agoreplace last jumppad on stormkeep that i somehow missed :O
FruitieX [Fri, 29 Oct 2010 16:54:39 +0000 (19:54 +0300)]
replace last jumppad on stormkeep that i somehow missed :O

9 years agoRevert that light, looks bad now. I really think we need a full bright screen shader...
MirceaKitsune [Wed, 27 Oct 2010 14:45:07 +0000 (17:45 +0300)]
Revert that light, looks bad now. I really think we need a full bright screen shader, in my opinion.

9 years agoAttempt to make that screen even brighter. Hope it's not too bright now.
MirceaKitsune [Wed, 27 Oct 2010 14:35:51 +0000 (17:35 +0300)]
Attempt to make that screen even brighter. Hope it's not too bright now.

9 years agoFlip env-mapped glass upside-down
MirceaKitsune [Wed, 27 Oct 2010 14:35:08 +0000 (17:35 +0300)]
Flip env-mapped glass upside-down

9 years agoRemove the distort_glass texture, since we likely wont ever be using that with how...
MirceaKitsune [Tue, 26 Oct 2010 17:26:29 +0000 (20:26 +0300)]
Remove the distort_glass texture, since we likely wont ever be using that with how much performance it takes, and now have env maps instead.

9 years agoEnv-mapped glass, using 3 different textures (doors use the same texture which should...
MirceaKitsune [Tue, 26 Oct 2010 17:23:23 +0000 (20:23 +0300)]
Env-mapped glass, using 3 different textures (doors use the same texture which should look common for all of them). I think this can be mapped better... not sure right now.

9 years agoSlightly different styles for toggle screens. Hope that's prettier :)
MirceaKitsune [Tue, 26 Oct 2010 16:00:58 +0000 (19:00 +0300)]
Slightly different styles for toggle screens. Hope that's prettier :)

9 years agoNo toggle screen on the upper part of elevators, cuz that's incorrect with how elevat...
MirceaKitsune [Tue, 26 Oct 2010 15:49:30 +0000 (18:49 +0300)]
No toggle screen on the upper part of elevators, cuz that's incorrect with how elevators works.

9 years agoPanels inside the elevators too
MirceaKitsune [Tue, 26 Oct 2010 15:44:50 +0000 (18:44 +0300)]
Panels inside the elevators too

9 years agoAdd elevator screens, and fix a screen texture
MirceaKitsune [Tue, 26 Oct 2010 15:38:55 +0000 (18:38 +0300)]
Add elevator screens, and fix a screen texture

9 years agoBarrels and crates in front of the upper locked airlock, to make it obvious you can...
MirceaKitsune [Tue, 26 Oct 2010 15:28:35 +0000 (18:28 +0300)]
Barrels and crates in front of the upper locked airlock, to make it obvious you can't go through there.

9 years agoReplace a forgotten old barrel with the newer barrel model
MirceaKitsune [Tue, 26 Oct 2010 15:14:18 +0000 (18:14 +0300)]
Replace a forgotten old barrel with the newer barrel model

9 years agoUse the new screen textures on all doors and airlocks, and also fix some other textures
MirceaKitsune [Tue, 26 Oct 2010 15:12:03 +0000 (18:12 +0300)]
Use the new screen textures on all doors and airlocks, and also fix some other textures

9 years agoAdd some surfacelights too
MirceaKitsune [Tue, 26 Oct 2010 14:31:34 +0000 (17:31 +0300)]
Add some surfacelights too

9 years agoscreens in shaderlist.txt
MirceaKitsune [Tue, 26 Oct 2010 14:26:34 +0000 (17:26 +0300)]
screens in shaderlist.txt

9 years agoScreens shader (for textures to be full bright)
MirceaKitsune [Tue, 26 Oct 2010 14:26:16 +0000 (17:26 +0300)]
Screens shader (for textures to be full bright)

9 years agoSome tweaks to glows and transparencies
MirceaKitsune [Tue, 26 Oct 2010 14:21:16 +0000 (17:21 +0300)]
Some tweaks to glows and transparencies

9 years agoA bunch of screen textures, to be used on displays placed on doors or elevators ...
MirceaKitsune [Tue, 26 Oct 2010 14:06:34 +0000 (17:06 +0300)]
A bunch of screen textures, to be used on displays placed on doors or elevators (indicate if they are locked or unlocked). Feel free to continue, improve, etc.

9 years agohave *-cull variants for all grates with default culling behavior
Maik Merten [Sun, 24 Oct 2010 12:01:34 +0000 (14:01 +0200)]
have *-cull variants for all grates with default culling behavior

9 years agoMerge remote branch 'origin/savagex/glowplant-gratefix'
Rudolf Polzer [Sun, 24 Oct 2010 11:52:08 +0000 (13:52 +0200)]
Merge remote branch 'origin/savagex/glowplant-gratefix'

9 years agodocument team field for trigger_hurt, misc_laser
Rudolf Polzer [Sat, 23 Oct 2010 16:40:16 +0000 (18:40 +0200)]
document team field for trigger_hurt, misc_laser

9 years agoforgot one grate
Maik Merten [Sat, 23 Oct 2010 13:16:03 +0000 (15:16 +0200)]
forgot one grate

9 years agointroduce floor-grate04-cull texture variant with default front/backface culling...
Maik Merten [Sat, 23 Oct 2010 08:53:04 +0000 (10:53 +0200)]
introduce floor-grate04-cull texture variant with default front/backface culling and use it on glowplant where grates otherwise get waaaay too much light "from behind"

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

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

9 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

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

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

9 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

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

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 agobot waypoints for glowplant
FruitieX [Thu, 21 Oct 2010 20:04:37 +0000 (23:04 +0300)]
bot waypoints for glowplant

9 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

9 years agoadd the options file. Final compile options enabled already since the map is so simple
FruitieX [Thu, 21 Oct 2010 18:29:32 +0000 (21:29 +0300)]
add the options file. Final compile options enabled already since the map is so simple

9 years agonexballarena by cortez (minor edits by fruitiex)
FruitieX [Thu, 21 Oct 2010 18:23:59 +0000 (21:23 +0300)]
nexballarena by cortez (minor edits by fruitiex)

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