]>
de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Wed, 9 Mar 2016 17:11:13 +0000 (18:11 +0100)]
Merge branch 'master' into mirio/fuse
Rudolf Polzer [Wed, 27 Jan 2016 18:54:37 +0000 (13:54 -0500)]
WTF, this texture had red and green channels swapped. Fixed.
Rudolf Polzer [Wed, 27 Jan 2016 18:33:27 +0000 (13:33 -0500)]
Fix some Y channels.
Mirio [Wed, 20 Jan 2016 09:10:25 +0000 (10:10 +0100)]
Fix missing texture
Mirio [Fri, 15 Jan 2016 15:42:20 +0000 (16:42 +0100)]
Merge branch 'master' into mirio/fuse
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.
Rudolf Polzer [Thu, 14 Jan 2016 22:05:57 +0000 (23:05 +0100)]
Update shaderlist.
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)
Rudolf Polzer [Thu, 14 Jan 2016 21:57:29 +0000 (22:57 +0100)]
Fix blendfunc auditing for texture blending shaders.
Rudolf Polzer [Thu, 14 Jan 2016 02:47:34 +0000 (03:47 +0100)]
minor fixes
Mirio [Mon, 11 Jan 2016 03:42:53 +0000 (04:42 +0100)]
Weapon clips, so projectiles do not disappear
Mirio [Mon, 11 Jan 2016 03:34:36 +0000 (04:34 +0100)]
Enlarge teleporter trigger so you won't get stuck anymore
Mirio [Fri, 1 Jan 2016 16:46:12 +0000 (17:46 +0100)]
Move box slightly to allow trickjump
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
Mirio [Thu, 31 Dec 2015 00:12:22 +0000 (01:12 +0100)]
Fix warpzone sound volumes
Mario [Wed, 30 Dec 2015 21:32:53 +0000 (07:32 +1000)]
Add a note to misc_gamemodel preferring use of misc_clientmodel
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
mschwan [Fri, 23 Oct 2015 15:04:40 +0000 (17:04 +0200)]
actual add the missing 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
Mirio [Thu, 1 Oct 2015 20:51:51 +0000 (22:51 +0200)]
Fix getting stuck at pipes
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
mschwan [Thu, 1 Oct 2015 18:34:20 +0000 (20:34 +0200)]
aligned light over the MG
mschwan [Thu, 1 Oct 2015 13:52:19 +0000 (15:52 +0200)]
enable reflections again
mschwan [Thu, 1 Oct 2015 13:26:45 +0000 (15:26 +0200)]
workaround for issue with buggy reflections, see #102 and
8e24d997
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
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
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
Mirio [Thu, 1 Oct 2015 09:19:16 +0000 (11:19 +0200)]
Disable reflections
mschwan [Wed, 30 Sep 2015 13:56:36 +0000 (15:56 +0200)]
added missing empty lines, formatting
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
mschwan [Mon, 28 Sep 2015 11:27:43 +0000 (13:27 +0200)]
increased bouncescale
mschwan [Mon, 28 Sep 2015 11:14:02 +0000 (13:14 +0200)]
added polygonoffset and sort keys for proper decals
mschwan [Mon, 28 Sep 2015 09:27:31 +0000 (11:27 +0200)]
new compile options: less bounce but more intense bouncescale, should look realistic
mschwan [Mon, 28 Sep 2015 09:22:00 +0000 (11:22 +0200)]
readding info_autoscreenshot
mschwan [Mon, 28 Sep 2015 09:16:04 +0000 (11:16 +0200)]
minor shader adjustments
mschwan [Mon, 28 Sep 2015 09:03:43 +0000 (11:03 +0200)]
panels done, pipes done, trims done, walls done
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
mschwan [Mon, 28 Sep 2015 08:40:00 +0000 (10:40 +0200)]
floor done, grates know render correctly using their alphachannel
mschwan [Mon, 28 Sep 2015 08:25:18 +0000 (10:25 +0200)]
base done, ceiling done, computer done
mschwan [Wed, 23 Sep 2015 15:45:17 +0000 (17:45 +0200)]
kill this sneaky autoscreenshot entity with fire
mschwan [Wed, 23 Sep 2015 13:13:42 +0000 (15:13 +0200)]
cactus models shall not receive shadows
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
Matthias Krüger [Tue, 22 Sep 2015 12:41:36 +0000 (14:41 +0200)]
dance: gamma 0.7
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
Matthias Krüger [Mon, 21 Sep 2015 22:56:12 +0000 (00:56 +0200)]
space-elevator: fix skylight position, make map a bit darker
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
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
mschwan [Sun, 20 Sep 2015 19:15:40 +0000 (21:15 +0200)]
forgot to increase the version number
mschwan [Sun, 20 Sep 2015 19:11:46 +0000 (21:11 +0200)]
small visual improvements, shader clean-up
mschwan [Sun, 20 Sep 2015 18:13:32 +0000 (20:13 +0200)]
removed trailing whitespace, testing decal shader
mschwan [Sun, 20 Sep 2015 17:10:14 +0000 (19:10 +0200)]
added missing texture "noimpact", reworked texture "nolightmap"
mschwan [Sun, 20 Sep 2015 11:17:23 +0000 (13:17 +0200)]
testing misc_model instead of misc_gamemodel for correct rotation, mapinfo fixes
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.
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
mschwan [Tue, 15 Sep 2015 14:56:07 +0000 (16:56 +0200)]
minor botclipping, added missing force_meta key to boulder model
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
Mirio [Fri, 11 Sep 2015 17:57:12 +0000 (19:57 +0200)]
Increase version
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
Mirio [Mon, 7 Sep 2015 15:48:00 +0000 (17:48 +0200)]
Dont forget map file maybe
Mirio [Mon, 7 Sep 2015 15:45:19 +0000 (17:45 +0200)]
Remove spawn decals from items
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
Mirio [Mon, 7 Sep 2015 13:44:55 +0000 (15:44 +0200)]
Increase version
Mirio [Mon, 7 Sep 2015 13:41:10 +0000 (13:41 +0000)]
Merge branch 'matthiaskrgr/atelier' into 'master'
Matthiaskrgr/atelier remove "respawnrings" under items, make light-models solid for bullets.
See merge request !36
Mirio [Mon, 7 Sep 2015 13:39:41 +0000 (15:39 +0200)]
Increase version number
Matthias Krüger [Mon, 7 Sep 2015 13:35:35 +0000 (15:35 +0200)]
silentsiege: fix pipe and other small glitch
Mirio [Mon, 7 Sep 2015 13:34:56 +0000 (13:34 +0000)]
Merge branch 'matthiaskrgr/leave_em_behind' into 'master'
leave_em_behind: make sure players can't fall into the arrow-holes in the floor
The arrows in the ground were not clipped, players could fall in to them in an unfortunate moment.
See merge request !37
Mirio [Mon, 7 Sep 2015 13:20:22 +0000 (13:20 +0000)]
Merge branch 'matthiaskrgr/implosion' into 'master'
implosion: add "light" brushes to the lights inside the pillars on the lower level.
There were some light-entities inside the pillars on the lower levels, but no brushes indicated where the light comes from. Add them.
See merge request !38
Matthias Krüger [Mon, 7 Sep 2015 09:18:37 +0000 (11:18 +0200)]
silentsiege: in the pk3, the bug still existed, try again, also fix texture disalignment on nerby ramp
Matthias Krüger [Mon, 7 Sep 2015 01:05:11 +0000 (03:05 +0200)]
implosion: add "light" brushes to the lights inside the pillars on the lower level.
Matthias Krüger [Mon, 7 Sep 2015 01:03:44 +0000 (03:03 +0200)]
silentsiege: second attempt to fix getting stuck on that edge, also stuff some see-through edges.
Matthias Krüger [Mon, 7 Sep 2015 01:01:59 +0000 (03:01 +0200)]
leave_em_behind: make sure players can't fall into the arrow-holes in the floor
Mirio [Sun, 6 Sep 2015 22:25:47 +0000 (00:25 +0200)]
New mappictures due to srgb builds
Mirio [Sun, 6 Sep 2015 22:14:36 +0000 (22:14 +0000)]
Merge branch 'matthiaskrgr/afterslime_2' into 'master'
afterslime: add stuff outside of megaarmor area, fix minor item misplacement.
Added stuff outside near the megaarmor ![xonotic20150906190527-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/
75c96e4c13f53bbb0397b4310374e8ca /xonotic20150906190527-00.jpg)
![xonotic20150906190504-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/
0b13b1a7c7afca3c5ac500cbcd148be8 /xonotic20150906190504-00.jpg)
![xonotic20150906190451-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/
3a5dfc5b30bb3e73249a409a9c0648e5 /xonotic20150906190451-00.jpg)
Also fix items being a little misplaced (before-screenshot): ![xonotic20150906191116-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/
3ff85a02be7e54b2d9a17dbaf1f2ac59 /xonotic20150906191116-00.jpg)
See merge request !34
Mirio [Sun, 6 Sep 2015 22:13:26 +0000 (00:13 +0200)]
Move bullets, lower armor shards, increase version
Mirio [Sun, 6 Sep 2015 18:48:12 +0000 (20:48 +0200)]
Update shaderlist
Mirio [Sun, 6 Sep 2015 18:25:32 +0000 (18:25 +0000)]
Merge branch 'matthiaskrgr/silentsiege_stuckfix' into 'master'
silentsiege: fix player getting stuck on edge underneath nex platform
Found by @terencehill , players could get stuck moving around on the column under the nex platform.
Fixed by slightly moving stuff around.
Fixes #103
See merge request !33
Mirio [Sun, 6 Sep 2015 18:23:48 +0000 (20:23 +0200)]
Increase version
Mirio [Sun, 6 Sep 2015 18:06:20 +0000 (18:06 +0000)]
Merge branch 'Mirio/catharsis' into 'master'
Mirio/catharsis
Fixes #101
See merge request !35
Matthias Krüger [Sun, 6 Sep 2015 18:06:19 +0000 (20:06 +0200)]
atelier: change lights from misc_gamemodel to misc_model so projectils no longer pass through them.
Mirio [Sun, 6 Sep 2015 18:03:43 +0000 (20:03 +0200)]
Fix texture in red base
Matthias Krüger [Sun, 6 Sep 2015 17:30:37 +0000 (19:30 +0200)]
atelier: remove all the respawnrings. They were removed from other maps too and look weird when there are no items around
Matthias Krüger [Sun, 6 Sep 2015 16:26:39 +0000 (18:26 +0200)]
afterslime: more texture fixes.
Mirio [Sun, 6 Sep 2015 15:50:14 +0000 (17:50 +0200)]
Merge branch 'master' into Mirio/catharsis
Matthias Krüger [Sun, 6 Sep 2015 15:34:52 +0000 (17:34 +0200)]
afterslime: caulk some unseeable surfaces to get under 3 lightmaps again.
Matthias Krüger [Sun, 6 Sep 2015 15:26:46 +0000 (17:26 +0200)]
afterslime: fix texture alignment on mixer-rotors
Matthias Krüger [Sun, 6 Sep 2015 15:19:33 +0000 (17:19 +0200)]
afterslime: fix item-placement near teleport exit.
Matthias Krüger [Sun, 6 Sep 2015 13:48:53 +0000 (15:48 +0200)]
afterslime: add couple more details
Matthias Krüger [Sun, 6 Sep 2015 10:20:41 +0000 (12:20 +0200)]
afterslime: add some dacal, WIP
Matthias Krüger [Sun, 6 Sep 2015 09:59:54 +0000 (11:59 +0200)]
afterslime: add acid-pools to outside where megaarmor is
Matthias Krüger [Sat, 5 Sep 2015 23:10:50 +0000 (01:10 +0200)]
silentsiege: fix player getting stuck on edge underneath nex platform
Mirio [Sat, 5 Sep 2015 16:33:30 +0000 (18:33 +0200)]
Add map_warfare to shaderlist
Mirio [Sat, 5 Sep 2015 12:25:35 +0000 (14:25 +0200)]
Fix #101
Mirio [Sat, 5 Sep 2015 12:21:05 +0000 (14:21 +0200)]
Enable DM on Implosion according to poll 322
Mirio [Sat, 5 Sep 2015 12:20:29 +0000 (14:20 +0200)]
Hide G-23 according to poll 321
Mirio [Fri, 4 Sep 2015 16:02:03 +0000 (18:02 +0200)]
Set author, message and _description in map files
Mirio [Fri, 4 Sep 2015 15:15:12 +0000 (15:15 +0000)]
Merge branch 'matthiaskrgr/srgb' into 'master'
switch maps to sRGB
Switches all maps to sRGB lighting
had to change light intensity in most cases, added some _sRGB textures (to not break old maps), added script to change all lights on a map, some maps have bounce lighting now.
Maps:
- [x] _hudsetup
- [x] afterslime
- [x] atelier
- [x] catharsis
- [x] dance
- [x] drain
- [x] finalrage
- [x] glowplant
- [x] implosion
- [x] leave_em_behind
- [x] nexballarena
- [x] oilrig
- [x] runningman
- [x] runningmanctf
- [x] solarium
- [x] space-elevator
- [x] stormkeep
- [x] techassault
- [x] vorix
- [x] warfare
- [x] xoylent
See merge request !32
Mirio [Fri, 4 Sep 2015 14:51:53 +0000 (16:51 +0200)]
Merge branch 'matthiaskrgr/srgb' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir into matthiaskrgr/srgb
Mirio [Fri, 4 Sep 2015 14:48:31 +0000 (16:48 +0200)]
Try to fix some weird 'mound'
Mirio [Fri, 4 Sep 2015 14:45:15 +0000 (16:45 +0200)]
Fix some floating barrels
Matthias Krüger [Mon, 31 Aug 2015 20:02:57 +0000 (22:02 +0200)]
fix broken shader file. oops...