]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
14 years agomake mapinfo actually work
Maik Merten [Sun, 19 Dec 2010 14:23:27 +0000 (15:23 +0100)]
make mapinfo actually work

14 years agopreview picture for techassault and a mapinfo file
Maik Merten [Sun, 19 Dec 2010 12:33:55 +0000 (13:33 +0100)]
preview picture for techassault and a mapinfo file

14 years agosmall visual updates
Maik Merten [Sat, 18 Dec 2010 20:40:19 +0000 (21:40 +0100)]
small visual updates

14 years agofix texture alignment on one crate and add authors and license information to worldspawn
Maik Merten [Sun, 12 Dec 2010 11:02:41 +0000 (12:02 +0100)]
fix texture alignment on one crate and add authors and license information to worldspawn

14 years agoplay with colored lighting, put light fixtures over the tunnels leading to the second...
Maik Merten [Sat, 11 Dec 2010 15:24:02 +0000 (16:24 +0100)]
play with colored lighting, put light fixtures over the tunnels leading to the second objective's target so new players actually see them.

14 years agointerconnect the two parallel corridors
Maik Merten [Sat, 11 Dec 2010 10:00:14 +0000 (11:00 +0100)]
interconnect the two parallel corridors

14 years agoinstead of having one corridor into the base have two parallel ones
Maik Merten [Sat, 11 Dec 2010 08:56:49 +0000 (09:56 +0100)]
instead of having one corridor into the base have two parallel ones

14 years agoprettier sky is more pretty
Maik Merten [Wed, 8 Dec 2010 20:30:55 +0000 (21:30 +0100)]
prettier sky is more pretty

14 years agoI OBEY THE FRUITIEX (and move the armor near the turrets closer to the defenders...
Maik Merten [Wed, 8 Dec 2010 19:02:07 +0000 (20:02 +0100)]
I OBEY THE FRUITIEX (and move the armor near the turrets closer to the defenders' spawn points)

14 years agoaltered item placement to reduce defenders spamming the entrance corridor. Don't...
Maik Merten [Wed, 8 Dec 2010 18:51:11 +0000 (19:51 +0100)]
altered item placement to reduce defenders spamming the entrance corridor. Don't have cells in direct reach. Don't give the defenders a crylinkg, give them a minelayer instead. The minelayer, after all, smells like a defensive weapon.

14 years agotechassault update by cortez
FruitieX [Wed, 1 Dec 2010 19:24:20 +0000 (21:24 +0200)]
techassault update by cortez

14 years agorandomize boxes so the storage rooms don't look exactly the same, make objectives...
Maik Merten [Wed, 1 Dec 2010 18:35:48 +0000 (19:35 +0100)]
randomize boxes so the storage rooms don't look exactly the same, make objectives take less damage (after all, there are more objectives now), some minor armor-item reshuffling for attackers

14 years agosome additional detail
Maik Merten [Sun, 28 Nov 2010 17:12:09 +0000 (18:12 +0100)]
some additional detail

14 years agoThis station is now on red alert! Attack incoming! Enable those strange rotating...
Maik Merten [Sun, 28 Nov 2010 15:57:59 +0000 (16:57 +0100)]
This station is now on red alert! Attack incoming! Enable those strange rotating red-alert warning devices so everyone knows how serious this is!

14 years agosome crates in central room, some armor and health for attackers (so they are more...
Maik Merten [Sun, 28 Nov 2010 13:38:24 +0000 (14:38 +0100)]
some crates in central room, some armor and health for attackers (so they are more likely to survive corridor spam), stuff blown up now actually creates an explosion effect

14 years agoremove turrets from central room, more detail to central room and reactor room
Maik Merten [Sat, 27 Nov 2010 18:43:42 +0000 (19:43 +0100)]
remove turrets from central room, more detail to central room and reactor room

14 years agolower respawntime for ammo
Maik Merten [Sat, 27 Nov 2010 16:20:54 +0000 (17:20 +0100)]
lower respawntime for ammo

14 years agoadd some ammo and health, fix floating brushes I introduced last commit
Maik Merten [Sat, 27 Nov 2010 16:12:29 +0000 (17:12 +0100)]
add some ammo and health, fix floating brushes I introduced last commit

14 years agoadd third objective: You first have to destroy two power relais thingies before the...
Maik Merten [Sat, 27 Nov 2010 15:46:37 +0000 (16:46 +0100)]
add third objective: You first have to destroy two power relais thingies before the storage rooms are accessible

14 years agobegin detailing center room, fix some gaps between patches and brushes
Maik Merten [Sat, 27 Nov 2010 14:42:20 +0000 (15:42 +0100)]
begin detailing center room, fix some gaps between patches and brushes

14 years agoMerge remote branch 'origin/master' into savagex/techassault
FruitieX [Wed, 24 Nov 2010 18:17:36 +0000 (20:17 +0200)]
Merge remote branch 'origin/master' into savagex/techassault

14 years agoMOAR HEALTH on objectives :)
FruitieX [Tue, 23 Nov 2010 15:50:08 +0000 (17:50 +0200)]
MOAR HEALTH on objectives :)

14 years agobit more health on the first objectives
FruitieX [Tue, 23 Nov 2010 13:35:37 +0000 (15:35 +0200)]
bit more health on the first objectives

14 years agowarehouse textures (in textures/map_techassault/)
FruitieX [Tue, 23 Nov 2010 13:28:44 +0000 (15:28 +0200)]
warehouse textures (in textures/map_techassault/)

14 years agonew techassault version by cortez666
Maik Merten [Sun, 21 Nov 2010 14:00:59 +0000 (15:00 +0100)]
new techassault version by cortez666

14 years agoupdate by cortez
FruitieX [Fri, 19 Nov 2010 18:50:17 +0000 (20:50 +0200)]
update by cortez

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

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

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

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

14 years agotechassault update by cortez
FruitieX [Wed, 17 Nov 2010 13:44:30 +0000 (15:44 +0200)]
techassault update by cortez

14 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

14 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

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

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

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

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

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

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

14 years agotechassault update by cortez. (sorry maikmerten for pushing into your branch, just...
FruitieX [Mon, 15 Nov 2010 17:33:57 +0000 (19:33 +0200)]
techassault update by cortez. (sorry maikmerten for pushing into your branch, just trying to avoid eventual merge hell if you don't see the change :P. feel free to revert if you disagree with these changes)

14 years agoMerge branch 'master' into savagex/techassault
FruitieX [Mon, 15 Nov 2010 17:26:55 +0000 (19:26 +0200)]
Merge branch 'master' into savagex/techassault

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

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

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

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

14 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

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

14 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

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

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

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

14 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

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

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

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

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

14 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

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

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

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

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

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

14 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

14 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

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

14 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

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

14 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

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

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

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

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

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

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

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

14 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

14 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

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

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

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

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

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

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

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

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

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

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

14 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

14 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

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

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

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

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

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

14 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

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

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

14 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

14 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

14 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