xonotic/xonotic-maps.pk3dir.git
9 years agoMerge branch 'master' into fruitiex/runningmanctf
Rudolf Polzer [Sat, 25 Sep 2010 12:15:26 +0000 (14:15 +0200)]
Merge branch 'master' into fruitiex/runningmanctf

9 years agoadjust for the rename
Rudolf Polzer [Sat, 25 Sep 2010 12:00:06 +0000 (14:00 +0200)]
adjust for the rename

9 years agoalso rename the model (is nicer)
Rudolf Polzer [Sat, 25 Sep 2010 11:59:36 +0000 (13:59 +0200)]
also rename the model (is nicer)

9 years agomoving warpzone shaders to effects_warpzone part II
Rudolf Polzer [Sat, 25 Sep 2010 11:52:02 +0000 (13:52 +0200)]
moving warpzone shaders to effects_warpzone part II

9 years agomoving warpzone shaders to effects_warpzone
Rudolf Polzer [Sat, 25 Sep 2010 11:51:34 +0000 (13:51 +0200)]
moving warpzone shaders to effects_warpzone

9 years agoalso make liquids_* generic
Rudolf Polzer [Sat, 25 Sep 2010 11:45:01 +0000 (13:45 +0200)]
also make liquids_* generic

9 years agoalso allow effects_* as purpose named textures
Rudolf Polzer [Sat, 25 Sep 2010 11:43:55 +0000 (13:43 +0200)]
also allow effects_* as purpose named textures

9 years agoREALLY return exit status
Rudolf Polzer [Sat, 25 Sep 2010 11:33:59 +0000 (13:33 +0200)]
REALLY return exit status

9 years agostill output stuff!
Rudolf Polzer [Sat, 25 Sep 2010 10:55:21 +0000 (12:55 +0200)]
still output stuff!

9 years agoshader-audit: return a status
Rudolf Polzer [Sat, 25 Sep 2010 10:47:17 +0000 (12:47 +0200)]
shader-audit: return a status

9 years agostormkeep: use cdtrack 5 for now ("stairs")
Rudolf Polzer [Fri, 24 Sep 2010 21:59:36 +0000 (23:59 +0200)]
stormkeep: use cdtrack 5 for now ("stairs")

9 years agoadd some clip brushes to the jumppads to prevent accidentally getting stuck
Rudolf Polzer [Fri, 24 Sep 2010 19:23:27 +0000 (21:23 +0200)]
add some clip brushes to the jumppads to prevent accidentally getting stuck

9 years agostormkeep: add keyhunt support
Rudolf Polzer [Fri, 24 Sep 2010 15:18:06 +0000 (17:18 +0200)]
stormkeep: add keyhunt support

9 years agoLET THERE BE STORMKEEP
Rudolf Polzer [Fri, 24 Sep 2010 15:17:09 +0000 (17:17 +0200)]
LET THERE BE STORMKEEP

9 years agoexperimental water shader changes by Calinou (more transparent); please test
Rudolf Polzer [Tue, 21 Sep 2010 10:37:21 +0000 (12:37 +0200)]
experimental water shader changes by Calinou (more transparent); please test

9 years agobetter triggering for warpzones/teleports
Rudolf Polzer [Sun, 19 Sep 2010 13:27:15 +0000 (15:27 +0200)]
better triggering for warpzones/teleports

9 years agog-23.map.options: update : )
Rudolf Polzer [Fri, 17 Sep 2010 08:38:38 +0000 (10:38 +0200)]
g-23.map.options: update :   )

9 years agoshader-audit: do not complain
Rudolf Polzer [Fri, 17 Sep 2010 08:31:53 +0000 (10:31 +0200)]
shader-audit: do not complain

9 years agoturn off all preview models in entities.def as these do not work at the moment. Needs...
Rudolf Polzer [Mon, 13 Sep 2010 05:04:43 +0000 (07:04 +0200)]
turn off all preview models in entities.def as these do not work at the moment. Needs fixing later.

9 years agofix typos in the script
Rudolf Polzer [Sun, 12 Sep 2010 17:04:53 +0000 (19:04 +0200)]
fix typos in the script

9 years agoadd a shader name converter script for eX->exx, trak4->trak4x, trak5->trak5x
Rudolf Polzer [Sun, 12 Sep 2010 16:59:55 +0000 (18:59 +0200)]
add a shader name converter script for eX->exx, trak4->trak4x, trak5->trak5x

