xonotic/xonotic-data.pk3dir.git
15 months agoMerge branch 'master' into Mario/qcphysics_tweaks 612/head
Mario [Sat, 20 Oct 2018 18:36:19 +0000 (04:36 +1000)]
Merge branch 'master' into Mario/qcphysics_tweaks

15 months agoNever group loot items, and only throw overkill shards towards players
Mario [Sat, 20 Oct 2018 18:35:51 +0000 (04:35 +1000)]
Never group loot items, and only throw overkill shards towards players

15 months agoEnable stepping down by default
Mario [Sat, 20 Oct 2018 17:08:50 +0000 (03:08 +1000)]
Enable stepping down by default

15 months agoMerge branch 'master' into Mario/qcphysics_tweaks
Mario [Sat, 20 Oct 2018 17:08:36 +0000 (03:08 +1000)]
Merge branch 'master' into Mario/qcphysics_tweaks

15 months agoMerge branch 'martin-t/effects' into 'master'
Mario [Sat, 20 Oct 2018 14:53:18 +0000 (14:53 +0000)]
Merge branch 'martin-t/effects' into 'master'

Improve graphics

Closes #1937

See merge request xonotic/xonotic-data.pk3dir!575

15 months agoother way around 575/head
Martin Taibr [Sat, 20 Oct 2018 14:40:51 +0000 (16:40 +0200)]
other way around

15 months agoMerge branch 'master' into martin-t/effects
Martin Taibr [Sat, 20 Oct 2018 14:29:33 +0000 (16:29 +0200)]
Merge branch 'master' into martin-t/effects

15 months agocompress skies in default effects
Martin Taibr [Sat, 20 Oct 2018 14:29:16 +0000 (16:29 +0200)]
compress skies in default effects

15 months agoHide some gametype checks so they somewhat match the server
Mario [Thu, 18 Oct 2018 22:41:21 +0000 (08:41 +1000)]
Hide some gametype checks so they somewhat match the server

15 months agoUpdate hash
Mario [Wed, 17 Oct 2018 15:41:12 +0000 (01:41 +1000)]
Update hash

15 months agoMerge branch 'Mario/wepgroup_switch' into 'master'
Mario [Wed, 17 Oct 2018 14:55:39 +0000 (14:55 +0000)]
Merge branch 'Mario/wepgroup_switch' into 'master'

Merge branch Mario/wepgroup_switch

See merge request xonotic/xonotic-data.pk3dir!611

15 months agoMerge branch 'sev/luma-menu-xpm' into 'master'
Mario [Wed, 17 Oct 2018 12:08:06 +0000 (12:08 +0000)]
Merge branch 'sev/luma-menu-xpm' into 'master'

Add xpm serverlist icon to menu themes

Closes #2107

See merge request xonotic/xonotic-data.pk3dir!613

15 months agoDisallow enabling r_water via mapinfo, automatically enable it on maps with warpzones...
Mario [Wed, 17 Oct 2018 08:44:23 +0000 (18:44 +1000)]
Disallow enabling r_water via mapinfo, automatically enable it on maps with warpzones and cameras

15 months agoUse an attack think loop to keep the attack going instead of spamming weapon think...
Mario [Tue, 16 Oct 2018 23:38:29 +0000 (09:38 +1000)]
Use an attack think loop to keep the attack going instead of spamming weapon think, fixes Arc disconnecting clients with buffer overflows

15 months agoDon't count non-client attackers as valid for accuracy
Mario [Tue, 16 Oct 2018 20:18:31 +0000 (06:18 +1000)]
Don't count non-client attackers as valid for accuracy

15 months agoSkip some checks if checking sound_allowed on a null entity
Mario [Tue, 16 Oct 2018 20:13:24 +0000 (06:13 +1000)]
Skip some checks if checking sound_allowed on a null entity

15 months agoFix hagar's animation resetting after the first attack
Mario [Tue, 16 Oct 2018 12:21:48 +0000 (22:21 +1000)]
Fix hagar's animation resetting after the first attack

15 months agoFix compile and move gametype legacy defaults to an attribute
Mario [Mon, 15 Oct 2018 15:42:08 +0000 (01:42 +1000)]
Fix compile and move gametype legacy defaults to an attribute

15 months agoClean up a bunch of gamemode specific references
Mario [Mon, 15 Oct 2018 15:31:35 +0000 (01:31 +1000)]
Clean up a bunch of gamemode specific references

