xonotic/xonotic-maps.pk3dir.git
10 years agoMerge branch 'master' into fruitiex/runningmanctf
FruitieX [Wed, 1 Dec 2010 09:48:31 +0000 (11:48 +0200)]
Merge branch 'master' into fruitiex/runningmanctf

10 years agoSquashed commit of the following:
Rudolf Polzer [Tue, 30 Nov 2010 17:09:51 +0000 (18:09 +0100)]
Squashed commit of the following:

commit cc4b5ab2428b284ff03a8c84ed0c7345f3b22902
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:07:28 2010 +0100

    for X in */*_bump.tga; do echo "$X"; ~/Games/Xonotic/misc/tools/fft-normalmap-to-heightmap "$X" "${X%_bump.tga}_norm.tga" scharr3 -6 2; done

commit 1e3a70e7752a9ac590150369c3e35eb064555269
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:06:57 2010 +0100

    fix a bump file format

commit bc4b77b9cfb123e0aed5e0fd6de91c9d9143cded
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:02:35 2010 +0100

    fix more of the mess

commit 1d8a972861b9062f876fa6403d54af8c28269b17
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:00:16 2010 +0100

    another buggy texture fixed

commit 1c77b1bb56703ff39ea79c82988f149e084062f5
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:29:59 2010 +0100

    fix my last fix

commit b5f6c34ad071856251149b4429bb44ae3f929d18
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:23:51 2010 +0100

    light_1: fix too

commit 907aa89cc4e601c10796f1787e168834ebe96c31
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:18:38 2010 +0100

    delete some really hard to fix ex2x textures (no map in master uses these)

commit a49cd504db8132eb11c5c300cfaeb58f79091ca7
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:09:51 2010 +0100

    more fixed bumps

commit c27ff2298415a924034462468ba94178f9b09697
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:59:19 2010 +0100

    fix some more textures

commit 07edb984986ab6d6b32ca7bb0c33c40238d4cf4c
Merge: c8ebdfb 7bdcba4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:49:05 2010 +0100

    Merge remote branch 'origin/fruitiex/stormkeep' into divVerent/ex2x-fixes23

commit c8ebdfb80807ef02a504f651a46aa6c1a211d554
Merge: 696b07c 5b0b940
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:46:43 2010 +0100

    Merge branch 'master' into divVerent/ex2x-fixes23

commit 696b07c188109b3e341c34837b88f7508652f108
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:49:17 2010 +0200

    wall_purple1

commit 181b58e3443dd4c1b46f35b7bab7f510ce286bc6
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:46:22 2010 +0200

    trims too

commit e08c858c41dc01e37bd3f73ef2955ebc2a88367e
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:35:17 2010 +0200

    improve the metal3 bump

commit 57cfdb891e9b565a5fb0e06a71468f50df0f264a
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:25:07 2010 +0200

    remove the _norms that are borked anyway

commit 5ac190a08e880059bab20ccb127b4379bce4d93f
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:19:28 2010 +0200

    base_stone_metal

commit d304c4ac2007bd6e9cfa5a2d174bcd171e9b507c
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:17:10 2010 +0200

    more new bumps

commit e1a5a4d83e4a38b7c095fafd266815963e808166
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:01:41 2010 +0200

    base_metal2

commit c4e9671cc55054d34bc8225debae3589fea8b63d
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 10:45:35 2010 +0200

    metalmaterial

commit 67bbdfab5eabf71e61ce90839aa34efe1b7819ca
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 10:41:19 2010 +0200

    some first bumpmaps generated "properly"

10 years agomake the RL platform less annoying by adding an additional step. Lower lava by a...
FruitieX [Tue, 30 Nov 2010 15:24:26 +0000 (17:24 +0200)]
make the RL platform less annoying by adding an additional step. Lower lava by a couple qu to prevent it reaching above the grate texture

10 years agoMerge branch 'master' into fruitiex/stormkeep
FruitieX [Tue, 30 Nov 2010 15:20:20 +0000 (17:20 +0200)]
Merge branch 'master' into fruitiex/stormkeep

10 years agoMerge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
Rudolf Polzer [Tue, 30 Nov 2010 15:18:20 +0000 (16:18 +0100)]
Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway'

10 years agoMerge branch 'samual/keepaway_mapinfos' into fruitiex/freezetag_vs_keepaway
FruitieX [Tue, 30 Nov 2010 15:00:15 +0000 (17:00 +0200)]
Merge branch 'samual/keepaway_mapinfos' into fruitiex/freezetag_vs_keepaway

Conflicts:
maps/g-23.mapinfo
maps/glowplant.mapinfo
maps/red-planet.mapinfo
maps/stormkeep.mapinfo

10 years agomake a straight path to the electro to prevent annying falls into lava, lower the...
FruitieX [Tue, 30 Nov 2010 12:19:44 +0000 (14:19 +0200)]
make a straight path to the electro to prevent annying falls into lava, lower the lava depth to make it easier/faster to swim out of it...

10 years agoargh set the red generator team code correct
FruitieX [Mon, 29 Nov 2010 19:51:35 +0000 (21:51 +0200)]
argh set the red generator team code correct

10 years agoMerge remote branch 'origin/fruitiex/stormkeep'
Rudolf Polzer [Fri, 26 Nov 2010 23:58:18 +0000 (00:58 +0100)]
Merge remote branch 'origin/fruitiex/stormkeep'

10 years agofix fail :/
FruitieX [Fri, 26 Nov 2010 23:32:15 +0000 (01:32 +0200)]
fix fail :/

10 years agofix the lava level being too low for current stepheight, attempt fixing issues with...
FruitieX [Fri, 26 Nov 2010 22:42:42 +0000 (00:42 +0200)]
fix the lava level being too low for current stepheight, attempt fixing issues with warpzone (wasn't deep enough)

10 years agoMerge remote branch 'origin/master' into fruitiex/freezetag_mapinfo
FruitieX [Fri, 26 Nov 2010 12:04:07 +0000 (14:04 +0200)]
Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo

Conflicts:
maps/g-23.mapinfo

10 years agogrr wrong gametypefilter on the armors now :)
FruitieX [Wed, 24 Nov 2010 17:52:52 +0000 (19:52 +0200)]
grr wrong gametypefilter on the armors now :)

10 years agoargh, gametype filter on the red spawns as well, NOW the map is good for merge
FruitieX [Wed, 24 Nov 2010 17:49:03 +0000 (19:49 +0200)]
argh, gametype filter on the red spawns as well, NOW the map is good for merge

10 years agofixes
FruitieX [Sun, 21 Nov 2010 16:09:42 +0000 (18:09 +0200)]
fixes

10 years ago...and the warpzone glow
FruitieX [Sun, 21 Nov 2010 14:22:15 +0000 (16:22 +0200)]
...and the warpzone glow

10 years agocorrect skin on jumppad
FruitieX [Sun, 21 Nov 2010 14:14:56 +0000 (16:14 +0200)]
correct skin on jumppad

10 years agocolor the lights in the red base red
FruitieX [Sun, 21 Nov 2010 14:13:57 +0000 (16:13 +0200)]
color the lights in the red base red

10 years agomirror runningman
FruitieX [Sun, 21 Nov 2010 14:12:00 +0000 (16:12 +0200)]
mirror runningman

10 years agoseveral improvements to detail, WARNING: only half of map there, TESTING ONLY!
FruitieX [Sat, 20 Nov 2010 13:54:06 +0000 (15:54 +0200)]
several improvements to detail, WARNING: only half of map there, TESTING ONLY!

10 years agoAdd gametype keepaway into the mapinfos so that keepaway can run on these maps.
unknown [Sat, 20 Nov 2010 05:19:35 +0000 (00:19 -0500)]
Add gametype keepaway into the mapinfos so that keepaway can run on these maps.

10 years agoFruitieX's cdtrack changes (now using zzzzz)
Rudolf Polzer [Thu, 18 Nov 2010 12:07:57 +0000 (13:07 +0100)]
FruitieX's cdtrack changes (now using zzzzz)

10 years agoMerge remote branch 'origin/cbrutail/shaderfix-forcefileds'
Rudolf Polzer [Thu, 18 Nov 2010 12:01:34 +0000 (13:01 +0100)]
Merge remote branch 'origin/cbrutail/shaderfix-forcefileds'

10 years agoAdded surfacelighted shaders for all colors. Less turbulent too.
cbrutail [Thu, 18 Nov 2010 11:20:21 +0000 (12:20 +0100)]
Added surfacelighted shaders for all colors. Less turbulent too.

10 years agoMerge remote branch 'origin/fruitiex/red-planet-zfight'
Rudolf Polzer [Thu, 18 Nov 2010 06:25:16 +0000 (07:25 +0100)]
Merge remote branch 'origin/fruitiex/red-planet-zfight'

10 years agoplayerclip the portal camera displays, it annoys me that you can crouch in them and...
FruitieX [Wed, 17 Nov 2010 12:02:55 +0000 (14:02 +0200)]
playerclip the portal camera displays, it annoys me that you can crouch in them and get massive prediction errors when walking towards it :P

10 years agofix a small brush in one door that still zfights
FruitieX [Wed, 17 Nov 2010 11:57:20 +0000 (13:57 +0200)]
fix a small brush in one door that still zfights

10 years agoMerge branch 'master' into fruitiex/runningmanctf
FruitieX [Wed, 17 Nov 2010 11:18:00 +0000 (13:18 +0200)]
Merge branch 'master' into fruitiex/runningmanctf

10 years agouse out-there (cdtrack 6) on runningman
FruitieX [Wed, 17 Nov 2010 11:15:49 +0000 (13:15 +0200)]
use out-there (cdtrack 6) on runningman

10 years agoadd freezetag into the dm mapinfos
FruitieX [Tue, 16 Nov 2010 08:46:51 +0000 (10:46 +0200)]
add freezetag into the dm mapinfos

10 years agoMerge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb' (C.Brutail's launchpad fixes)
Rudolf Polzer [Tue, 16 Nov 2010 08:45:36 +0000 (09:45 +0100)]
Merge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb' (C.Brutail's launchpad fixes)

10 years agoMerge remote branch 'origin/fruitiex/stormkeep_playerclip'
Rudolf Polzer [Mon, 15 Nov 2010 20:54:53 +0000 (21:54 +0100)]
Merge remote branch 'origin/fruitiex/stormkeep_playerclip'

10 years agoMerge remote branch 'origin/fruitiex/fruitcampaign'
Rudolf Polzer [Mon, 15 Nov 2010 20:52:52 +0000 (21:52 +0100)]
Merge remote branch 'origin/fruitiex/fruitcampaign'

10 years agoMerge remote branch 'origin/fruitiex/space-elevator'
Rudolf Polzer [Mon, 15 Nov 2010 20:50:52 +0000 (21:50 +0100)]
Merge remote branch 'origin/fruitiex/space-elevator'

10 years agoMerge remote branch 'origin/fruitiex/dance'
Rudolf Polzer [Mon, 15 Nov 2010 20:49:41 +0000 (21:49 +0100)]
Merge remote branch 'origin/fruitiex/dance'

10 years agoFixed red launcpad lod skin typo, and added glowmaps for jumppads.
cbrutail [Mon, 15 Nov 2010 19:43:24 +0000 (20:43 +0100)]
Fixed red launcpad lod skin typo, and added glowmaps for jumppads.

10 years agofix a slightly misaligned jumppad (and commit into this branch to cause less trouble...
FruitieX [Mon, 15 Nov 2010 16:14:51 +0000 (18:14 +0200)]
fix a slightly misaligned jumppad (and commit into this branch to cause less trouble merging)

10 years agoMerge remote branch 'origin/divVerent/map-weapon-rebalance'
Rudolf Polzer [Mon, 15 Nov 2010 10:53:44 +0000 (11:53 +0100)]
Merge remote branch 'origin/divVerent/map-weapon-rebalance'

10 years agoMerge remote branch 'origin/fruitiex/mapinfo_improvements'
Rudolf Polzer [Mon, 15 Nov 2010 10:53:41 +0000 (11:53 +0100)]
Merge remote branch 'origin/fruitiex/mapinfo_improvements'

10 years agoplayerclip an outside lava area
FruitieX [Mon, 15 Nov 2010 10:40:11 +0000 (12:40 +0200)]
playerclip an outside lava area

10 years agoMerge branch 'master' into fruitiex/mapinfo_improvements
FruitieX [Mon, 15 Nov 2010 10:11:46 +0000 (12:11 +0200)]
Merge branch 'master' into fruitiex/mapinfo_improvements

10 years agoRevert "glowplant: nex -> campingrifle" because Samual said so
Rudolf Polzer [Sun, 14 Nov 2010 18:32:13 +0000 (19:32 +0100)]
Revert "glowplant: nex -> campingrifle" because Samual said so

This reverts commit bd4509a4b20e176b428176a1b5e2d03709cb2b58.

10 years agored-planet: change nex to rifle, and adjust ammo accordingly
Rudolf Polzer [Sun, 14 Nov 2010 18:31:57 +0000 (19:31 +0100)]
red-planet: change nex to rifle, and adjust ammo accordingly

10 years agoglowplant: nex -> campingrifle
Rudolf Polzer [Sun, 14 Nov 2010 18:24:49 +0000 (19:24 +0100)]
glowplant: nex -> campingrifle

10 years agodance: one nex -> rifle
Rudolf Polzer [Sun, 14 Nov 2010 18:22:43 +0000 (19:22 +0100)]
dance: one nex -> rifle

10 years agored-planet: one hagar -> seeker
Rudolf Polzer [Sun, 14 Nov 2010 18:20:01 +0000 (19:20 +0100)]
red-planet: one hagar -> seeker

10 years agoremove 1 cells pickups; change one uzi to a HLAC; change one bullets pickup to cells...
Rudolf Polzer [Sun, 14 Nov 2010 18:15:19 +0000 (19:15 +0100)]
remove 1 cells pickups; change one uzi to a HLAC; change one bullets pickup to cells; remove one bullets pickup

10 years agoMerge remote branch 'origin/divVerent/redplanet-recompile'
Rudolf Polzer [Sun, 14 Nov 2010 18:06:56 +0000 (19:06 +0100)]
Merge remote branch 'origin/divVerent/redplanet-recompile'

10 years agoMerge remote branch 'origin/fruitiex/cuinnton_stormkeep'
Rudolf Polzer [Sun, 14 Nov 2010 16:25:32 +0000 (17:25 +0100)]
Merge remote branch 'origin/fruitiex/cuinnton_stormkeep'

10 years agoMerge remote branch 'origin/tzork/glowplant'
Rudolf Polzer [Sun, 14 Nov 2010 16:17:52 +0000 (17:17 +0100)]
Merge remote branch 'origin/tzork/glowplant'

10 years agored_planet: recompile please
Rudolf Polzer [Sun, 14 Nov 2010 16:04:13 +0000 (17:04 +0100)]
red_planet: recompile please

10 years agoadd two missing surfaceparms for common/camera
Rudolf Polzer [Sun, 14 Nov 2010 16:03:15 +0000 (17:03 +0100)]
add two missing surfaceparms for common/camera

10 years agoremove the degenerate patches
FruitieX [Sun, 14 Nov 2010 14:52:38 +0000 (16:52 +0200)]
remove the degenerate patches

10 years agostormkeep changes by cuinnton
FruitieX [Sun, 14 Nov 2010 14:50:52 +0000 (16:50 +0200)]
stormkeep changes by cuinnton

10 years agoremove three useless (degenerate) patches from stormkeep (no visible change)
Rudolf Polzer [Sat, 13 Nov 2010 12:57:19 +0000 (13:57 +0100)]
remove three useless (degenerate) patches from stormkeep (no visible change)

10 years agoRevert accidental shader change.
tzork [Sat, 13 Nov 2010 05:34:12 +0000 (06:34 +0100)]
Revert accidental shader change.

10 years agoFix a small overcaulk
tzork [Sat, 13 Nov 2010 05:28:10 +0000 (06:28 +0100)]
Fix a small overcaulk

10 years agoalso add arena to the supported gamemodes. It already is in the func_wall gametypefilter
FruitieX [Fri, 12 Nov 2010 16:13:02 +0000 (18:13 +0200)]
also add arena to the supported gamemodes. It already is in the func_wall gametypefilter

10 years agorunningman: support DOM. Replace the round lights on the bottom level
FruitieX [Fri, 12 Nov 2010 16:11:36 +0000 (18:11 +0200)]
runningman: support DOM. Replace the round lights on the bottom level

10 years agorotate a spawnpoint to not face a wall, disable strength as well in dm/arena (stupid...
FruitieX [Thu, 11 Nov 2010 22:23:30 +0000 (00:23 +0200)]
rotate a spawnpoint to not face a wall, disable strength as well in dm/arena (stupid to have the waypoint appear but no way to get there)

10 years agotry removing all spawnpoints outside the dm area when in dm/arena
FruitieX [Thu, 11 Nov 2010 21:34:53 +0000 (23:34 +0200)]
try removing all spawnpoints outside the dm area when in dm/arena

10 years agothis one phoenix is supposed to be blue
FruitieX [Thu, 11 Nov 2010 21:03:37 +0000 (23:03 +0200)]
this one phoenix is supposed to be blue

10 years agorename runningmanctf to just runningman, it's not ctf only
FruitieX [Thu, 11 Nov 2010 20:24:40 +0000 (22:24 +0200)]
rename runningmanctf to just runningman, it's not ctf only

10 years agomapinfo and mapshot
FruitieX [Thu, 11 Nov 2010 20:22:23 +0000 (22:22 +0200)]
mapinfo and mapshot

10 years agoscale the lights a bit
FruitieX [Thu, 11 Nov 2010 20:16:46 +0000 (22:16 +0200)]
scale the lights a bit

10 years agowarpzone_fadeend += 100 :)
FruitieX [Thu, 11 Nov 2010 20:14:57 +0000 (22:14 +0200)]
warpzone_fadeend += 100 :)

10 years agoadd func_walls for dm/arena
FruitieX [Thu, 11 Nov 2010 20:13:52 +0000 (22:13 +0200)]
add func_walls for dm/arena

10 years agomove the generators back a bit, it wouldn't fit in between those rails
FruitieX [Thu, 11 Nov 2010 13:13:19 +0000 (15:13 +0200)]
move the generators back a bit, it wouldn't fit in between those rails

10 years agosame thing on space-elevator, add the blue/red edge model and a warpzone backdrop
FruitieX [Wed, 10 Nov 2010 20:54:59 +0000 (22:54 +0200)]
same thing on space-elevator, add the blue/red edge model and a warpzone backdrop

10 years agoadd the blue/red edge effects to the warpzones, plus the wavy effect
FruitieX [Wed, 10 Nov 2010 20:48:35 +0000 (22:48 +0200)]
add the blue/red edge effects to the warpzones, plus the wavy effect

10 years agoah, we have to push the warpzone back a bit from the other side as well to not have...
FruitieX [Wed, 10 Nov 2010 20:14:02 +0000 (22:14 +0200)]
ah, we have to push the warpzone back a bit from the other side as well to not have it look all buggy on the sides :)

10 years agogrr move the light outward a bit to prevent ugleh :(
FruitieX [Wed, 10 Nov 2010 20:10:58 +0000 (22:10 +0200)]
grr move the light outward a bit to prevent ugleh :(

10 years agoset a fade distance on the warpzones, replace a texture in a detail
FruitieX [Wed, 10 Nov 2010 20:06:38 +0000 (22:06 +0200)]
set a fade distance on the warpzones, replace a texture in a detail

10 years agoadd some light near the strength, make the tele a warpzone
FruitieX [Wed, 10 Nov 2010 20:01:57 +0000 (22:01 +0200)]
add some light near the strength, make the tele a warpzone

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 agoInitial 6-level campaign. Current campaign code seems to be broken though, the values...
FruitieX [Wed, 10 Nov 2010 18:14:22 +0000 (20:14 +0200)]
Initial 6-level campaign. Current campaign code seems to be broken though, the values aren't used correctly from the campaign file?

10 years agoadd mapshots for dance, space-elevator and nexballarena
FruitieX [Wed, 10 Nov 2010 13:10:40 +0000 (15:10 +0200)]
add mapshots for dance, space-elevator and nexballarena

10 years agofix space-elevator.mapinfo
FruitieX [Wed, 10 Nov 2010 12:40:48 +0000 (14:40 +0200)]
fix space-elevator.mapinfo

10 years agomisc mapinfo cleanups, add a mapinfo for nexballarena
FruitieX [Wed, 10 Nov 2010 12:37:09 +0000 (14:37 +0200)]
misc mapinfo cleanups, add a mapinfo for nexballarena

10 years agono KH on g-23
FruitieX [Wed, 10 Nov 2010 12:28:32 +0000 (14:28 +0200)]
no KH on g-23

10 years agoFixes to the LOD models. May not fix anything at all.
cbrutail [Sun, 7 Nov 2010 20:53:47 +0000 (21:53 +0100)]
Fixes to the LOD models. May not fix anything at all.

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 agoFew more details, caulk behind patches, split up some large surfaces, lower samplesiz...
unknown [Thu, 4 Nov 2010 21:07:52 +0000 (22:07 +0100)]
Few more details, caulk behind patches, split up some large surfaces, lower samplesize again.

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 agoAdd missing terrain model, tweak compile options.
unknown [Wed, 3 Nov 2010 22:26:52 +0000 (23:26 +0100)]
Add missing terrain model, tweak compile options.

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 agoFix map hull, model terrain, some detailing, soem item changes.
Jakob MG [Wed, 3 Nov 2010 20:14:45 +0000 (21:14 +0100)]
Fix map hull, model terrain, some detailing, soem item changes.

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