xonotic/xonotic-maps.pk3dir.git
4 years agoMerge branch 'master' into Mirio/silentsiege
Mirio [Sun, 26 Feb 2017 19:26:11 +0000 (20:26 +0100)]
Merge branch 'master' into Mirio/silentsiege

4 years agoMerge branch 'Mirio/fuse'
Mirio [Sun, 26 Feb 2017 19:24:57 +0000 (20:24 +0100)]
Merge branch 'Mirio/fuse'

4 years agomerge conflict
Mirio [Sun, 26 Feb 2017 19:19:12 +0000 (20:19 +0100)]
merge conflict

4 years agoMerge branch 't0uYK8Ne/map-fixes' into 'master'
Mirio [Sun, 26 Feb 2017 18:48:10 +0000 (18:48 +0000)]
Merge branch 't0uYK8Ne/map-fixes' into 'master'

t0uYK8Ne/map fixes

See merge request !63

4 years agoFix paths to lights
t0uYK8Ne [Sun, 19 Feb 2017 21:33:31 +0000 (13:33 -0800)]
Fix paths to lights

4 years agosolarium: clip pipes near big armor
t0uYK8Ne [Sun, 19 Feb 2017 19:29:39 +0000 (11:29 -0800)]
solarium: clip pipes near big armor

4 years agosolarium: extend the water to the end of the tunnel
t0uYK8Ne [Sun, 19 Feb 2017 19:14:55 +0000 (11:14 -0800)]
solarium: extend the water to the end of the tunnel

4 years agovorix: texture fix, add missing brush
t0uYK8Ne [Sun, 19 Feb 2017 18:40:17 +0000 (10:40 -0800)]
vorix: texture fix, add missing brush

4 years agovorix: delete duplicate railing pieces
t0uYK8Ne [Sun, 19 Feb 2017 18:20:03 +0000 (10:20 -0800)]
vorix: delete duplicate railing pieces

4 years agostormkeep: lower ceiling clip in mortar room
t0uYK8Ne [Sun, 19 Feb 2017 18:09:47 +0000 (10:09 -0800)]
stormkeep: lower ceiling clip in mortar room

4 years agostormkeep: texture fixes
t0uYK8Ne [Sun, 19 Feb 2017 18:01:24 +0000 (10:01 -0800)]
stormkeep: texture fixes

4 years agosilentsiege: texture fixes
t0uYK8Ne [Sun, 19 Feb 2017 16:49:48 +0000 (08:49 -0800)]
silentsiege: texture fixes

4 years agoatelier: extend the trim to the wall
t0uYK8Ne [Sun, 19 Feb 2017 16:01:33 +0000 (08:01 -0800)]
atelier: extend the trim to the wall

4 years agospace-elevator: delete unused teleporter destination
t0uYK8Ne [Sun, 19 Feb 2017 15:42:37 +0000 (07:42 -0800)]
space-elevator: delete unused teleporter destination

4 years agospace-elevator: minor geometry fixes
t0uYK8Ne [Sun, 19 Feb 2017 15:37:38 +0000 (07:37 -0800)]
space-elevator: minor geometry fixes

4 years agospace-elevator: texture fixes
t0uYK8Ne [Sun, 19 Feb 2017 15:02:39 +0000 (07:02 -0800)]
space-elevator: texture fixes

4 years agoMerge branch 't0uYK8Ne/ent-typos-fix' into 'master'
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

4 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

4 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

4 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

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

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

4 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

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

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

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

4 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

4 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

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

4 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

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

4 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

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

4 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

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

4 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

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

4 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

4 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

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

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

4 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

4 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

4 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

4 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

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

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

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

4 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

4 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

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

4 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

4 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

4 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

4 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

4 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

4 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

4 years agoMerge branch 'master' into Mirio/fuse
Mirio [Tue, 25 Oct 2016 22:28:49 +0000 (00:28 +0200)]
Merge branch 'master' into Mirio/fuse

4 years agoMerge branch 'master' into Mirio/silentsiege
Mirio [Tue, 25 Oct 2016 22:27:58 +0000 (00:27 +0200)]
Merge branch 'master' into Mirio/silentsiege

4 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

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

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

4 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

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

4 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

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

5 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

5 years agoLots of clips and fixes 10/head
Mirio [Sun, 27 Mar 2016 16:11:26 +0000 (18:11 +0200)]
Lots of clips and fixes

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

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

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

5 years agoMerge branch 'master' into mirio/fuse
Mirio [Wed, 9 Mar 2016 17:11:13 +0000 (18:11 +0100)]
Merge branch 'master' into mirio/fuse

5 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

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

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

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

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

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

5 years agoMerge branch 'master' into mirio/fuse
Mirio [Fri, 15 Jan 2016 15:42:20 +0000 (16:42 +0100)]
Merge branch 'master' into mirio/fuse

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

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

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

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

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

5 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

5 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

5 years agoMove box slightly to allow trickjump
Mirio [Fri, 1 Jan 2016 16:46:12 +0000 (17:46 +0100)]
Move box slightly to allow trickjump

5 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

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

5 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

5 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

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

5 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

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

5 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