]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
12 years agoUpdated waypoints
mand1nga [Tue, 30 Aug 2011 22:54:37 +0000 (19:54 -0300)]
Updated waypoints

12 years agoSquashed commit of the following (exomorph by morphed):
Rudolf Polzer [Tue, 30 Aug 2011 19:32:15 +0000 (21:32 +0200)]
Squashed commit of the following (exomorph by morphed):

commit f070e41910a3c043119fad251e12d79a7de15623
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Aug 30 21:04:37 2011 +0200

    fix metal_wall04_norm (by Morphed)

commit a2097b19b8c7f77f08f27c260bf0dbc0d8c4c1cf
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Aug 30 19:49:08 2011 +0200

    50% more offsetmapping intensity

commit 43fa0e252de143d67500ddb93cfead646b796110
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:25:45 2011 +0200

    reduce offsetmapping strength for this set

commit 83674a8dbcf4efdc8d733749d1de6429d2ba76e3
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:21:41 2011 +0200

    new and better matched normals, enjoy!

commit 07cb4af6b608ddc9053ab0846e033c2b76d349d3
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:08:34 2011 +0200

    more

commit 6458c85dee44a0138f6ea07a57e871afbbf86a80
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:08:09 2011 +0200

    improve normals maker again

commit 0ba37d03244b6166045c5046d104c12dacb8a0ca
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 14:30:11 2011 +0200

    improve normals maker script

commit 12572574652878605f9bca6795a8d88a5ad908b3
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 12:32:21 2011 +0200

    new gloss maps with higher alpha values (0..100% mapped to 33..100%)

commit 8d9c605f9740d8e0d1c56871b03290e263c69287
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 23:59:11 2011 +0200

    reflection maps and shader tweaks

commit d0cf30713e1396e72a89b0e6d3177c35ff7dc2dc
Merge: 6d002e5 73b5885
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 13:41:29 2011 +0200

    Merge remote-tracking branch 'remotes/origin/morphed/exomorph' into morphed/exomorph

commit 73b5885c96dd23467a07687864f0915173371b35
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:29:29 2011 +0200

    fix makenorms.sh for this set

commit 9c79ba1345229d4685e269a5f41052f6b25fa632
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:25:15 2011 +0200

    fix texture name typos "concete"

commit f069740756f20412e2b8ac7f058f3b075c62a1fb
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:23:13 2011 +0200

    more fixes

commit 6d002e59a5521da5e786cef4f4e6d37147b2d803
Merge: 231e780 2e67261
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 13:18:41 2011 +0200

    Merge remote-tracking branch 'remotes/origin/morphed/exomorph' into morphed/exomorph

commit d2ede0819e1a2b4938c900d6434b62cedafb1fe4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:17:56 2011 +0200

    untested autogenerated exomorphx.shader

commit 231e7805384f45b064b765c9b39bc03ce0b5fe75
Merge: cc3c1f5 cf64f3d
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 13:01:19 2011 +0200

    Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into morphed/exomorph

commit 2e67261cda19f1029fd2f287970992e9a115cc32
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 12:58:03 2011 +0200

    add heightmaps to the normalmaps

commit a3fcb5b260aeea8f25f582462b7d6fb5eb3c4476
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 12:22:33 2011 +0200

    rename to exomorphx

commit cc3c1f5884a8bef4b940ba7d3224c3d00223cdea
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 03:23:37 2011 +0200

    new texture set, its missing shader file

12 years agoNew waypoints for glowplant
mand1nga [Mon, 29 Aug 2011 18:01:55 +0000 (15:01 -0300)]
New waypoints for glowplant

12 years agoNew waypoints for space-elevator
mand1nga [Mon, 29 Aug 2011 15:45:59 +0000 (12:45 -0300)]
New waypoints for space-elevator

12 years agoNew waypoints for red-planet
mand1nga [Mon, 29 Aug 2011 15:18:20 +0000 (12:18 -0300)]
New waypoints for red-planet

12 years agomoew WP links
Rudolf Polzer [Mon, 29 Aug 2011 05:00:59 +0000 (07:00 +0200)]
moew WP links

