xonotic/xonotic-maps.pk3dir.git
3 years agomerge conflict 56/head
Mirio [Mon, 20 Feb 2017 12:27:59 +0000 (13:27 +0100)]
merge conflict

3 years agoMerge branch 't0uYK8Ne/ent-typos-fix' into 'master' 21/head
Mirio [Thu, 9 Feb 2017 14:09:59 +0000 (14:09 +0000)]
Merge branch 't0uYK8Ne/ent-typos-fix' into 'master'

Fix typos in entities.ent

See merge request !62

3 years agoFix typos in entities.ent 62/head
t0uYK8Ne [Wed, 8 Feb 2017 22:21:23 +0000 (14:21 -0800)]
Fix typos in entities.ent

3 years agoHide rc and cts levels since those modes are hidden in the menu
Mirio [Wed, 8 Feb 2017 14:07:28 +0000 (15:07 +0100)]
Hide rc and cts levels since those modes are hidden in the menu

3 years agoMerge branch 'martin-t/campaign2' into 'master'
Mirio [Tue, 7 Feb 2017 15:56:04 +0000 (15:56 +0000)]
Merge branch 'martin-t/campaign2' into 'master'

More campaign description fixes

See merge request !61

3 years agoreword 61/head
Martin Taibr [Tue, 7 Feb 2017 14:12:35 +0000 (15:12 +0100)]
reword

3 years agofix default for jetpack
Martin Taibr [Tue, 7 Feb 2017 14:05:23 +0000 (15:05 +0100)]
fix default for jetpack

3 years agofix bot number in another keyhunt level
Martin Taibr [Tue, 7 Feb 2017 14:02:40 +0000 (15:02 +0100)]
fix bot number in another keyhunt level

3 years agoForgot to change description
Mirio [Wed, 1 Feb 2017 18:39:18 +0000 (19:39 +0100)]
Forgot to change description

3 years agoReduce LMS lives to 5
Mirio [Wed, 1 Feb 2017 18:29:37 +0000 (19:29 +0100)]
Reduce LMS lives to 5

3 years agoUpdate Catharsis mapinfo
Mirio [Wed, 1 Feb 2017 18:29:11 +0000 (19:29 +0100)]
Update Catharsis mapinfo

3 years agoMerge branch 'martin-t/campaign' into 'master'
Mirio [Wed, 1 Feb 2017 18:23:53 +0000 (18:23 +0000)]
Merge branch 'martin-t/campaign' into 'master'

Campaign description tweaks

See merge request !60

3 years agofix default key for hook in campaign descriptions 60/head
Martin Taibr [Tue, 31 Jan 2017 19:20:22 +0000 (20:20 +0100)]
fix default key for hook in campaign descriptions

3 years agokey holder -> key carrier
Martin Taibr [Tue, 31 Jan 2017 18:29:04 +0000 (19:29 +0100)]
key holder -> key carrier

3 years agoget rid of the word modus to avoid even more consufion with modes and mods
Martin Taibr [Tue, 31 Jan 2017 18:23:21 +0000 (19:23 +0100)]
get rid of the word modus to avoid even more consufion with modes and mods

3 years agofreezed -> frozen
Martin Taibr [Tue, 31 Jan 2017 18:22:17 +0000 (19:22 +0100)]
freezed -> frozen

3 years agoMerge branch 'catharsis-cleanup' into 'master'
Mirio [Mon, 30 Jan 2017 17:43:05 +0000 (17:43 +0000)]
Merge branch 'catharsis-cleanup' into 'master'

Catharsis cleanup

See merge request !59

3 years agoSome fixes by Spike29
Mirio [Sat, 28 Jan 2017 18:29:37 +0000 (19:29 +0100)]
Some fixes by Spike29

3 years agoCatharsis cleanup 59/head
t0uYK8Ne [Thu, 26 Jan 2017 02:09:31 +0000 (18:09 -0800)]
Catharsis cleanup

- Brush cleanup
- Texture changes/fixes
- Add ground lights near Red electro
- Change to blue jumppads in Blue base
- Fix caulk visible in multiple places
- Clip adjustments
- Minor position changes to lights and items
- Misc. symmetry fixes

3 years agoClip two places
Mirio [Mon, 23 Jan 2017 15:39:32 +0000 (16:39 +0100)]
Clip two places

3 years agoCompile Solarium again with fixed shader file
Mirio [Mon, 16 Jan 2017 20:45:03 +0000 (21:45 +0100)]
Compile Solarium again with fixed shader file

3 years agoFix #123
Mirio [Mon, 16 Jan 2017 20:42:59 +0000 (21:42 +0100)]
Fix #123

3 years agoChange cdtrack to 2, so we make use of all tracks
Mirio [Mon, 16 Jan 2017 16:51:43 +0000 (17:51 +0100)]
Change cdtrack to 2, so we make use of all tracks

3 years agoYou will compile dance in 2016 wont you
Mirio [Sat, 31 Dec 2016 12:30:27 +0000 (13:30 +0100)]
You will compile dance in 2016 wont you

3 years agoCompile maps please
Mirio [Thu, 29 Dec 2016 17:55:01 +0000 (18:55 +0100)]
Compile maps please

3 years agoUpdate versioning
Mirio [Tue, 27 Dec 2016 13:33:41 +0000 (14:33 +0100)]
Update versioning

3 years agoUpdate maps with new entity maps
Mirio [Tue, 27 Dec 2016 13:27:37 +0000 (14:27 +0100)]
Update maps with new entity maps

3 years agoMerge branch 'DefaultUser/entity_def' into 'master'
Mirio [Tue, 27 Dec 2016 13:19:12 +0000 (13:19 +0000)]
Merge branch 'DefaultUser/entity_def' into 'master'

Update Radiant entity definitions

See merge request !57

3 years agoMerge branch 'master' into Mirio/dance
Mirio [Sun, 25 Dec 2016 13:42:41 +0000 (14:42 +0100)]
Merge branch 'master' into Mirio/dance

3 years agoRemove slowdown field from dance, poll passed
Mario [Sun, 25 Dec 2016 11:20:30 +0000 (21:20 +1000)]
Remove slowdown field from dance, poll passed

3 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

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

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

3 years agoBreak the glass, #121
Mirio [Mon, 7 Nov 2016 08:15:40 +0000 (09:15 +0100)]
Break the glass, #121

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

3 years agoRename item_health_large to item_health_big 57/head
Freddy [Sat, 5 Nov 2016 23:03:34 +0000 (00:03 +0100)]
Rename item_health_large to item_health_big

3 years agoRename item_armor_large to item_armor_mega
Freddy [Fri, 4 Nov 2016 17:19:37 +0000 (18:19 +0100)]
Rename item_armor_large to item_armor_mega

also fix some descriptions for armor_mega and armor_big

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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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

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

3 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

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

3 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

4 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

4 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

4 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

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

4 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

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

4 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

4 years agoafterslime: fix window when viewing from inside slime (area near mortar) 51/head
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)

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

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

4 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

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

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

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

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

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

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

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

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

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

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

4 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

4 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

4 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

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

4 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

4 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

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

4 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

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

4 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

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

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

4 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

4 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

4 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

4 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

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

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

4 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

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

4 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

4 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

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

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

4 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

4 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

4 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

4 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

4 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