]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
8 years agosmall texture fix
kuniuthefrogg [Tue, 27 Dec 2016 19:18:19 +0000 (20:18 +0100)]
small texture fix

8 years agofix spawnpoints, add more glorious artwork by Mirio, new bot waypoints
kuniuthefrogg [Tue, 27 Dec 2016 15:19:48 +0000 (16:19 +0100)]
fix spawnpoints, add more glorious artwork by Mirio, new bot waypoints

8 years agoAdd nopicmip to shader file
Mirio [Sun, 27 Nov 2016 16:18:39 +0000 (17:18 +0100)]
Add nopicmip to shader file

8 years agoUpdate texture, add new texture
Mirio [Sat, 26 Nov 2016 22:29:09 +0000 (23:29 +0100)]
Update texture, add new texture

8 years agoscale 0.9
kuniuthefrogg [Sat, 26 Nov 2016 22:19:42 +0000 (23:19 +0100)]
scale 0.9

8 years agomore details, first try to scale it down a bit
kuniuthefrogg [Sat, 26 Nov 2016 16:34:04 +0000 (17:34 +0100)]
more details, first try to scale it down a bit

8 years agoFix shader file
Mirio [Wed, 23 Nov 2016 15:48:29 +0000 (16:48 +0100)]
Fix shader file

8 years agoMerge branch 'master' into kuniuthefrogg/boil
Mirio [Wed, 23 Nov 2016 15:47:03 +0000 (16:47 +0100)]
Merge branch 'master' into kuniuthefrogg/boil

8 years agouse Mirios txtures, bugfix
kuniuthefrogg [Wed, 23 Nov 2016 11:15:01 +0000 (12:15 +0100)]
use Mirios txtures, bugfix

8 years agoAdd textures + shader
Mirio [Tue, 22 Nov 2016 22:59:37 +0000 (23:59 +0100)]
Add textures + shader

8 years agomore clipping, more lights, item placement updates
kuniuthefrogg [Tue, 22 Nov 2016 17:52:51 +0000 (18:52 +0100)]
more clipping, more lights, item placement updates

8 years agoFix bot number of KH level
Mirio [Fri, 18 Nov 2016 16:54:24 +0000 (17:54 +0100)]
Fix bot number of KH level

8 years agonew DM map
kuniuthefrogg [Thu, 17 Nov 2016 19:07:25 +0000 (20:07 +0100)]
new DM map

8 years agoFix generator message
Mirio [Mon, 7 Nov 2016 16:04:32 +0000 (17:04 +0100)]
Fix generator message

8 years agoFix barrels
Mirio [Mon, 7 Nov 2016 08:50:06 +0000 (09:50 +0100)]
Fix barrels

8 years agoFix #122
Mirio [Mon, 7 Nov 2016 07:24:25 +0000 (08:24 +0100)]
Fix #122

8 years agoMerge branch 'maddin/map-warfare-updates'
Mirio [Wed, 26 Oct 2016 22:38:09 +0000 (00:38 +0200)]
Merge branch 'maddin/map-warfare-updates'

8 years agoMerge branch 'master' into maddin/map-warfare-updates
Mirio [Wed, 26 Oct 2016 22:37:10 +0000 (00:37 +0200)]
Merge branch 'master' into maddin/map-warfare-updates

8 years agoMerge branch 'packer/vorix' into 'master'
Mirio [Wed, 26 Oct 2016 22:36:09 +0000 (22:36 +0000)]
Merge branch 'packer/vorix' into 'master'

some fixes (vorix)

- updated location names (some locations are named based on weapon names)
- fixed positioning of some barrels
- fixed textures in some lava spot

See merge request !53

8 years agoMerge branch 'master' into packer/vorix 53/head
Mirio [Wed, 26 Oct 2016 22:35:07 +0000 (00:35 +0200)]
Merge branch 'master' into packer/vorix

8 years agoRemove gametypefilter and fix z-fight
Mirio [Tue, 25 Oct 2016 22:47:25 +0000 (00:47 +0200)]
Remove gametypefilter and fix z-fight