9 years agofix typo in exosystem2 shader file
Rudolf Polzer [Sun, 12 Sep 2010 16:36:33 +0000 (18:36 +0200)]
fix typo in exosystem2 shader file

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Sun, 12 Sep 2010 14:33:39 +0000 (16:33 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

9 years agoadd a high-elevation version of exosystem2 by savagex
Rudolf Polzer [Sun, 12 Sep 2010 14:33:29 +0000 (16:33 +0200)]
add a high-elevation version of exosystem2 by savagex

9 years agoa new cubemapped water shader
Rudolf Polzer [Sun, 12 Sep 2010 14:27:21 +0000 (16:27 +0200)]
a new cubemapped water shader

9 years agofix the last fix :) lower deviance is better
Rudolf Polzer [Sat, 11 Sep 2010 17:23:25 +0000 (19:23 +0200)]
fix the last fix :) lower deviance is better

9 years agolet's fight some gloss artifacts on g-23
Rudolf Polzer [Sat, 11 Sep 2010 16:53:56 +0000 (18:53 +0200)]
let's fight some gloss artifacts on g-23

9 years agoMade some small tweaks. Should fix a few things, make it look prettier? ^.^
MooKow [Sat, 11 Sep 2010 04:47:45 +0000 (23:47 -0500)]
Made some small tweaks. Should fix a few things, make it look prettier? ^.^

9 years agoFixed documentation
PlasmaSheep [Sat, 21 Aug 2010 23:28:05 +0000 (16:28 -0700)]
Fixed documentation

9 years agoadd missing panel_metal01b texture in exx
Rudolf Polzer [Fri, 10 Sep 2010 18:41:17 +0000 (20:41 +0200)]
add missing panel_metal01b texture in exx

9 years agoadd that VISCULLING flag
Rudolf Polzer [Mon, 6 Sep 2010 04:38:55 +0000 (06:38 +0200)]
add that VISCULLING flag

9 years agofix a shader dupe
Rudolf Polzer [Fri, 3 Sep 2010 23:03:12 +0000 (01:03 +0200)]
fix a shader dupe