12 years agoBetter waypoints
mand1nga [Sun, 28 Aug 2011 19:09:13 +0000 (16:09 -0300)]
Better waypoints

12 years agoabbreviate names, sorry
Rudolf Polzer [Sat, 27 Aug 2011 15:48:18 +0000 (17:48 +0200)]
abbreviate names, sorry

12 years agofix authors for stormkeep
Rudolf Polzer [Sat, 27 Aug 2011 15:43:59 +0000 (17:43 +0200)]
fix authors for stormkeep

12 years agoupdate gitattributes and mark some files as text
Rudolf Polzer [Sat, 27 Aug 2011 15:10:26 +0000 (17:10 +0200)]
update gitattributes and mark some files as text

12 years agoMerge remote branch 'origin/mirceakitsune/red_planet_tempcollisions'
Rudolf Polzer [Sat, 27 Aug 2011 10:06:42 +0000 (12:06 +0200)]
Merge remote branch 'origin/mirceakitsune/red_planet_tempcollisions'

12 years agoRevert "Make the forklifts misc_gamemodel instead of misc_model". Might cause bad...
MirceaKitsune [Thu, 25 Aug 2011 10:50:55 +0000 (13:50 +0300)]
Revert "Make the forklifts misc_gamemodel instead of misc_model". Might cause bad collisions as well, so turn it back into misc_model for now.

12 years agoThe latest version of Red Planet (from mirceakitsune/red_planet) but with Weapon...
MirceaKitsune [Thu, 25 Aug 2011 09:53:07 +0000 (12:53 +0300)]
The latest version of Red Planet (from mirceakitsune/red_planet) but with Weapon Clip collisions for the barrels and crates. Needed until the meshes are fixed to have their own collisions, or DP optimizes collisions with misc_gamemodel entities.

12 years agoRemove shell cmd ;)
mand1nga [Tue, 23 Aug 2011 23:37:23 +0000 (20:37 -0300)]
Remove shell cmd ;)

12 years agoMade players spwan on the attacking team for assault
mand1nga [Tue, 23 Aug 2011 23:13:29 +0000 (20:13 -0300)]
Made players spwan on the attacking team for assault

12 years agoBetter waypoints for newtonian-nightmare
mand1nga [Tue, 23 Aug 2011 23:05:21 +0000 (20:05 -0300)]
Better waypoints for newtonian-nightmare

12 years agoWaypoint cache for the new Red Planet
MirceaKitsune [Tue, 23 Aug 2011 14:22:44 +0000 (17:22 +0300)]
Waypoint cache for the new Red Planet

12 years agoUpdate map screenshot. The previous one was very old and inaccurate.
MirceaKitsune [Tue, 23 Aug 2011 14:16:30 +0000 (17:16 +0300)]
Update map screenshot. The previous one was very old and inaccurate.

12 years agoMake the forklifts misc_gamemodel instead of misc_model
MirceaKitsune [Tue, 23 Aug 2011 14:06:21 +0000 (17:06 +0300)]
Make the forklifts misc_gamemodel instead of misc_model

12 years agoMake the crate models solid now
MirceaKitsune [Tue, 23 Aug 2011 14:03:35 +0000 (17:03 +0300)]
Make the crate models solid now

12 years agoRename weapon_rifle to weapon_sniperrifle, which is the correct entity name
MirceaKitsune [Tue, 23 Aug 2011 13:50:42 +0000 (16:50 +0300)]
Rename weapon_rifle to weapon_sniperrifle, which is the correct entity name

12 years agoRemove WeaponClip brushes from crates too. As discussed on IRC, they need to be done...
MirceaKitsune [Tue, 23 Aug 2011 13:47:49 +0000 (16:47 +0300)]
Remove WeaponClip brushes from crates too. As discussed on IRC, they need to be done in the models and not as separate brushes, though they're needed to avoid slow collisions that kill the server. Poke me on IRC if I forgot to remove the brush clips on any crates / barrels