8 years agoMerge branch 'master' into packer/vorix
Mirio [Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)]
Merge branch 'master' into packer/vorix

8 years agoMerge branch 'master' into maddin/map-warfare-updates
Mirio [Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)]
Merge branch 'master' into maddin/map-warfare-updates

8 years agoMerge branch 'stormkeep-caulk-fix' into 'master'
Mirio [Thu, 20 Oct 2016 22:23:14 +0000 (22:23 +0000)]
Merge branch 'stormkeep-caulk-fix' into 'master'

stormkeep: fix visible caulk

Fixes visible caulk near 25 armor.
![xonotic20161017213807-00](/uploads/c0e99ced0385f7b4bdc31864cbe19f7d/xonotic20161017213807-00.png)

See merge request !55

8 years agostormkeep: fix visible caulk 55/head
t0uYK8Ne [Tue, 18 Oct 2016 04:41:13 +0000 (21:41 -0700)]
stormkeep: fix visible caulk

8 years agoMerge remote-tracking branch 'origin/matthiaskrgr/implosion_tubefix'
Mario [Tue, 16 Aug 2016 01:11:58 +0000 (11:11 +1000)]
Merge remote-tracking branch 'origin/matthiaskrgr/implosion_tubefix'

8 years agoUse .wav instead of .ogg in warfare map file, should fix precache warnings
Mario [Mon, 8 Aug 2016 12:19:32 +0000 (22:19 +1000)]
Use .wav instead of .ogg in warfare map file, should fix precache warnings

8 years agoimplosion: fix tubes not connected to brush (near map middle)
Matthias Krüger [Wed, 27 Jul 2016 14:36:25 +0000 (16:36 +0200)]
implosion: fix tubes not connected to brush (near map middle)

8 years agoFix a minor texture issue on dance
Mario [Wed, 13 Jul 2016 06:48:37 +0000 (16:48 +1000)]
Fix a minor texture issue on dance