15 months agoUse the weapon entity as a parameter to ATTACK_FINISHED instead of the slot number...
Mario [Mon, 15 Oct 2018 14:50:58 +0000 (00:50 +1000)]
Use the weapon entity as a parameter to ATTACK_FINISHED instead of the slot number, fixes a potential issue when dual wielding different weapons and reduces code redundancy

15 months agoDivide the attack rate by the maximum weapon slots instead of halving it
Mario [Mon, 15 Oct 2018 14:22:00 +0000 (00:22 +1000)]
Divide the attack rate by the maximum weapon slots instead of halving it

15 months agoTweak alternating dual wielding so weapons fire in time
Mario [Mon, 15 Oct 2018 13:53:29 +0000 (23:53 +1000)]
Tweak alternating dual wielding so weapons fire in time

15 months agoUpdate the weapon ammo notification to point people to the developers
Mario [Mon, 15 Oct 2018 12:15:58 +0000 (22:15 +1000)]
Update the weapon ammo notification to point people to the developers

15 months agoTweak crylink a bit more in Mario balance
Mario [Mon, 15 Oct 2018 11:59:12 +0000 (21:59 +1000)]
Tweak crylink a bit more in Mario balance

15 months agoRestore shotgun and tweak crylink in Mario balance
Mario [Mon, 15 Oct 2018 11:54:54 +0000 (21:54 +1000)]
Restore shotgun and tweak crylink in Mario balance

15 months agoApply some tweaks to the QC movetypes to somewhat match what the engine is doing...
Mario [Sat, 13 Oct 2018 16:53:50 +0000 (02:53 +1000)]
Apply some tweaks to the QC movetypes to somewhat match what the engine is doing, attempt to fix players stuck inside other players

15 months agoFix compile
Mario [Sat, 13 Oct 2018 15:07:35 +0000 (01:07 +1000)]
Fix compile