12 years agoRemove all weaponclip brushes from explosive barrels. They would cause invisible...
MirceaKitsune [Tue, 23 Aug 2011 13:40:00 +0000 (16:40 +0300)]
Remove all weaponclip brushes from explosive barrels. They would cause invisible collisions to appear while the barrels are missing, and also cause barrels to not take damage while being shot with hitscan weapons

12 years agoAdd some more detail to the Red Planet bridge
MirceaKitsune [Tue, 23 Aug 2011 12:55:09 +0000 (15:55 +0300)]
Add some more detail to the Red Planet bridge

12 years agoBrand new waypoints for Red Planet
MirceaKitsune [Tue, 23 Aug 2011 12:40:05 +0000 (15:40 +0300)]
Brand new waypoints for Red Planet

12 years agoChange Red Planet waypoint connectivity. Will test after BSP autobuild, but they...
MirceaKitsune [Tue, 23 Aug 2011 11:09:09 +0000 (14:09 +0300)]
Change Red Planet waypoint connectivity. Will test after BSP autobuild, but they should work as intended.

12 years agoRe-enable ONS on Red Planet. I'll be changing the control point links as requested.
MirceaKitsune [Tue, 23 Aug 2011 11:01:37 +0000 (14:01 +0300)]
Re-enable ONS on Red Planet. I'll be changing the control point links as requested.

12 years agoSwap red-planet with courtfun for Onslaught
mand1nga [Mon, 22 Aug 2011 01:09:16 +0000 (22:09 -0300)]
Swap red-planet with courtfun for Onslaught

12 years agoRemoved bot-nightmare from the campaign for now
mand1nga [Sun, 21 Aug 2011 18:28:14 +0000 (15:28 -0300)]
Removed bot-nightmare from the campaign for now