8 years agoRemove non-team modes from dance (servers that wish to use this map in such modes...
Mario [Mon, 11 Jul 2016 14:29:06 +0000 (00:29 +1000)]
Remove non-team modes from dance (servers that wish to use this map in such modes can use their own mapinfo file), part of poll #227

8 years agoFix Atelier speakers pointing to a non-existent sound file
Mario [Sat, 25 Jun 2016 21:30:19 +0000 (07:30 +1000)]
Fix Atelier speakers pointing to a non-existent sound file

8 years agoCorrect spelling mistake in some commented out cvars
Mario [Sun, 12 Jun 2016 08:15:25 +0000 (18:15 +1000)]
Correct spelling mistake in some commented out cvars

8 years agofix lava spot
packer [Wed, 8 Jun 2016 18:32:19 +0000 (20:32 +0200)]
fix lava spot

8 years agofixed ceiling beneath MG, more clipping, some bot donotenter adjustments,
Maddin [Thu, 2 Jun 2016 14:19:13 +0000 (16:19 +0200)]
fixed ceiling beneath MG, more clipping, some bot donotenter adjustments,
minor location entity fix

8 years agoFix texture alignment
Mirio [Fri, 15 Apr 2016 19:18:41 +0000 (21:18 +0200)]
Fix texture alignment

8 years agoMerge branch 'matthiaskrgr/afterslime_windowfix' into 'master'
Mirio [Wed, 6 Apr 2016 17:32:51 +0000 (17:32 +0000)]
Merge branch 'matthiaskrgr/afterslime_windowfix' into 'master'

afterslime: fix window when viewing from inside slime (area near mortar)

before:
front: (ok) ![xonotic20160325030620-00](/uploads/f132cc6b12ea7a738cb001382dda53e6/xonotic20160325030620-00.png)

back before ![xonotic20160325030639-00](/uploads/a65a20f2aadb320ce6a913396f96bdd5/xonotic20160325030639-00.png)

(you can see through the sides which are solid viewed from the front)

back fixed: ![xonotic20160325031231-00](/uploads/e3d0d010d5043200eef35a9da2d76aff/xonotic20160325031231-00.png)

See merge request !51

8 years agoafterslime: fix window when viewing from inside slime (area near mortar)
Matthias Krüger [Fri, 25 Mar 2016 02:09:17 +0000 (03:09 +0100)]
afterslime: fix window when viewing from inside slime (area near mortar)

8 years agoRevert stuff
Mirio [Thu, 24 Mar 2016 14:52:51 +0000 (15:52 +0100)]
Revert stuff

8 years agoClips clips clip
Mirio [Wed, 23 Mar 2016 08:46:22 +0000 (09:46 +0100)]
Clips clips clip

8 years agoMerge remote-tracking branch 'origin/master' into packer/vorix
packer [Sun, 21 Feb 2016 18:48:04 +0000 (19:48 +0100)]
Merge remote-tracking branch 'origin/master' into packer/vorix

8 years agofix boxes
packer [Sun, 21 Feb 2016 12:46:31 +0000 (13:46 +0100)]
fix boxes

8 years agoWTF, this texture had red and green channels swapped. Fixed.
Rudolf Polzer [Wed, 27 Jan 2016 18:54:37 +0000 (13:54 -0500)]
WTF, this texture had red and green channels swapped. Fixed.

8 years agoFix some Y channels.
Rudolf Polzer [Wed, 27 Jan 2016 18:33:27 +0000 (13:33 -0500)]
Fix some Y channels.

8 years agoupdate location names
packer [Fri, 22 Jan 2016 12:01:09 +0000 (13:01 +0100)]
update location names

8 years agoFix missing texture
Mirio [Wed, 20 Jan 2016 09:10:25 +0000 (10:10 +0100)]
Fix missing texture

8 years agoFix most of solarpanel.
Rudolf Polzer [Fri, 15 Jan 2016 02:39:28 +0000 (03:39 +0100)]
Fix most of solarpanel.

Might still have inverted normals... need to check.

8 years agoUpdate shaderlist.
Rudolf Polzer [Thu, 14 Jan 2016 22:05:57 +0000 (23:05 +0100)]
Update shaderlist.

8 years agoFix catharsis and crystals shader (make them conform to shader-audit conventions)
Rudolf Polzer [Thu, 14 Jan 2016 22:05:02 +0000 (23:05 +0100)]
Fix catharsis and crystals shader (make them conform to shader-audit conventions)

8 years agoFix blendfunc auditing for texture blending shaders.
Rudolf Polzer [Thu, 14 Jan 2016 21:57:29 +0000 (22:57 +0100)]
Fix blendfunc auditing for texture blending shaders.

8 years agominor fixes
Rudolf Polzer [Thu, 14 Jan 2016 02:47:34 +0000 (03:47 +0100)]
minor fixes

8 years agoWeapon clips, so projectiles do not disappear
Mirio [Mon, 11 Jan 2016 03:42:53 +0000 (04:42 +0100)]
Weapon clips, so projectiles do not disappear

8 years agoEnlarge teleporter trigger so you won't get stuck anymore
Mirio [Mon, 11 Jan 2016 03:34:36 +0000 (04:34 +0100)]
Enlarge teleporter trigger so you won't get stuck anymore

8 years agoClip places which you should not reach, clip doorways. Texture some parts that were...
Mirio [Fri, 1 Jan 2016 16:43:02 +0000 (17:43 +0100)]
Clip places which you should not reach, clip doorways. Texture some parts that were caulk before

8 years agoFix warpzone sound volumes
Mirio [Thu, 31 Dec 2015 00:12:22 +0000 (01:12 +0100)]
Fix warpzone sound volumes

8 years agoAdd a note to misc_gamemodel preferring use of misc_clientmodel
Mario [Wed, 30 Dec 2015 21:32:53 +0000 (07:32 +1000)]
Add a note to misc_gamemodel preferring use of misc_clientmodel

9 years agoMerge branch 'maddin/textures-phillipk2x-fixes' into 'master'
Mirio [Mon, 26 Oct 2015 02:30:28 +0000 (02:30 +0000)]
Merge branch 'maddin/textures-phillipk2x-fixes' into 'master'

Maddin/textures phillipk2x fixes

Fixes issue xonotic/xonotic-data.pk3dir#1574 and adds a missing editorimage.

See merge request !49

9 years agoactual add the missing image...
mschwan [Fri, 23 Oct 2015 15:04:40 +0000 (17:04 +0200)]
actual add the missing image...

9 years agoadded transparent and opaque variations for grate shaders, added missing shader image...
mschwan [Fri, 23 Oct 2015 15:03:07 +0000 (17:03 +0200)]
added transparent and opaque variations for grate shaders, added missing shader image for rock-sand-dotproduct

9 years agoFix getting stuck at pipes
Mirio [Thu, 1 Oct 2015 20:51:51 +0000 (22:51 +0200)]
Fix getting stuck at pipes

9 years agoMerge branch 'maddin/map-warfare' into 'master'
Mirio [Thu, 1 Oct 2015 20:25:30 +0000 (20:25 +0000)]
Merge branch 'maddin/map-warfare' into 'master'

Warfare - workaround for issue with buggy reflections, see #102 and 8e24d997

Workaround for issue with buggy reflections, see #102 and 8e24d997. The brushes with the water shader just need to be a bit taller and have to be detail brushes.

See merge request !48

9 years agoaligned light over the MG
mschwan [Thu, 1 Oct 2015 18:34:20 +0000 (20:34 +0200)]
aligned light over the MG

9 years agoenable reflections again
mschwan [Thu, 1 Oct 2015 13:52:19 +0000 (15:52 +0200)]
enable reflections again

9 years agoworkaround for issue with buggy reflections, see #102 and 8e24d997
mschwan [Thu, 1 Oct 2015 13:26:45 +0000 (15:26 +0200)]
workaround for issue with buggy reflections, see #102 and 8e24d997

9 years agoMerge branch 'maddin/textures-phillipk2x-cleanup' into 'master'
Mirio [Thu, 1 Oct 2015 10:30:44 +0000 (10:30 +0000)]
Merge branch 'maddin/textures-phillipk2x-cleanup' into 'master'

Maddin/textures phillipk2x cleanup

This cleans up the phillipk2x shaders and adds some features:
* Overall better formatting of the shader file.
* Shaders that have an alpha channel, like grates, now work properly.
* Decals are now decals and not opaque textures.
* The glow of all light and computer textures has been adjusted to show their respective colour instead of pure white.

See merge request !46

9 years agoMerge branch 'maddin/textures-common' into 'master'
Mirio [Thu, 1 Oct 2015 10:06:37 +0000 (10:06 +0000)]
Merge branch 'maddin/textures-common' into 'master'

Maddin/textures common

This branch contains the following fixes and improvements:
* It adds the previously missing textures `common/botclip` and `common/noimpact`.
* All common-textures have been recreated with a uniform look and font (using Xolonium).
* Extremely reduced file sizes. Factor is about 5 in average.
* No compression ugliness visible anymore.
* 3 completely new base-shaders which will be useful for mappers blocking out their maps (so you can focus on the structure and do actual texturing later).
* Fixing typo in `common/antiportal` and `common/nodrawnonsolid`.
* Every texture now has a clear name matching the shader.

Here is a preview of the new textures:
![preview](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/5ebe217097a0c01e65223c3161acc024/preview.png)

See merge request !47

9 years agoMerge branch 'maddin/map-warfare' into 'master'
Mirio [Thu, 1 Oct 2015 09:21:41 +0000 (09:21 +0000)]
Merge branch 'maddin/map-warfare' into 'master'

Maddin/map warfare

This fixes the remaining issues of #102 and adds some minor visual improvements (outer and inner terrain parts mainly).

See merge request !45

9 years agoDisable reflections
Mirio [Thu, 1 Oct 2015 09:19:16 +0000 (11:19 +0200)]
Disable reflections

9 years agoadded missing empty lines, formatting
mschwan [Wed, 30 Sep 2015 13:56:36 +0000 (15:56 +0200)]
added missing empty lines, formatting

9 years agoMerge branch 'matthiaskrgr/light_misc' into 'master'
Mirio [Tue, 29 Sep 2015 08:02:41 +0000 (08:02 +0000)]
Merge branch 'matthiaskrgr/light_misc' into 'master'

Matthiaskrgr/light misc

drain: make underground areas a bit darker (was still brighter than post-srgb)

space-elevator: make make a bit darker (reduce skylight) as some players complained; fix sky shaderfile which I accidentally messed up (changed wrong number which moved sun-exit instead of changing sun brightness)

dance: try to increase contrast between dark and bright areas a bit ( @Mario complained)

See merge request !42

9 years agoincreased bouncescale
mschwan [Mon, 28 Sep 2015 11:27:43 +0000 (13:27 +0200)]
increased bouncescale

9 years agoadded polygonoffset and sort keys for proper decals
mschwan [Mon, 28 Sep 2015 11:14:02 +0000 (13:14 +0200)]
added polygonoffset and sort keys for proper decals

9 years agonew compile options: less bounce but more intense bouncescale, should look realistic
mschwan [Mon, 28 Sep 2015 09:27:31 +0000 (11:27 +0200)]
new compile options: less bounce but more intense bouncescale, should look realistic

9 years agoreadding info_autoscreenshot
mschwan [Mon, 28 Sep 2015 09:22:00 +0000 (11:22 +0200)]
readding info_autoscreenshot

9 years agominor shader adjustments
mschwan [Mon, 28 Sep 2015 09:16:04 +0000 (11:16 +0200)]
minor shader adjustments

9 years agopanels done, pipes done, trims done, walls done
mschwan [Mon, 28 Sep 2015 09:03:43 +0000 (11:03 +0200)]
panels done, pipes done, trims done, walls done

9 years agolights done, natural done, natural shader are now improved for terrain(-brushwork...
mschwan [Mon, 28 Sep 2015 08:54:52 +0000 (10:54 +0200)]
lights done, natural done, natural shader are now improved for terrain(-brushwork), also added dotproduct shader for easy and good-looking blended terrain

9 years agofloor done, grates know render correctly using their alphachannel
mschwan [Mon, 28 Sep 2015 08:40:00 +0000 (10:40 +0200)]
floor done, grates know render correctly using their alphachannel

9 years agobase done, ceiling done, computer done
mschwan [Mon, 28 Sep 2015 08:25:18 +0000 (10:25 +0200)]
base done, ceiling done, computer done

9 years agokill this sneaky autoscreenshot entity with fire
mschwan [Wed, 23 Sep 2015 15:45:17 +0000 (17:45 +0200)]
kill this sneaky autoscreenshot entity with fire

9 years agocactus models shall not receive shadows
mschwan [Wed, 23 Sep 2015 13:13:42 +0000 (15:13 +0200)]
cactus models shall not receive shadows

9 years agodance: decrease samplesize from 6 to 4 to avoid shady artefacts
Matthias Krüger [Wed, 23 Sep 2015 00:19:13 +0000 (02:19 +0200)]
dance: decrease samplesize from 6 to 4 to avoid shady artefacts

9 years agodance: gamma 0.7
Matthias Krüger [Tue, 22 Sep 2015 12:41:36 +0000 (14:41 +0200)]
dance: gamma 0.7

9 years agodrain: use gamma 0.75 making inside areas a bit darker
Matthias Krüger [Tue, 22 Sep 2015 00:30:51 +0000 (02:30 +0200)]
drain: use gamma 0.75 making inside areas a bit darker

9 years agospace-elevator: fix skylight position, make map a bit darker
Matthias Krüger [Mon, 21 Sep 2015 22:56:12 +0000 (00:56 +0200)]
space-elevator: fix skylight position, make map a bit darker

9 years agoMerge branch 'matthiaskrgr/implosion_clipfix' into 'master'
Mirio [Mon, 21 Sep 2015 17:28:36 +0000 (17:28 +0000)]
Merge branch 'matthiaskrgr/implosion_clipfix' into 'master'

implosion: remove weaponclip

there was weaponclip at the bottom of the map which would cause items dropped by players who died by falling off the map to not disappear. removed the clip.

See merge request !41

9 years agochanged glow textures to include colour, removed redundant light texture (was duplica...
mschwan [Mon, 21 Sep 2015 14:16:35 +0000 (16:16 +0200)]
changed glow textures to include colour, removed redundant light texture (was duplicate), fixed all light shaders

9 years agoforgot to increase the version number
mschwan [Sun, 20 Sep 2015 19:15:40 +0000 (21:15 +0200)]
forgot to increase the version number

9 years agosmall visual improvements, shader clean-up
mschwan [Sun, 20 Sep 2015 19:11:46 +0000 (21:11 +0200)]
small visual improvements, shader clean-up

9 years agoremoved trailing whitespace, testing decal shader
mschwan [Sun, 20 Sep 2015 18:13:32 +0000 (20:13 +0200)]
removed trailing whitespace, testing decal shader

9 years agoadded missing texture "noimpact", reworked texture "nolightmap"
mschwan [Sun, 20 Sep 2015 17:10:14 +0000 (19:10 +0200)]
added missing texture "noimpact", reworked texture "nolightmap"

9 years agotesting misc_model instead of misc_gamemodel for correct rotation, mapinfo fixes
mschwan [Sun, 20 Sep 2015 11:17:23 +0000 (13:17 +0200)]
testing misc_model instead of misc_gamemodel for correct rotation, mapinfo fixes

9 years agoimplosion: there was weaponclip at the bottom of the map which would cause items...
Matthias Krüger [Thu, 17 Sep 2015 12:25:24 +0000 (14:25 +0200)]
implosion: there was weaponclip at the bottom of the map which would cause items dropped by players who died by falling off the map to not disappear. removed the clip.

9 years agooverhaul of the common textures with a uniform design and font, added base shaders...
mschwan [Tue, 15 Sep 2015 16:46:41 +0000 (18:46 +0200)]
overhaul of the common textures with a uniform design and font, added base shaders for blocking out maps

9 years agominor botclipping, added missing force_meta key to boulder model
mschwan [Tue, 15 Sep 2015 14:56:07 +0000 (16:56 +0200)]
minor botclipping, added missing force_meta key to boulder model

9 years agoMerge branch 'matthiaskrgr/catharsis_2' into 'master'
Mirio [Fri, 11 Sep 2015 17:58:44 +0000 (17:58 +0000)]
Merge branch 'matthiaskrgr/catharsis_2' into 'master'

catharsis: fix some horizont-brushes looking cut off in the bases

before: ![xonotic20150910004727-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/0bb6e937b82d16b4a0fc39ee5020af3e/xonotic20150910004727-00.jpg)
![xonotic20150910004724-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/677a579d27a0da48f7da501de7341324/xonotic20150910004724-00.jpg)

after: ![xonotic20150910005921-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/a543ce292b165c632c83f52eabe54b41/xonotic20150910005921-00.jpg)
![xonotic20150910005919-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/bc47ca7cf7123b6f609744a2cb41acf0/xonotic20150910005919-00.jpg)

See merge request !40

9 years agoIncrease version
Mirio [Fri, 11 Sep 2015 17:57:12 +0000 (19:57 +0200)]
Increase version

9 years agocatharsis: fix some horizont-brushes looking cut off in the bases
Matthias Krüger [Wed, 9 Sep 2015 22:45:22 +0000 (00:45 +0200)]
catharsis: fix some horizont-brushes looking cut off in the bases

9 years agoDont forget map file maybe
Mirio [Mon, 7 Sep 2015 15:48:00 +0000 (17:48 +0200)]
Dont forget map file maybe

9 years agoRemove spawn decals from items
Mirio [Mon, 7 Sep 2015 15:45:19 +0000 (17:45 +0200)]
Remove spawn decals from items

9 years agoMerge branch 'matthiaskrgr/silentsiege' into 'master'
Mirio [Mon, 7 Sep 2015 13:45:58 +0000 (13:45 +0000)]
Merge branch 'matthiaskrgr/silentsiege' into 'master'

Matthiaskrgr/silentsiege fixes

fix getting stuck for real this time (checked that the final pk3 actually works), also fix 2 see-through brushes.

See merge request !39