]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
14 years agoCatwalk texturing
PlasmaSheep [Fri, 27 Aug 2010 03:27:03 +0000 (20:27 -0700)]
Catwalk texturing

14 years agoFinished up second column.
PlasmaSheep [Fri, 27 Aug 2010 03:22:40 +0000 (20:22 -0700)]
Finished up second column.

14 years agoGeo and columns
PlasmaSheep [Thu, 26 Aug 2010 04:20:01 +0000 (21:20 -0700)]
Geo and columns

14 years agoStarted on columnns
PlasmaSheep [Thu, 26 Aug 2010 03:50:29 +0000 (20:50 -0700)]
Started on columnns

14 years agoScaling changes
PlasmaSheep [Thu, 26 Aug 2010 02:53:55 +0000 (19:53 -0700)]
Scaling changes

14 years agoMore geom + tex, not done with concept retexture
PlasmaSheep [Tue, 24 Aug 2010 23:25:52 +0000 (16:25 -0700)]
More geom + tex, not done with concept retexture

14 years agoGeometry and textures
PlasmaSheep [Tue, 24 Aug 2010 22:00:48 +0000 (15:00 -0700)]
Geometry and textures

14 years agoSome more texturing, got one area finished more or less
PlasmaSheep [Tue, 24 Aug 2010 21:26:20 +0000 (14:26 -0700)]
Some more texturing, got one area finished more or less
Mookow look at this :P

14 years agoContinuing retexture
PlasmaSheep [Tue, 24 Aug 2010 21:02:38 +0000 (14:02 -0700)]
Continuing retexture

14 years agoBegan base concept retexture
PlasmaSheep [Tue, 24 Aug 2010 00:36:23 +0000 (17:36 -0700)]
Began base concept retexture

14 years agoFound more clipping
PlasmaSheep [Mon, 23 Aug 2010 23:51:10 +0000 (16:51 -0700)]
Found more clipping

14 years agoMore clip fixes
PlasmaSheep [Mon, 23 Aug 2010 23:50:20 +0000 (16:50 -0700)]
More clip fixes

14 years agoThere can be such a thing as too much clipping
PlasmaSheep [Mon, 23 Aug 2010 23:47:52 +0000 (16:47 -0700)]
There can be such a thing as too much clipping

14 years agoThink I've got the hinting down
PlasmaSheep [Mon, 23 Aug 2010 23:30:59 +0000 (16:30 -0700)]
Think I've got the hinting down

14 years agoFixed botclip
PlasmaSheep [Mon, 23 Aug 2010 23:08:53 +0000 (16:08 -0700)]
Fixed botclip

14 years agoSymmetry
PlasmaSheep [Mon, 23 Aug 2010 23:07:20 +0000 (16:07 -0700)]
Symmetry

14 years agoNo need to autobuild yet
PlasmaSheep [Mon, 23 Aug 2010 22:50:25 +0000 (15:50 -0700)]
No need to autobuild yet

14 years agoAll entities converted
PlasmaSheep [Mon, 23 Aug 2010 22:50:10 +0000 (15:50 -0700)]
All entities converted

14 years agoEntity conversions part 1
PlasmaSheep [Mon, 23 Aug 2010 22:34:54 +0000 (15:34 -0700)]
Entity conversions part 1

14 years agoFinished cutting map in half :P
PlasmaSheep [Mon, 23 Aug 2010 21:31:41 +0000 (14:31 -0700)]
Finished cutting map in half :P

14 years agoCut the map in half.
MooKow [Mon, 23 Aug 2010 21:24:15 +0000 (16:24 -0500)]
Cut the map in half.

14 years agoAdded autobuild options
PlasmaSheep [Mon, 23 Aug 2010 03:35:11 +0000 (20:35 -0700)]
Added autobuild options

14 years agoTrying to un-mirror map... removed red base
PlasmaSheep [Mon, 23 Aug 2010 03:25:01 +0000 (20:25 -0700)]
Trying to un-mirror map... removed red base

14 years agoFirst commit of Like Spinning Plates retexture
PlasmaSheep [Sat, 21 Aug 2010 23:40:37 +0000 (16:40 -0700)]
First commit of Like Spinning Plates retexture

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

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

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

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

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

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

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

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

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

14 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

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

14 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

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

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

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

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

14 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

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

14 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

14 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

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

14 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

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

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

14 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

14 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

14 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

14 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

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

14 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

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

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

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

14 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

14 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

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

14 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

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

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

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

14 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

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

14 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

14 years agoallow map-specific shaders to customize outside textures
Rudolf Polzer [Wed, 28 Jul 2010 18:14:53 +0000 (20:14 +0200)]
allow map-specific shaders to customize outside textures

14 years agofix comments
Rudolf Polzer [Wed, 28 Jul 2010 17:15:11 +0000 (19:15 +0200)]
fix comments

14 years agoupdate the rules, more strict, see http://nopaste.linux-dev.org/?7646 or grep source...
Rudolf Polzer [Wed, 28 Jul 2010 17:09:27 +0000 (19:09 +0200)]
update the rules, more strict, see http://nopaste.linux-dev.org/?7646 or grep source for ##

14 years agoshader audit: use liquids_water, liquids_slime etc. names please, is handled better...
Rudolf Polzer [Wed, 28 Jul 2010 16:47:55 +0000 (18:47 +0200)]
shader audit: use liquids_water, liquids_slime etc. names please, is handled better by Radiant 1.4 that way