12 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Sun, 21 Aug 2011 17:22:57 +0000 (19:22 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

12 years agored-planet is kojinsmokin
Rudolf Polzer [Sun, 21 Aug 2011 17:22:08 +0000 (19:22 +0200)]
red-planet is kojinsmokin

12 years agoFixed a few typos
mand1nga [Sun, 21 Aug 2011 16:48:11 +0000 (13:48 -0300)]
Fixed a few typos

12 years agoNew campaign by Mirio
Mirio [Sun, 21 Aug 2011 02:29:59 +0000 (23:29 -0300)]
New campaign by Mirio

12 years agoDelete old campaign file
mand1nga [Sun, 21 Aug 2011 02:24:53 +0000 (23:24 -0300)]
Delete old campaign file

12 years agoBetter waypoints
mand1nga [Mon, 15 Aug 2011 18:45:40 +0000 (15:45 -0300)]
Better waypoints

12 years agorunningman: jumppad and waypoint fixes
Rudolf Polzer [Sun, 14 Aug 2011 16:29:49 +0000 (18:29 +0200)]
runningman: jumppad and waypoint fixes

12 years agonew waypoints
Rudolf Polzer [Sun, 14 Aug 2011 15:43:53 +0000 (17:43 +0200)]
new waypoints

12 years agofix the other jumppad too
Rudolf Polzer [Sun, 14 Aug 2011 15:24:40 +0000 (17:24 +0200)]
fix the other jumppad too

12 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Sun, 14 Aug 2011 14:59:07 +0000 (16:59 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

12 years agonew waypoints for the glowing plant
Rudolf Polzer [Sun, 14 Aug 2011 14:58:48 +0000 (16:58 +0200)]
new waypoints for the glowing plant

12 years agouse "neon" on afterslime
Rudolf Polzer [Sun, 14 Aug 2011 07:44:23 +0000 (09:44 +0200)]
use "neon" on afterslime

12 years agoadd a waypoint to afterslime, fixes #565
Rudolf Polzer [Sat, 13 Aug 2011 12:20:44 +0000 (14:20 +0200)]
add a waypoint to afterslime, fixes #565

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Sat, 13 Aug 2011 06:22:32 +0000 (08:22 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

12 years agoMore waypoints
mand1nga [Sat, 13 Aug 2011 03:41:12 +0000 (00:41 -0300)]
More waypoints

12 years agoupdate to afterslime by kuniuthefrogg
Rudolf Polzer [Fri, 12 Aug 2011 20:34:20 +0000 (22:34 +0200)]
update to afterslime by kuniuthefrogg

12 years agoAdded waypoints and rebuilt the links cache with all doors open
mand1nga [Tue, 9 Aug 2011 04:02:15 +0000 (01:02 -0300)]
Added waypoints and rebuilt the links cache with all doors open

12 years agoSlightly better waypoints for space-elevator
mand1nga [Sun, 7 Aug 2011 22:19:04 +0000 (19:19 -0300)]
Slightly better waypoints for space-elevator

12 years agoImproved waypoints gor g-23. Now there's a way out of the forklift room, added severa...
mand1nga [Sun, 7 Aug 2011 21:59:48 +0000 (18:59 -0300)]
Improved waypoints gor g-23. Now there's a way out of the forklift room, added several paths involving vents.

12 years agomore waypoint caches
Rudolf Polzer [Sun, 7 Aug 2011 19:40:18 +0000 (21:40 +0200)]
more waypoint caches

12 years agoslightly improve the situation for red-planet
Rudolf Polzer [Sun, 7 Aug 2011 19:18:35 +0000 (21:18 +0200)]
slightly improve the situation for red-planet

12 years agoadd a clip brush to help bot waypoint linking
Rudolf Polzer [Sun, 7 Aug 2011 16:50:10 +0000 (18:50 +0200)]
add a clip brush to help bot waypoint linking

12 years agomore waypoint fixes
Rudolf Polzer [Sun, 7 Aug 2011 16:09:21 +0000 (18:09 +0200)]
more waypoint fixes

12 years agomore waypoint fixes
Rudolf Polzer [Sun, 7 Aug 2011 15:31:45 +0000 (17:31 +0200)]
more waypoint fixes

12 years agowaypoint fixes
Rudolf Polzer [Sun, 7 Aug 2011 14:50:05 +0000 (16:50 +0200)]
waypoint fixes

12 years agofix position of onslaught generators
Rudolf Polzer [Sat, 6 Aug 2011 18:39:02 +0000 (20:39 +0200)]
fix position of onslaught generators

12 years agofix generator bbox size
Rudolf Polzer [Sat, 6 Aug 2011 18:36:05 +0000 (20:36 +0200)]
fix generator bbox size

12 years agofor now, remove ONS from red-planet game types - it's simply not a good idea there
Rudolf Polzer [Sat, 6 Aug 2011 17:56:24 +0000 (19:56 +0200)]
for now, remove ONS from red-planet game types - it's simply not a good idea there

Problems:
- non obvious ONS layout
- bad mapping of ONS layout to minimap (too vertical)
- bots can't handle ONS on this map

12 years agonew waypoints cache file
Rudolf Polzer [Sat, 6 Aug 2011 17:30:02 +0000 (19:30 +0200)]
new waypoints cache file

12 years agomake the turrets owned by the controlpoint
Rudolf Polzer [Sat, 6 Aug 2011 17:17:20 +0000 (19:17 +0200)]
make the turrets owned by the controlpoint

12 years agodisable waypoints for items (or the waypoint cache fails for different game modes)
Rudolf Polzer [Sat, 6 Aug 2011 17:05:16 +0000 (19:05 +0200)]
disable waypoints for items (or the waypoint cache fails for different game modes)

12 years agomove two onslaught_link from outside into the map, fixing the leak
Rudolf Polzer [Sat, 6 Aug 2011 17:03:19 +0000 (19:03 +0200)]
move two onslaught_link from outside into the map, fixing the leak

12 years agoONS changes by cortez
Rudolf Polzer [Sat, 6 Aug 2011 16:15:37 +0000 (18:15 +0200)]
ONS changes by cortez

12 years agocourtfun: no CTS kill delay, because it's cyclic
Rudolf Polzer [Thu, 4 Aug 2011 18:25:45 +0000 (20:25 +0200)]
courtfun: no CTS kill delay, because it's cyclic

12 years agosupport CTS on courtfun too
Rudolf Polzer [Thu, 4 Aug 2011 18:02:08 +0000 (20:02 +0200)]
support CTS on courtfun too

12 years agouse quiet on nexballarena
Rudolf Polzer [Thu, 4 Aug 2011 17:48:45 +0000 (19:48 +0200)]
use quiet on nexballarena

12 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Thu, 4 Aug 2011 17:37:54 +0000 (19:37 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

12 years agouse traveler on leave_em_behind
Rudolf Polzer [Thu, 4 Aug 2011 17:36:51 +0000 (19:36 +0200)]
use traveler on leave_em_behind

12 years agochange all gametypefilters to +rc,cts instead of +rc
Rudolf Polzer [Sun, 31 Jul 2011 16:18:04 +0000 (18:18 +0200)]
change all gametypefilters to +rc,cts instead of +rc

12 years agoWaypoints for nexballarena ;)
mand1nga [Sun, 31 Jul 2011 03:10:32 +0000 (00:10 -0300)]
Waypoints for nexballarena ;)

12 years agoWaypoints for techassault
mand1nga [Sun, 31 Jul 2011 02:57:43 +0000 (23:57 -0300)]
Waypoints for techassault

12 years agoSlightly better waypoints for leave_em_behind
mand1nga [Sun, 31 Jul 2011 02:21:44 +0000 (23:21 -0300)]
Slightly better waypoints for leave_em_behind

12 years agoAdded waypoints for leave_em_behind
mand1nga [Sun, 31 Jul 2011 02:10:18 +0000 (23:10 -0300)]
Added waypoints for leave_em_behind

12 years agoin race, make the ammo items smaller
Rudolf Polzer [Fri, 29 Jul 2011 17:53:38 +0000 (19:53 +0200)]
in race, make the ammo items smaller

12 years agosome improvements
Rudolf Polzer [Fri, 29 Jul 2011 17:39:12 +0000 (19:39 +0200)]
some improvements

12 years agoadd a map shot for courtfun
Rudolf Polzer [Fri, 29 Jul 2011 17:30:36 +0000 (19:30 +0200)]
add a map shot for courtfun

12 years agoRace for Courtfun
Rudolf Polzer [Fri, 29 Jul 2011 17:26:27 +0000 (19:26 +0200)]
Race for Courtfun

12 years agobot waypoints for courtfun
Rudolf Polzer [Tue, 26 Jul 2011 18:34:44 +0000 (20:34 +0200)]
bot waypoints for courtfun

12 years agodamn, forgot a few... this version is right
Rudolf Polzer [Mon, 25 Jul 2011 12:48:13 +0000 (14:48 +0200)]
damn, forgot a few... this version is right

12 years agoBGMScript anim
Rudolf Polzer [Mon, 25 Jul 2011 12:40:26 +0000 (14:40 +0200)]
BGMScript anim

12 years agoadd the BGS file for courtfun
Rudolf Polzer [Mon, 25 Jul 2011 11:33:56 +0000 (13:33 +0200)]
add the BGS file for courtfun

12 years agoadd missing mapinfo file
Rudolf Polzer [Mon, 25 Jul 2011 06:20:20 +0000 (08:20 +0200)]
add missing mapinfo file

12 years agoMerge branch 'divVerent/courtfun2'
Rudolf Polzer [Mon, 25 Jul 2011 05:38:02 +0000 (07:38 +0200)]
Merge branch 'divVerent/courtfun2'

12 years agoMerge branch 'divVerent/xoylent-sane-options'
Rudolf Polzer [Mon, 25 Jul 2011 05:37:57 +0000 (07:37 +0200)]
Merge branch 'divVerent/xoylent-sane-options'

12 years agoremove lots of insane stuff from xoylent options, let's see if we get a bug
Rudolf Polzer [Sun, 24 Jul 2011 20:51:48 +0000 (22:51 +0200)]
remove lots of insane stuff from xoylent options, let's see if we get a bug

12 years agoclean up lots of map options files (triggers recompile)
Rudolf Polzer [Sun, 24 Jul 2011 20:46:04 +0000 (22:46 +0200)]
clean up lots of map options files (triggers recompile)

12 years agobump map options of courtfun to trigger a recompile
Rudolf Polzer [Sun, 24 Jul 2011 20:41:54 +0000 (22:41 +0200)]
bump map options of courtfun to trigger a recompile

12 years agoadd a dp_water command to make water nicer
Rudolf Polzer [Sun, 24 Jul 2011 20:38:38 +0000 (22:38 +0200)]
add a dp_water command to make water nicer

12 years agoMerge remote branch 'origin/master' into divVerent/courtfun2
Rudolf Polzer [Sun, 24 Jul 2011 20:35:21 +0000 (22:35 +0200)]
Merge remote branch 'origin/master' into divVerent/courtfun2

12 years agofix shader and textures for courtfun screen messages
Maik Merten [Sun, 24 Jul 2011 19:04:16 +0000 (21:04 +0200)]
fix shader and textures for courtfun screen messages

12 years agoMerge remote branch 'origin/morphed/teleporter'
Rudolf Polzer [Tue, 19 Jul 2011 18:06:12 +0000 (20:06 +0200)]
Merge remote branch 'origin/morphed/teleporter'

12 years agoteleporter for darkzone map
Morphed [Mon, 18 Jul 2011 21:21:34 +0000 (23:21 +0200)]
teleporter for darkzone map

12 years agoadd heights to most of the stein1x textures, and fix inverted normals
Rudolf Polzer [Sat, 16 Jul 2011 12:28:48 +0000 (14:28 +0200)]
add heights to most of the stein1x textures, and fix inverted normals

Really, can't we learn - NO TEXTURES WITHOUT HEIGHTS ON NORMALS, PLEASE. IS IT
SO HARD?

Also, it looks very much like most textures have simply used the original color
value as normals. Not really a good thing, if you ask me.

12 years agoMerge branch 'master' into cbrutail/map-lightspeed
cbrutail [Thu, 14 Jul 2011 08:55:04 +0000 (10:55 +0200)]
Merge branch 'master' into cbrutail/map-lightspeed

12 years agoremove options that don't do anything anyway; trigger a recompile
Rudolf Polzer [Sat, 9 Jul 2011 20:18:37 +0000 (22:18 +0200)]
remove options that don't do anything anyway; trigger a recompile

12 years agolightspeed: use a cubemap reflection as fallback, instead of the current fixed image...
Rudolf Polzer [Sat, 9 Jul 2011 20:15:38 +0000 (22:15 +0200)]
lightspeed: use a cubemap reflection as fallback, instead of the current fixed image; use dp_reflect (1 extra render) instead of dp_water (2 extra renders) here as we don't use refraction anyway

12 years agohopefully fix the leak
Rudolf Polzer [Sat, 9 Jul 2011 16:25:40 +0000 (18:25 +0200)]
hopefully fix the leak

12 years agoMerge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes
Rudolf Polzer [Sat, 9 Jul 2011 16:24:43 +0000 (18:24 +0200)]
Merge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes

12 years agoversion bumps to trigger a recompile so I can see why this wasn't merged all along
Rudolf Polzer [Sat, 9 Jul 2011 16:19:38 +0000 (18:19 +0200)]
version bumps to trigger a recompile so I can see why this wasn't merged all along

12 years agobump version of the .options file to trigger a recompile and new screenshot run
Rudolf Polzer [Sat, 9 Jul 2011 14:15:19 +0000 (16:15 +0200)]
bump version of the .options file to trigger a recompile and new screenshot run

12 years agoMerge remote-tracking branch 'origin/master' into divVerent/courtfun2
Rudolf Polzer [Sat, 9 Jul 2011 14:15:03 +0000 (16:15 +0200)]
Merge remote-tracking branch 'origin/master' into divVerent/courtfun2

Conflicts:
scripts/shaderlist.txt