9 years agoMerge remote branch 'refs/remotes/origin/mookow/shaderlist'
Rudolf Polzer [Tue, 31 Aug 2010 20:24:59 +0000 (22:24 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/shaderlist'

9 years agoUpdating the shaderlist... you are welcome
MooKow [Tue, 24 Aug 2010 21:53:22 +0000 (16:53 -0500)]
Updating the shaderlist... you are welcome

9 years agoshader-audit: fix a typo
Rudolf Polzer [Tue, 24 Aug 2010 12:06:44 +0000 (14:06 +0200)]
shader-audit: fix a typo

9 years agoMerge remote branch 'origin/fruitiex/warpzone'
Rudolf Polzer [Tue, 24 Aug 2010 09:41:14 +0000 (11:41 +0200)]
Merge remote branch 'origin/fruitiex/warpzone'

9 years agoMerge remote branch 'origin/fruitiex/lightshaders'
Rudolf Polzer [Tue, 24 Aug 2010 09:39:27 +0000 (11:39 +0200)]
Merge remote branch 'origin/fruitiex/lightshaders'

9 years agoMerge remote branch 'refs/remotes/origin/diabolik/facility114-team'
Rudolf Polzer [Tue, 24 Aug 2010 06:39:38 +0000 (08:39 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/facility114-team'

9 years agoMerge remote branch 'origin/master' into diabolik/facility114-team
Sahil Singhal [Tue, 24 Aug 2010 06:37:00 +0000 (02:37 -0400)]
Merge remote branch 'origin/master' into diabolik/facility114-team

9 years agoFinish misc and wall.
Sahil Singhal [Tue, 24 Aug 2010 05:44:35 +0000 (01:44 -0400)]
Finish misc and wall.

9 years agoCeiling and trim. Need to finish wall and misc.
Sahil Singhal [Tue, 24 Aug 2010 04:26:31 +0000 (00:26 -0400)]
Ceiling and trim. Need to finish wall and misc.

9 years agoMerge remote branch 'refs/remotes/origin/mookow/map-g-23'
Rudolf Polzer [Tue, 24 Aug 2010 03:53:51 +0000 (05:53 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/map-g-23'

9 years agoMerge remote branch 'refs/remotes/origin/diabolik/techpanel'
Rudolf Polzer [Tue, 24 Aug 2010 03:41:18 +0000 (05:41 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/techpanel'

9 years agoMerge remote branch 'refs/remotes/origin/diabolik/facility114invx'
Rudolf Polzer [Tue, 24 Aug 2010 03:38:43 +0000 (05:38 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/facility114invx'

9 years agoActually add the red textures though.
Sahil Singhal [Tue, 24 Aug 2010 00:57:14 +0000 (20:57 -0400)]
Actually add the red textures though.

9 years agoAdd some red variations for team maps.
Sahil Singhal [Tue, 24 Aug 2010 00:56:20 +0000 (20:56 -0400)]
Add some red variations for team maps.

9 years agoembed heightmaps into the normalmap files (AUTOGENERATED, not perfect)
Rudolf Polzer [Mon, 23 Aug 2010 10:53:22 +0000 (12:53 +0200)]
embed heightmaps into the normalmap files (AUTOGENERATED, not perfect)

9 years agoFacility114 Inverted by Dib. Original by Oblivion.
Sahil Singhal [Mon, 23 Aug 2010 07:46:43 +0000 (03:46 -0400)]
Facility114 Inverted by Dib. Original by Oblivion.

9 years agoMore tiny tweaks. Why are people so picky? :P
MooKow [Sat, 21 Aug 2010 19:25:22 +0000 (14:25 -0500)]
More tiny tweaks. Why are people so picky? :P

9 years agoAdd green and yellow variations. Ready for merge.
Sahil Singhal [Sat, 21 Aug 2010 05:32:30 +0000 (01:32 -0400)]
Add green and yellow variations. Ready for merge.

9 years agoMerge remote branch 'origin/master' into diabolik/techpanel
Sahil Singhal [Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)]
Merge remote branch 'origin/master' into diabolik/techpanel

9 years agoGloss maps for techpanelx.
Sahil Singhal [Sat, 21 Aug 2010 00:14:38 +0000 (20:14 -0400)]
Gloss maps for techpanelx.

9 years agoSquashed commit of the following:
Rudolf Polzer [Fri, 20 Aug 2010 16:14:34 +0000 (18:14 +0200)]
Squashed commit of the following:

commit 321d3a6e9b5fb405850e613fe1d30cc15f287b08
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 18:00:51 2010 +0200

    yet another attempt at fixing normals. Parameters: heightsource=1 filter=3 scale=0.4

commit 739ce7735f5715fecf997e9ec1ee47e7789a3af1
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:56:32 2010 +0200

    another attempt

commit f2a8032b8c86aede59656996f9d6965c566b04ff
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:47:00 2010 +0200

    redid normalmaps with different settings (3x3 Prewitt, 30% scale)

commit 68ddcb38722c31375c50c095accb5868cbaa2ab4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:09:20 2010 +0200

    replace bump by norm maps

commit c41ed619474526d44c794fa908bab6dd89d25c84
Merge: 821968e 10c8dae
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:18:50 2010 +0200

    Merge branch 'master' into diabolik/eX2x

commit 821968edf839a5f4bf266e1da9ea963823295ca0
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:16:37 2010 +0200

    add base-yellowpaint too

commit 0f3e661c96f9b9ec1d3605758c304b1dc2f970c0
Merge: dc0855e a2e171d
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:15:11 2010 +0200

    Merge branch 'master' into diabolik/eX2x

commit dc0855e24c2cd03e2ea568717e163e4ae5f18183
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:13:48 2010 +0200

    make ex2x/base-chainlink actually transparent

commit 212718e02d0d77801424410a2fac664fbadca1c7
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Date:   Fri Aug 20 00:10:38 2010 -0400

    Remove chainlink_alfa.

commit 15fec8069700a9101416f49d522cbd6956ea3083
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Date:   Thu Aug 19 17:42:55 2010 -0400

    ex2x by Kay. New texture set. Hopefully organized correctly.

9 years agoAdd another blue texture.
Sahil Singhal [Fri, 20 Aug 2010 15:47:01 +0000 (11:47 -0400)]
Add another blue texture.

9 years agoRevert "also allow _bump", because DDS-converted _bump will not work, we NEED _norm
Rudolf Polzer [Fri, 20 Aug 2010 04:18:25 +0000 (06:18 +0200)]
Revert "also allow _bump", because DDS-converted _bump will not work, we NEED _norm

This reverts commit a2e171dbec4303eb20a814dce168b44ed4280cb8.

9 years agoalso allow _bump
Rudolf Polzer [Fri, 20 Aug 2010 04:14:59 +0000 (06:14 +0200)]
also allow _bump

9 years agoMerge remote branch 'origin/master' into diabolik/techpanel
Sahil Singhal [Thu, 19 Aug 2010 17:33:28 +0000 (13:33 -0400)]
Merge remote branch 'origin/master' into diabolik/techpanel

9 years agoGive color suffix to red textures. Add blue versions of red.
Sahil Singhal [Thu, 19 Aug 2010 17:30:59 +0000 (13:30 -0400)]
Give color suffix to red textures. Add blue versions of red.

9 years agoMerge remote branch 'refs/remotes/origin/mookow/map-g-23'
Rudolf Polzer [Thu, 19 Aug 2010 05:10:35 +0000 (07:10 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/map-g-23'

9 years agotechpanelx by theShadow. Does not have gloss maps yet. 1024x1024. I think I organized...
Sahil Singhal [Thu, 19 Aug 2010 03:59:09 +0000 (23:59 -0400)]
techpanelx by theShadow. Does not have gloss maps yet. 1024x1024. I think I organized everything correctly :P

9 years agobump options file for new skybox shader
Rudolf Polzer [Tue, 17 Aug 2010 05:06:57 +0000 (07:06 +0200)]
bump options file for new skybox shader

9 years agostart using skylight instead of stupid surfacelight for skies (compiles faster, looks...
Rudolf Polzer [Tue, 17 Aug 2010 05:00:58 +0000 (07:00 +0200)]
start using skylight instead of stupid surfacelight for skies (compiles faster, looks better)

9 years agoremove the xonotic-maps.pk3dir prefix (or it will not work in a release)
Rudolf Polzer [Mon, 16 Aug 2010 04:29:45 +0000 (06:29 +0200)]
remove the xonotic-maps.pk3dir prefix (or it will not work in a release)

9 years agoOk, I updated ALL of the models to run from xonotic-maps.pk3dir. Also added a few...
MooKow [Mon, 16 Aug 2010 03:30:41 +0000 (22:30 -0500)]
Ok, I updated ALL of the models to run from xonotic-maps.pk3dir. Also added a few more mini-cubes for the sake of it.

9 years agoMerge remote branch 'refs/remotes/origin/mookow/map-g-23'
Rudolf Polzer [Sat, 14 Aug 2010 20:25:29 +0000 (22:25 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/map-g-23'

9 years agoThe models now link to xonotic-maps.pk3dir instead of xonotic-data.pk3dir. And aww...
MooKow [Sat, 14 Aug 2010 18:23:18 +0000 (13:23 -0500)]
The models now link to xonotic-maps.pk3dir instead of xonotic-data.pk3dir. And aww look at the cute little mini-cubes!

9 years agoYeah, I changed it. To parasti: I moved the weapons/ammo to a non-floaty place in...
MooKow [Fri, 13 Aug 2010 23:04:31 +0000 (18:04 -0500)]
Yeah, I changed it. To parasti: I moved the weapons/ammo to a non-floaty place in the weapon-floaty room. The h/a can stay floating because they do that anyways. Dib: Your vent is fixed. Have fun :P

9 years agobigfan: remove useless .tga suffix
Rudolf Polzer [Mon, 9 Aug 2010 05:05:48 +0000 (07:05 +0200)]
bigfan: remove useless .tga suffix

9 years agoMerge remote branch 'refs/remotes/origin/tzork/terrain01x'
Rudolf Polzer [Mon, 9 Aug 2010 05:00:38 +0000 (07:00 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/terrain01x'

Conflicts:
scripts/shaderlist.txt

9 years agoMerge remote branch 'refs/remotes/origin/mookow/facility114fix'
Rudolf Polzer [Mon, 9 Aug 2010 04:49:09 +0000 (06:49 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/facility114fix'

9 years agoCenter the corridor03 texture properly
MooKow [Sun, 8 Aug 2010 04:33:40 +0000 (23:33 -0500)]
Center the corridor03 texture properly

9 years agoFixed some facility114 normalmaps.
MooKow [Sat, 7 Aug 2010 06:32:05 +0000 (01:32 -0500)]
Fixed some facility114 normalmaps.

9 years agoMerge remote branch 'origin/m0rfar/heaven'
Rudolf Polzer [Fri, 6 Aug 2010 23:02:18 +0000 (01:02 +0200)]
Merge remote branch 'origin/m0rfar/heaven'

9 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Fri, 6 Aug 2010 23:01:08 +0000 (01:01 +0200)]
Merge branch 'master' into divVerent/skyboxes

9 years agoadd leaves*.tga
Rudolf Polzer [Fri, 6 Aug 2010 22:59:15 +0000 (00:59 +0200)]
add leaves*.tga

9 years agoMerge remote branch 'origin/mookow/liquids'
Rudolf Polzer [Fri, 6 Aug 2010 22:56:55 +0000 (00:56 +0200)]
Merge remote branch 'origin/mookow/liquids'

Conflicts:
scripts/liquids.shader

9 years agoOops... Got the shader names right this time for that lava XD
MooKow [Fri, 6 Aug 2010 22:52:55 +0000 (17:52 -0500)]
Oops... Got the shader names right this time for that lava XD

9 years agoRemoved protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/storm...
MooKow [Fri, 6 Aug 2010 22:50:52 +0000 (17:50 -0500)]
Removed protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/stormkeep/lava.tga)

9 years agoUpdate g-23
Rudolf Polzer [Fri, 6 Aug 2010 22:45:42 +0000 (00:45 +0200)]
Update g-23

Conflicts:
maps/g-23.map

9 years agofix the liquids shader files
Rudolf Polzer [Fri, 6 Aug 2010 22:41:51 +0000 (00:41 +0200)]
fix the liquids shader files

9 years agoMerge remote branch 'origin/mookow/liquids'
Rudolf Polzer [Fri, 6 Aug 2010 22:39:46 +0000 (00:39 +0200)]
Merge remote branch 'origin/mookow/liquids'

9 years agoSorting out this liquids stuff. This should be as clean as it gets :D
MooKow [Fri, 6 Aug 2010 22:37:56 +0000 (17:37 -0500)]
Sorting out this liquids stuff. This should be as clean as it gets :D

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Fri, 6 Aug 2010 20:24:04 +0000 (22:24 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

9 years agoadd the models that are actually meant to be used on maps
Rudolf Polzer [Thu, 5 Aug 2010 17:51:12 +0000 (19:51 +0200)]
add the models that are actually meant to be used on maps

9 years agoshader-audit: fix the mktemp fix
Rudolf Polzer [Thu, 5 Aug 2010 11:26:51 +0000 (13:26 +0200)]
shader-audit: fix the mktemp fix

9 years agoFix CRLF (again..?!)
Jakob MG [Thu, 5 Aug 2010 11:17:28 +0000 (13:17 +0200)]
Fix CRLF (again..?!)

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into tzork/terrain01x
Jakob MG [Thu, 5 Aug 2010 11:07:55 +0000 (13:07 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into tzork/terrain01x

9 years agoshader-audit: work without mktemp
Rudolf Polzer [Thu, 5 Aug 2010 11:03:00 +0000 (13:03 +0200)]
shader-audit: work without mktemp

9 years agoFix a few normal map alphas (to sharp, looked horrid with offsettmapping)
Jakob MG [Wed, 4 Aug 2010 20:50:25 +0000 (22:50 +0200)]
Fix a few normal map alphas (to sharp, looked horrid with offsettmapping)

9 years agoAdd testureset terrain01x
Jakob MG [Wed, 4 Aug 2010 18:19:17 +0000 (20:19 +0200)]
Add testureset terrain01x

9 years agofix a typo - now this branch passes shader-audit too
Rudolf Polzer [Wed, 4 Aug 2010 13:09:37 +0000 (15:09 +0200)]
fix a typo - now this branch passes shader-audit too

9 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Wed, 4 Aug 2010 13:09:05 +0000 (15:09 +0200)]
Merge branch 'master' into divVerent/skyboxes

9 years agofix shader file
Rudolf Polzer [Wed, 4 Aug 2010 13:05:20 +0000 (15:05 +0200)]
fix shader file

9 years agoMerge branch 'master' into m0rfar/heaven
Rudolf Polzer [Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)]
Merge branch 'master' into m0rfar/heaven

Conflicts:
scripts/exosystem.shader

9 years agoshader-audit: more fixes
Rudolf Polzer [Wed, 4 Aug 2010 13:02:42 +0000 (15:02 +0200)]
shader-audit: more fixes

9 years agoshader audit: handle skyboxes properly
Rudolf Polzer [Wed, 4 Aug 2010 12:55:11 +0000 (14:55 +0200)]
shader audit: handle skyboxes properly

9 years agoNew map g-23 (small deathmatch arena in space), first official version.
MooKow [Wed, 4 Aug 2010 04:48:12 +0000 (06:48 +0200)]
New map g-23 (small deathmatch arena in space), first official version.

9 years agoadhere to xonotic shader naming convention
Rudolf Polzer [Mon, 2 Aug 2010 14:54:01 +0000 (16:54 +0200)]
adhere to xonotic shader naming convention

9 years agoadd xonotic_jumppad01
Rudolf Polzer [Mon, 2 Aug 2010 14:52:43 +0000 (16:52 +0200)]
add xonotic_jumppad01

9 years agoadd two missing misc_model spawnflags
Rudolf Polzer [Sun, 1 Aug 2010 18:40:08 +0000 (20:40 +0200)]
add two missing misc_model spawnflags