15 months agoDon't rely on the .minelayer_mines field for player's placed mines count (projectiles...
Mario [Sat, 13 Oct 2018 13:48:58 +0000 (23:48 +1000)]
Don't rely on the .minelayer_mines field for player's placed mines count (projectiles can lose their owner)

15 months agoRevert hiding of the weapon entity until a clean solution can be applied
Mario [Sat, 13 Oct 2018 12:03:37 +0000 (22:03 +1000)]
Revert hiding of the weapon entity until a clean solution can be applied

15 months agoPossible workaround for invisible nades
Mario [Sat, 13 Oct 2018 12:02:14 +0000 (22:02 +1000)]
Possible workaround for invisible nades

15 months agoAllow electro orbs to stick to entities if touchexplode is off
Mario [Sat, 13 Oct 2018 06:31:17 +0000 (16:31 +1000)]
Allow electro orbs to stick to entities if touchexplode is off

15 months agoFix electro orbs not sticking to entities properly
Mario [Sat, 13 Oct 2018 06:25:44 +0000 (16:25 +1000)]
Fix electro orbs not sticking to entities properly

15 months agoAdd an option to alternate between weapons when dual wielding
Mario [Sat, 13 Oct 2018 05:47:15 +0000 (15:47 +1000)]
Add an option to alternate between weapons when dual wielding

15 months agoReuse W_SwitchWeapon to reduce code duplication 611/head
Mario [Fri, 12 Oct 2018 19:52:06 +0000 (05:52 +1000)]
Reuse W_SwitchWeapon to reduce code duplication

15 months agoWhen using specific weapon binds, if the player doesn't have the weapon, attempt...
Mario [Fri, 12 Oct 2018 19:44:54 +0000 (05:44 +1000)]
When using specific weapon binds, if the player doesn't have the weapon, attempt to switch to another weapon within the same group

15 months agoSet nodrawtoclient on the server-side view model (doesn't need to render)
Mario [Fri, 12 Oct 2018 17:28:13 +0000 (03:28 +1000)]
Set nodrawtoclient on the server-side view model (doesn't need to render)

15 months agoFix dumpweapons including the special attacks
Mario [Fri, 12 Oct 2018 12:38:43 +0000 (22:38 +1000)]
Fix dumpweapons including the special attacks

15 months agoRemove g_duel_warmup (XPM ruleset turns on warmup when executed)
Mario [Thu, 11 Oct 2018 06:18:51 +0000 (16:18 +1000)]
Remove g_duel_warmup (XPM ruleset turns on warmup when executed)

15 months agoMove the Say function into client code (not really a player-specific thing)
Mario [Thu, 11 Oct 2018 03:11:30 +0000 (13:11 +1000)]
Move the Say function into client code (not really a player-specific thing)

15 months agoDon't allow a trigger to target itself (infinite loops tend to be crashy)
Mario [Thu, 11 Oct 2018 03:11:10 +0000 (13:11 +1000)]
Don't allow a trigger to target itself (infinite loops tend to be crashy)

15 months agoFix a potential crash in Weapons_fromstr (WEP_Null is expected, not NULL)
Mario [Wed, 10 Oct 2018 10:48:52 +0000 (20:48 +1000)]
Fix a potential crash in Weapons_fromstr (WEP_Null is expected, not NULL)

15 months agoMerge branch 'Mario/cts_killprojectiles'
Mario [Wed, 10 Oct 2018 03:15:54 +0000 (13:15 +1000)]
Merge branch 'Mario/cts_killprojectiles'

15 months agoMove some antiwall handling out of the main trigger code
Mario [Tue, 9 Oct 2018 11:13:36 +0000 (21:13 +1000)]
Move some antiwall handling out of the main trigger code

15 months agoRemove FixSize (hack no longer needed)
Mario [Tue, 9 Oct 2018 10:57:55 +0000 (20:57 +1000)]
Remove FixSize (hack no longer needed)

15 months agoAdd an option to remove the player's projectiles when they suicide in CTS 610/head
Mario [Mon, 8 Oct 2018 14:26:50 +0000 (00:26 +1000)]
Add an option to remove the player's projectiles when they suicide in CTS

15 months agoAdd xpm serverlist icon to menu themes 613/head
Severin Meyer [Mon, 8 Oct 2018 13:18:22 +0000 (15:18 +0200)]
Add xpm serverlist icon to menu themes

15 months agofix #2110
Martin Taibr [Sun, 7 Oct 2018 21:27:03 +0000 (23:27 +0200)]
fix #2110

15 months agoMerge branch 'DefaultUser/func_door_lip' into 'master'
Mario [Sat, 6 Oct 2018 23:57:44 +0000 (23:57 +0000)]
Merge branch 'DefaultUser/func_door_lip' into 'master'

func_door: fix default value for lip

Closes xonotic-maps.pk3dir#153

See merge request xonotic/xonotic-data.pk3dir!609

15 months agofunc_door: Calculate pos2 after initialising this.lip 609/head
Freddy [Sat, 6 Oct 2018 19:56:05 +0000 (19:56 +0000)]
func_door: Calculate pos2 after initialising this.lip

15 months agoMerge branch 'terencehill/eventchase_tweaks'
terencehill [Tue, 2 Oct 2018 18:58:40 +0000 (20:58 +0200)]
Merge branch 'terencehill/eventchase_tweaks'

15 months agoClan Arena: display the "You are now alone!" message only when needed
terencehill [Tue, 2 Oct 2018 18:56:45 +0000 (20:56 +0200)]
Clan Arena: display the "You are now alone!" message only when needed

15 months agoOnly play 'vote now' announcement if the vote hasn't already passed
Mario [Tue, 2 Oct 2018 17:24:22 +0000 (03:24 +1000)]
Only play 'vote now' announcement if the vote hasn't already passed

15 months agoUpdate hash
Mario [Mon, 1 Oct 2018 14:25:40 +0000 (00:25 +1000)]
Update hash

15 months agoFix electro combos
Mario [Mon, 1 Oct 2018 12:20:28 +0000 (22:20 +1000)]
Fix electro combos

15 months agoMerge branch 'sev/luma-menu-update' into 'master'
Mario [Mon, 1 Oct 2018 11:47:06 +0000 (11:47 +0000)]
Merge branch 'sev/luma-menu-update' into 'master'

Minor Luma menu theme update

See merge request xonotic/xonotic-data.pk3dir!604

15 months agoTrace to the shot origin properly, fixes projectiles getting stuck inside walls
Mario [Mon, 1 Oct 2018 09:37:04 +0000 (19:37 +1000)]
Trace to the shot origin properly, fixes projectiles getting stuck inside walls

15 months agoMark the overkill weapons as hidden so they don't appear in the create menu
Mario [Mon, 1 Oct 2018 06:03:02 +0000 (16:03 +1000)]
Mark the overkill weapons as hidden so they don't appear in the create menu

15 months agoAdd an option (enabled by default) to configure whether the duel gamemode has a warmup
Mario [Mon, 1 Oct 2018 05:34:58 +0000 (15:34 +1000)]
Add an option (enabled by default) to configure whether the duel gamemode has a warmup

15 months agoUse the weapon instead of its ID in accuracy_add
Mario [Mon, 1 Oct 2018 05:30:21 +0000 (15:30 +1000)]
Use the weapon instead of its ID in accuracy_add

15 months agoAdd an option (disabled by default) to spawn powerups in duel
Mario [Mon, 1 Oct 2018 05:29:56 +0000 (15:29 +1000)]
Add an option (disabled by default) to spawn powerups in duel

15 months agoLimit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset)
Mario [Sun, 30 Sep 2018 19:07:43 +0000 (05:07 +1000)]
Limit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset)

15 months agoAdd vehicles.cfg so the vehicle settings are pre-defined
Mario [Sun, 30 Sep 2018 18:58:36 +0000 (04:58 +1000)]
Add vehicles.cfg so the vehicle settings are pre-defined

15 months agoPort kill command to QC so that we can use the health resource
Mario [Sun, 30 Sep 2018 17:58:53 +0000 (03:58 +1000)]
Port kill command to QC so that we can use the health resource

15 months agoBind K to kill by default
Mario [Sun, 30 Sep 2018 17:33:22 +0000 (03:33 +1000)]
Bind K to kill by default

15 months agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Martin Taibr [Sun, 30 Sep 2018 16:13:18 +0000 (18:13 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

15 months agochange xdf icon to lowercase
Martin Taibr [Sun, 30 Sep 2018 16:11:46 +0000 (18:11 +0200)]
change xdf icon to lowercase

15 months agoRestore active state of buttons on reset
Mario [Sun, 30 Sep 2018 16:02:58 +0000 (02:02 +1000)]
Restore active state of buttons on reset

15 months agoMake arc bolts mimic the Q3 lightning gun force in XDF
Mario [Sun, 30 Sep 2018 16:01:12 +0000 (02:01 +1000)]
Make arc bolts mimic the Q3 lightning gun force in XDF

15 months agoMerge branch 'DefaultUser/func_button_relay' into 'master'
Mario [Sun, 30 Sep 2018 15:30:22 +0000 (15:30 +0000)]
Merge branch 'DefaultUser/func_button_relay' into 'master'

Allow func_button to be deactivated by relay_deactivate

See merge request xonotic/xonotic-data.pk3dir!486

15 months agoUpdate luma menu theme 604/head
Severin Meyer [Sun, 30 Sep 2018 15:24:22 +0000 (17:24 +0200)]
Update luma menu theme

15 months agoMerge branch 'master' into DefaultUser/func_button_relay 486/head
Mario [Sun, 30 Sep 2018 15:04:47 +0000 (01:04 +1000)]
Merge branch 'master' into DefaultUser/func_button_relay

# Conflicts:
# qcsrc/common/mapobjects/func/button.qc

15 months agoMerge branch 'martin-t/bullet-trails' into 'master'
Mario [Sun, 30 Sep 2018 14:36:44 +0000 (14:36 +0000)]
Merge branch 'martin-t/bullet-trails' into 'master'

Pass effect entity to fireBullet(), give weak trail to hitscan weaps

See merge request xonotic/xonotic-data.pk3dir!521

15 months agoFix hash and hopefully compilation units
Mario [Sun, 30 Sep 2018 14:28:24 +0000 (00:28 +1000)]
Fix hash and hopefully compilation units

15 months agoMake cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing...
terencehill [Sun, 30 Sep 2018 14:11:34 +0000 (16:11 +0200)]
Make cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing this value with the new cvar cl_eventchase_spectated_change_time

15 months agoDon't perform various LOD/skeleton checks and handling when the player is invisible...
Mario [Sun, 30 Sep 2018 14:08:09 +0000 (00:08 +1000)]
Don't perform various LOD/skeleton checks and handling when the player is invisible, saves a bit of performance while inside vehicles

15 months agocl_eventchase_spectated_change: disable chase_active while eventchase is still enable...
terencehill [Sun, 30 Sep 2018 13:53:16 +0000 (15:53 +0200)]
cl_eventchase_spectated_change: disable chase_active while eventchase is still enabled so to avoid a glicth

15 months agoMerge branch 'Mario/duel' into 'master'
Mario [Sun, 30 Sep 2018 12:30:31 +0000 (12:30 +0000)]
Merge branch 'Mario/duel' into 'master'

Merge branch Mario/duel (S merge request)

See merge request xonotic/xonotic-data.pk3dir!590

15 months agoUse the new player limit function for limiting bot count 590/head
Mario [Sun, 30 Sep 2018 12:29:06 +0000 (22:29 +1000)]
Use the new player limit function for limiting bot count

15 months agoMerge branch 'master' into Mario/duel
Mario [Sun, 30 Sep 2018 12:26:19 +0000 (22:26 +1000)]
Merge branch 'master' into Mario/duel

15 months agoMerge branch 'master' into martin-t/bullet-trails 521/head
Martin Taibr [Sun, 30 Sep 2018 12:24:21 +0000 (14:24 +0200)]
Merge branch 'master' into martin-t/bullet-trails

15 months agoDon't do extra unnecessary antilag checks for the arc's smoke effect
Mario [Sun, 30 Sep 2018 12:22:11 +0000 (22:22 +1000)]
Don't do extra unnecessary antilag checks for the arc's smoke effect

15 months agoRemove an old TODO that's since been resolved
Mario [Sun, 30 Sep 2018 12:01:46 +0000 (22:01 +1000)]
Remove an old TODO that's since been resolved

15 months agoFix arc preventing switching weapons when you change weapons with the button held
Mario [Sun, 30 Sep 2018 11:41:40 +0000 (21:41 +1000)]
Fix arc preventing switching weapons when you change weapons with the button held

15 months agoIf arc's beam direction is the same as shot direction, snap it, reduces bandwidth...
Mario [Sun, 30 Sep 2018 11:06:52 +0000 (21:06 +1000)]
If arc's beam direction is the same as shot direction, snap it, reduces bandwidth usage when standing still

15 months agoMerge branch 'martin-t/help' into 'master'
Mario [Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)]
Merge branch 'martin-t/help' into 'master'

Help system

See merge request xonotic/xonotic-data.pk3dir!603

15 months agoTransifex autosync
Rudolf Polzer [Sun, 30 Sep 2018 05:24:18 +0000 (07:24 +0200)]
Transifex autosync

15 months agoChange the example gametype vote to be 1v1 CTF instead of duel (which is an actual...
Mario [Sun, 30 Sep 2018 04:00:41 +0000 (14:00 +1000)]
Change the example gametype vote to be 1v1 CTF instead of duel (which is an actual gametype here)

15 months agoMerge branch 'Mario/bot_maxplayers' into 'master'
Martin Taibr [Sat, 29 Sep 2018 17:39:04 +0000 (17:39 +0000)]
Merge branch 'Mario/bot_maxplayers' into 'master'

Merge branch Mario/bot_maxplayers (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!601

15 months agoMove some TDM settings to the gamemodes config
Mario [Sat, 29 Sep 2018 15:00:26 +0000 (01:00 +1000)]
Move some TDM settings to the gamemodes config

15 months agooff by 1 in help system 603/head
Martin Taibr [Sat, 29 Sep 2018 14:59:21 +0000 (16:59 +0200)]
off by 1 in help system

15 months agoadjust the comments, add a tip
Martin Taibr [Sat, 29 Sep 2018 14:57:13 +0000 (16:57 +0200)]
adjust the comments, add a tip

15 months agoRemove some unused cvars from config
Mario [Sat, 29 Sep 2018 14:57:05 +0000 (00:57 +1000)]
Remove some unused cvars from config

15 months agoTemporarily disable QC physics until the player sticking issue can be resolved
Mario [Sat, 29 Sep 2018 14:30:25 +0000 (00:30 +1000)]
Temporarily disable QC physics until the player sticking issue can be resolved

15 months agoonly exec help.cfg once
Martin Taibr [Sat, 29 Sep 2018 14:28:54 +0000 (16:28 +0200)]
only exec help.cfg once

15 months agoinclude tips for overkill
Martin Taibr [Sat, 29 Sep 2018 14:09:42 +0000 (16:09 +0200)]
include tips for overkill

15 months agoMerge branch 'master' into Mario/duel
Mario [Sat, 29 Sep 2018 13:59:52 +0000 (23:59 +1000)]
Merge branch 'master' into Mario/duel

15 months agocopy help.cfg from server/
Martin Taibr [Sat, 29 Sep 2018 13:35:52 +0000 (15:35 +0200)]
copy help.cfg from server/

15 months agoMake use of the thiswep parameter in weapon functions, fixes some potential issues...
Mario [Sat, 29 Sep 2018 07:03:30 +0000 (17:03 +1000)]
Make use of the thiswep parameter in weapon functions, fixes some potential issues with reusing attacks and greatly reduces the number of references to the specific weapons

15 months agoAdd a property to tell when gamemodes are supposed to be forced supported (TDM on...
Mario [Sat, 29 Sep 2018 06:33:29 +0000 (16:33 +1000)]
Add a property to tell when gamemodes are supposed to be forced supported (TDM on DM maps)

15 months agoFix client model fade distance fields being limited to 255
Mario [Fri, 28 Sep 2018 10:25:57 +0000 (20:25 +1000)]
Fix client model fade distance fields being limited to 255