14 years agoshader audit: ignore .xcf, allow _suffix for effect textures
Rudolf Polzer [Mon, 26 Jul 2010 15:05:44 +0000 (17:05 +0200)]
shader audit: ignore .xcf, allow _suffix for effect textures

14 years agonew allowed paths: liquids/water, liquids/slime, liquids/lava, warpzone
Rudolf Polzer [Mon, 26 Jul 2010 15:01:55 +0000 (17:01 +0200)]
new allowed paths: liquids/water, liquids/slime, liquids/lava, warpzone

14 years agomore crlf madness
Rudolf Polzer [Sat, 24 Jul 2010 15:09:50 +0000 (17:09 +0200)]
more crlf madness

14 years agoallow skybox foo_bar to use env/foo (common for having multiple shaders for one skybox)
Rudolf Polzer [Thu, 22 Jul 2010 13:37:50 +0000 (15:37 +0200)]
allow skybox foo_bar to use env/foo (common for having multiple shaders for one skybox)

14 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Thu, 22 Jul 2010 13:35:52 +0000 (15:35 +0200)]
Merge branch 'master' into divVerent/skyboxes

14 years agodetect skyparms
Rudolf Polzer [Thu, 22 Jul 2010 13:35:45 +0000 (15:35 +0200)]
detect skyparms

14 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Thu, 22 Jul 2010 13:32:25 +0000 (15:32 +0200)]
Merge branch 'master' into divVerent/skyboxes

14 years agorename skyboxes to match audit script in main
Rudolf Polzer [Thu, 22 Jul 2010 13:32:10 +0000 (15:32 +0200)]
rename skyboxes to match audit script in main

14 years agoallow models/*
Rudolf Polzer [Thu, 22 Jul 2010 13:30:24 +0000 (15:30 +0200)]
allow models/*

14 years agoshader audit: allow skies_*.shader defining textures/skies/*
Rudolf Polzer [Thu, 22 Jul 2010 13:27:08 +0000 (15:27 +0200)]
shader audit: allow skies_*.shader defining textures/skies/*

14 years agorename shader files properly
Rudolf Polzer [Thu, 22 Jul 2010 13:01:52 +0000 (15:01 +0200)]
rename shader files properly

14 years agoadd a preview image of calm_sea
Rudolf Polzer [Thu, 22 Jul 2010 13:01:06 +0000 (15:01 +0200)]
add a preview image of calm_sea

14 years agonew skyboxes by cuinnton
Rudolf Polzer [Thu, 22 Jul 2010 12:59:53 +0000 (14:59 +0200)]
new skyboxes by cuinnton

14 years agomorphed's fan
Rudolf Polzer [Wed, 21 Jul 2010 17:53:11 +0000 (19:53 +0200)]
morphed's fan

14 years agofix :P
Rudolf Polzer [Wed, 21 Jul 2010 11:36:22 +0000 (13:36 +0200)]
fix :P

14 years agoshader_audit: allow textures/map_*/*
Rudolf Polzer [Wed, 21 Jul 2010 11:35:20 +0000 (13:35 +0200)]
shader_audit: allow textures/map_*/*

14 years agoMerge branch 'master' into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 11:10:58 +0000 (13:10 +0200)]
Merge branch 'master' into m0rfar/heaven

14 years agonew .gitattributes file
Rudolf Polzer [Wed, 21 Jul 2010 10:38:12 +0000 (12:38 +0200)]
new .gitattributes file

14 years agoCRLF fixes :P
Rudolf Polzer [Wed, 21 Jul 2010 10:28:28 +0000 (12:28 +0200)]
CRLF fixes :P

14 years agoMerge remote branch 'origin/master' into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 10:16:06 +0000 (12:16 +0200)]
Merge remote branch 'origin/master' into m0rfar/heaven

14 years agoMerge branch 'origin/master' (early part) into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 10:01:32 +0000 (12:01 +0200)]
Merge branch 'origin/master' (early part) into m0rfar/heaven

14 years agoCRLF fixes
Rudolf Polzer [Sun, 18 Jul 2010 14:26:52 +0000 (16:26 +0200)]
CRLF fixes

14 years agoFixes crete01_phoenix and _phoenixb normal map depth problems. If you want depth...
MooKow [Thu, 15 Jul 2010 23:25:06 +0000 (18:25 -0500)]
Fixes crete01_phoenix and _phoenixb normal map depth problems. If you want depth to match, keep px^2 same in the two files that you need seamless.

14 years agomake the repo pass the audit; move two textures to nexcompat (actually, q3 compat)
Rudolf Polzer [Thu, 15 Jul 2010 18:49:40 +0000 (20:49 +0200)]
make the repo pass the audit; move two textures to nexcompat (actually, q3 compat)

14 years agobetter shader audit script - now all of tZork's shaders pass
Rudolf Polzer [Thu, 15 Jul 2010 18:41:40 +0000 (20:41 +0200)]
better shader audit script - now all of tZork's shaders pass

14 years agobetter
Rudolf Polzer [Thu, 15 Jul 2010 18:02:29 +0000 (20:02 +0200)]
better

14 years agoshader-audit: use the parsed shader data instead of a stupid grep
Rudolf Polzer [Thu, 15 Jul 2010 17:58:31 +0000 (19:58 +0200)]
shader-audit: use the parsed shader data instead of a stupid grep

14 years agoshader audit script improved (parses shaders now)
Rudolf Polzer [Thu, 15 Jul 2010 15:45:00 +0000 (17:45 +0200)]
shader audit script improved (parses shaders now)

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir