xonotic/xonotic-maps.pk3dir.git
10 years agofix some dupe brushes on dance
FruitieX [Wed, 10 Nov 2010 19:32:03 +0000 (21:32 +0200)]
fix some dupe brushes on dance

10 years agoMerge remote branch 'origin/savagex/red-planet-fixes'
Rudolf Polzer [Sun, 7 Nov 2010 15:07:42 +0000 (16:07 +0100)]
Merge remote branch 'origin/savagex/red-planet-fixes'

10 years agoMerge remote branch 'origin/tzork/ent-def-fixes'
Rudolf Polzer [Sun, 7 Nov 2010 14:22:37 +0000 (15:22 +0100)]
Merge remote branch 'origin/tzork/ent-def-fixes'

10 years agoMerge remote branch 'origin/tzork/nexballarena'
Rudolf Polzer [Sun, 7 Nov 2010 14:20:41 +0000 (15:20 +0100)]
Merge remote branch 'origin/tzork/nexballarena'

10 years agoMerge remote branch 'origin/fruitiex/dance_delete_flyingbarrel'
Rudolf Polzer [Sun, 7 Nov 2010 14:18:14 +0000 (15:18 +0100)]
Merge remote branch 'origin/fruitiex/dance_delete_flyingbarrel'

10 years agofun with common/caulk
Maik Merten [Sun, 7 Nov 2010 14:13:33 +0000 (15:13 +0100)]
fun with common/caulk

10 years agofirst round of small fixes: fix z-fighting on sliding doors and container-glass,...
Maik Merten [Sun, 7 Nov 2010 13:53:34 +0000 (14:53 +0100)]
first round of small fixes: fix z-fighting on sliding doors and container-glass, caulk some really really unvisible faces

10 years agodocument _decal as I figured out a way to use it
Rudolf Polzer [Sun, 7 Nov 2010 13:15:15 +0000 (14:15 +0100)]
document _decal as I figured out a way to use it

10 years agoremove a barrel that has ended up flying in space, apparently rotating a model with...
FruitieX [Sun, 7 Nov 2010 13:11:49 +0000 (15:11 +0200)]
remove a barrel that has ended up flying in space, apparently rotating a model with angles set on it caused havoc :)

10 years agoMerge remote branch 'origin/cbrutail/decals-xonotic'
Rudolf Polzer [Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)]
Merge remote branch 'origin/cbrutail/decals-xonotic'

10 years agoAdded some more color variations to logo2 + shaders.
cbrutail [Fri, 5 Nov 2010 12:18:49 +0000 (13:18 +0100)]
Added some more color variations to logo2 + shaders.

10 years agoFixed _glowy shaders
cbrutail [Fri, 5 Nov 2010 12:04:00 +0000 (13:04 +0100)]
Fixed _glowy shaders

10 years agoAdd missing height fog into to worldspawn, remove some unused keays for turrets,...
unknown [Thu, 4 Nov 2010 03:52:31 +0000 (04:52 +0100)]
Add missing height fog into to worldspawn, remove some unused keays for turrets, hakk turret radiant-model paths to work.

10 years agoMerge remote branch 'origin/mirceakitsune/red_planet'
Rudolf Polzer [Wed, 3 Nov 2010 20:35:16 +0000 (21:35 +0100)]
Merge remote branch 'origin/mirceakitsune/red_planet'

10 years agoFixed logos
cbrutail [Wed, 3 Nov 2010 18:45:59 +0000 (19:45 +0100)]
Fixed logos

10 years agoMerge branch 'master' into tzork/nexballarena
cbrutail [Wed, 3 Nov 2010 18:41:11 +0000 (19:41 +0100)]
Merge branch 'master' into tzork/nexballarena

10 years agoMerge branch 'cbrutail/decals-xonotic' into tzork/nexballarena
cbrutail [Wed, 3 Nov 2010 18:38:21 +0000 (19:38 +0100)]
Merge branch 'cbrutail/decals-xonotic' into tzork/nexballarena

10 years agoOk, I think I got it working now.
cbrutail [Wed, 3 Nov 2010 18:29:00 +0000 (19:29 +0100)]
Ok, I think I got it working now.

10 years agoExperimental push.
cbrutail [Wed, 3 Nov 2010 18:22:31 +0000 (19:22 +0100)]
Experimental push.

10 years agomerge most of cbrutail's changes to tzork's remake, still needs a working logos_logo0...
FruitieX [Wed, 3 Nov 2010 18:14:17 +0000 (20:14 +0200)]
merge most of cbrutail's changes to tzork's remake, still needs a working logos_logo01/logo01_(red/blue)_glowy shader!

10 years agodeleted logos.shader
cbrutail [Wed, 3 Nov 2010 18:02:05 +0000 (19:02 +0100)]
deleted logos.shader

10 years agopush back the goal triggers by 8 qu so that the ball actually has to enter the goal...
FruitieX [Wed, 3 Nov 2010 17:43:47 +0000 (19:43 +0200)]
push back the goal triggers by 8 qu so that the ball actually has to enter the goal to score (instead of just touching it's edges)

10 years agoChange gradient light texture path as asked by divVerent
MirceaKitsune [Wed, 3 Nov 2010 17:13:33 +0000 (19:13 +0200)]
Change gradient light texture path as asked by divVerent

10 years agoLastly, move the gradient light texture in effects_lightning. I think many maps can...
MirceaKitsune [Wed, 3 Nov 2010 16:30:50 +0000 (18:30 +0200)]
Lastly, move the gradient light texture in effects_lightning. I think many maps can use it, and it doesn't make sense to keep this effect map specific imo. Please check if it's placed correctly like this.

10 years agoSmall tweaks to some items
MirceaKitsune [Wed, 3 Nov 2010 16:15:56 +0000 (18:15 +0200)]
Small tweaks to some items

10 years agoTweak the red dust a bit. Nothing that should reduce performance
MirceaKitsune [Wed, 3 Nov 2010 16:03:29 +0000 (18:03 +0200)]
Tweak the red dust a bit. Nothing that should reduce performance

10 years agoSay goodbye to the old sand texture
MirceaKitsune [Wed, 3 Nov 2010 15:53:54 +0000 (17:53 +0200)]
Say goodbye to the old sand texture

10 years agoUse the high-res official terrain textures. Looks a ton prettier :D
MirceaKitsune [Wed, 3 Nov 2010 15:53:02 +0000 (17:53 +0200)]
Use the high-res official terrain textures. Looks a ton prettier :D

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/danceopening'
Rudolf Polzer [Wed, 3 Nov 2010 10:31:00 +0000 (11:31 +0100)]
Merge remote branch 'refs/remotes/origin/fruitiex/danceopening'

10 years agoMerge branch 'master' into cbrutail/decals-xonotic
Rudolf Polzer [Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)]
Merge branch 'master' into cbrutail/decals-xonotic

10 years agoUse wepclip, not fullclip. -np for less ugly.
unknown [Wed, 3 Nov 2010 02:52:10 +0000 (03:52 +0100)]
Use wepclip, not fullclip. -np for less ugly.

10 years agoMy version og nexballarena
unknown [Wed, 3 Nov 2010 02:27:48 +0000 (03:27 +0100)]
My version og nexballarena

10 years agoErm... I hope I won't break anything :S Trying to convert the textures to the shader...
cbrutail [Tue, 2 Nov 2010 22:58:26 +0000 (23:58 +0100)]
Erm... I hope I won't break anything :S Trying to convert the textures to the shader name convention

10 years agofix some overcaulking I introduced previously. Me. Again. D'uh.
Maik Merten [Tue, 2 Nov 2010 19:45:29 +0000 (20:45 +0100)]
fix some overcaulking I introduced previously. Me. Again. D'uh.

10 years agocrlf stuff again
Rudolf Polzer [Tue, 2 Nov 2010 19:35:45 +0000 (20:35 +0100)]
crlf stuff again

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

10 years agoadd an opening on the top floor where the useless platform used to be :P
FruitieX [Tue, 2 Nov 2010 14:58:21 +0000 (16:58 +0200)]
add an opening on the top floor where the useless platform used to be :P

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

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

10 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

10 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

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

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

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

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

10 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

10 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

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

10 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

10 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

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

10 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

10 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

10 years agoalphaFunc GT0 DOH!
cbrutail [Mon, 1 Nov 2010 01:00:41 +0000 (02:00 +0100)]
alphaFunc GT0 DOH!

10 years agoFix typo in yellow. Doh!
cbrutail [Mon, 1 Nov 2010 00:51:08 +0000 (01:51 +0100)]
Fix typo in yellow. Doh!

10 years agoSome logos we can snap to textures. Have to kinds, normal and glowing. Use them as...
cbrutail [Mon, 1 Nov 2010 00:39:14 +0000 (01:39 +0100)]
Some logos we can snap to textures. Have to kinds, normal and glowing. Use them as decals.

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

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

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

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

10 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

10 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

10 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

10 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

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

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

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

10 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

10 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

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

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

10 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

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

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

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

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

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

10 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

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

10 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

10 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

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

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

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

10 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

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

10 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

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

10 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

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

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

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

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

10 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

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

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

10 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

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

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

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