xonotic/xonotic-data.pk3dir.git
2 years agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Thu, 22 Aug 2019 00:07:59 +0000 (02:07 +0200)]
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# qcsrc/server/bot/default/havocbot/havocbot.qc

2 years agoMerge branch 'Mario/machinegun_spread' into 'master'
Mario [Wed, 21 Aug 2019 18:33:10 +0000 (18:33 +0000)]
Merge branch 'Mario/machinegun_spread' into 'master'

Restore machinegun secondary burst spread in alternative balance configurations to the value they were prior to a regression in 0.8

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

2 years agoUpdate gameplay hash 695/head
Mario [Wed, 21 Aug 2019 18:22:56 +0000 (04:22 +1000)]
Update gameplay hash

2 years agoRestore official machinegun balance to current master
Mario [Wed, 21 Aug 2019 18:05:05 +0000 (04:05 +1000)]
Restore official machinegun balance to current master

2 years agoUpdate gameplay hash
Mario [Wed, 21 Aug 2019 17:10:36 +0000 (03:10 +1000)]
Update gameplay hash

2 years agoRestore machinegun secondary burst spread to the value it was prior to a regression...
Mario [Wed, 21 Aug 2019 16:29:02 +0000 (02:29 +1000)]
Restore machinegun secondary burst spread to the value it was prior to a regression in 0.8

2 years agoMerge branch 'martin-t/showacc' into 'master'
Mario [Wed, 21 Aug 2019 15:01:23 +0000 (15:01 +0000)]
Merge branch 'martin-t/showacc' into 'master'

Remove default showaccuracy bind

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

2 years agoremove default showaccuracy bind 693/head
Martin Taibr [Wed, 21 Aug 2019 14:28:53 +0000 (16:28 +0200)]
remove default showaccuracy bind

2 years agoMerge branch 'martin-t/ctf' into 'master'
Mario [Wed, 21 Aug 2019 14:28:44 +0000 (14:28 +0000)]
Merge branch 'martin-t/ctf' into 'master'

Suggestion to increase autocap

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

2 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Martin Taibr [Tue, 20 Aug 2019 11:43:35 +0000 (13:43 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

2 years agofix typo
Martin Taibr [Tue, 20 Aug 2019 11:43:20 +0000 (13:43 +0200)]
fix typo

2 years agoFix #2267 "Teams get shuffled every round in CA and FT" (whenever a sv_cmd command...
terencehill [Mon, 19 Aug 2019 23:57:51 +0000 (01:57 +0200)]
Fix #2267 "Teams get shuffled every round in CA and FT" (whenever a sv_cmd command is executed in the console during a round)

2 years agoSet r_water_resolutionmultiplier to 1 on maps with warpzones, to ensure visibility...
Mario [Sun, 18 Aug 2019 13:36:03 +0000 (23:36 +1000)]
Set r_water_resolutionmultiplier to 1 on maps with warpzones, to ensure visibility through them

2 years agosuggestion to increase autocap 690/head
Martin Taibr [Sun, 18 Aug 2019 12:27:38 +0000 (14:27 +0200)]
suggestion to increase autocap

2 years agoAdd an option (off by default) to allow the vortex to charge even while not in hand
Mario [Sun, 18 Aug 2019 10:40:27 +0000 (20:40 +1000)]
Add an option (off by default) to allow the vortex to charge even while not in hand

2 years agoMerge branch 'martin-t/ok-config' into 'master'
Mario [Sun, 18 Aug 2019 10:06:19 +0000 (10:06 +0000)]
Merge branch 'martin-t/ok-config' into 'master'

Overkill config

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

2 years agoMerge branch 'martin-t/rulesets' into 'master'
Mario [Sun, 18 Aug 2019 09:55:36 +0000 (09:55 +0000)]
Merge branch 'martin-t/rulesets' into 'master'

Cleanup ruleset files

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

2 years agotypo 683/head
Martin Taibr [Sun, 18 Aug 2019 09:47:31 +0000 (11:47 +0200)]
typo

2 years agoMerge branch 'master' into martin-t/rulesets 688/head
Mario [Sun, 18 Aug 2019 09:26:50 +0000 (19:26 +1000)]
Merge branch 'master' into martin-t/rulesets

2 years agoMerge branch 'terencehill/casings' into 'master'
Mario [Sun, 18 Aug 2019 09:22:32 +0000 (09:22 +0000)]
Merge branch 'terencehill/casings' into 'master'

Casings tweaks and fixes

Closes #2253

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

2 years agoMerge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg
Martin Taibr [Sat, 17 Aug 2019 18:28:33 +0000 (20:28 +0200)]
Merge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg

2 years agoMerge branch 'Mario/force_zscale' into 'master'
Martin Taibr [Sat, 17 Aug 2019 17:21:53 +0000 (17:21 +0000)]
Merge branch 'Mario/force_zscale' into 'master'

Merge branch Mario/force_zscale (S merge request)

Fixes all the weapons referencing blaster's force cvar.

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

2 years agoAdd a note to zscale and default it to 1 in RadiusDamage 684/head
Mario [Sat, 17 Aug 2019 17:11:13 +0000 (03:11 +1000)]
Add a note to zscale and default it to 1 in RadiusDamage

2 years agoUpdate gameplay hash
Mario [Sat, 17 Aug 2019 16:32:34 +0000 (02:32 +1000)]
Update gameplay hash

2 years agoMerge branch 'Mario/buff_timer' into 'master'
Mario [Sat, 17 Aug 2019 14:49:54 +0000 (14:49 +0000)]
Merge branch 'Mario/buff_timer' into 'master'

Merge branch Mario/buff_timer (M merge request)

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

2 years agoClear ALL the trace globals before calling the touch functions; it fixes #2253 "Casin... 689/head
terencehill [Fri, 16 Aug 2019 21:14:52 +0000 (23:14 +0200)]
Clear ALL the trace globals before calling the touch functions; it fixes #2253 "Casings broken when standing on playerclip"

2 years agoIf casings are enabled on match start, don't allow to apply changes of cl_casings...
terencehill [Fri, 16 Aug 2019 21:09:48 +0000 (23:09 +0200)]
If casings are enabled on match start, don't allow to apply changes of cl_casings without sending it to the server. With this change, behaviour is now consistent with the other case (casings disabled on match start)

2 years agoremove `set` from XPM
Martin Taibr [Fri, 16 Aug 2019 19:34:51 +0000 (21:34 +0200)]
remove `set` from XPM

2 years agoremove `set` and a nonexistent cvar from XDF
Martin Taibr [Fri, 16 Aug 2019 19:32:09 +0000 (21:32 +0200)]
remove `set` and a nonexistent cvar from XDF

2 years agouse g_use_ammunition instead of hardcoding unlimited ammo
Martin Taibr [Fri, 16 Aug 2019 18:15:34 +0000 (20:15 +0200)]
use g_use_ammunition instead of hardcoding unlimited ammo

2 years agoDon't send casings data if client has casings turned off. Toggling cl_casings on...
terencehill [Fri, 16 Aug 2019 14:38:36 +0000 (16:38 +0200)]
Don't send casings data if client has casings turned off. Toggling cl_casings on/off now needs 'sendcvar cl_casings' to take effect otherwise it applies from the next match

2 years agoRestore overkill nex secondary force
Mario [Thu, 15 Aug 2019 13:19:50 +0000 (23:19 +1000)]
Restore overkill nex secondary force

2 years agoRestore overkill machinegun secondary force
Mario [Thu, 15 Aug 2019 13:18:26 +0000 (23:18 +1000)]
Restore overkill machinegun secondary force

2 years agoAdd a force_zscale setting to weapons that use the blaster secondary
Mario [Thu, 15 Aug 2019 11:36:10 +0000 (21:36 +1000)]
Add a force_zscale setting to weapons that use the blaster secondary

2 years agorestore balance to insta
Martin Taibr [Thu, 15 Aug 2019 10:29:07 +0000 (12:29 +0200)]
restore balance to insta

2 years agorestore overkill blaster balance
Martin Taibr [Thu, 15 Aug 2019 10:03:52 +0000 (12:03 +0200)]
restore overkill blaster balance

2 years agoAdd parenthesis to some bitflag checks
Mario [Thu, 15 Aug 2019 08:53:07 +0000 (18:53 +1000)]
Add parenthesis to some bitflag checks

2 years agoCompact weapon flag checks
terencehill [Thu, 15 Aug 2019 07:24:23 +0000 (09:24 +0200)]
Compact weapon flag checks

2 years agoMerge branch 'Mario/weapon_specialattack_flag' into 'master'
Mario [Wed, 14 Aug 2019 20:25:56 +0000 (20:25 +0000)]
Merge branch 'Mario/weapon_specialattack_flag' into 'master'

Merge branch Mario/weapon_specialattack_flag (M merge request)

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

2 years agoMerge branch 'master' into martin-t/ok-config
Martin Taibr [Tue, 13 Aug 2019 19:30:39 +0000 (21:30 +0200)]
Merge branch 'master' into martin-t/ok-config

2 years agoMerge branch 'Mario/balance_configs' into 'master'
Martin Taibr [Tue, 13 Aug 2019 19:16:11 +0000 (19:16 +0000)]
Merge branch 'Mario/balance_configs' into 'master'

Merge branch Mario/balance_configs (S merge request)

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

2 years agoDon't add WEP_FLAG_NORMAL to the overkill weapons 680/head
Mario [Tue, 13 Aug 2019 14:15:34 +0000 (00:15 +1000)]
Don't add WEP_FLAG_NORMAL to the overkill weapons

2 years agoImplement WEP_FLAG_SPECIALATTACK, a flag for the 'attack' weapons are that are intend... 681/head
Mario [Tue, 13 Aug 2019 14:10:28 +0000 (00:10 +1000)]
Implement WEP_FLAG_SPECIALATTACK, a flag for the 'attack' weapons are that are intended to be hidden from all weapon lists

2 years agoAdjust crylink secondary a bit in the Mario balance configuration
Mario [Tue, 13 Aug 2019 12:39:45 +0000 (22:39 +1000)]
Adjust crylink secondary a bit in the Mario balance configuration

2 years agoRestore parity to the weapon balance configs
Mario [Tue, 13 Aug 2019 12:13:44 +0000 (22:13 +1000)]
Restore parity to the weapon balance configs

2 years agoMerge branch 'martin-t/solpen' into 'master'
Mario [Tue, 13 Aug 2019 12:12:32 +0000 (12:12 +0000)]
Merge branch 'martin-t/solpen' into 'master'

Add WEP_FLAG_PENETRATEWALLS to HMG (fixes trueaim)

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

2 years agoOK: add fullbright, remove "set"
Martin Taibr [Tue, 13 Aug 2019 12:07:49 +0000 (14:07 +0200)]
OK: add fullbright, remove "set"

2 years agoadd WEP_FLAG_PENETRATEWALLS to HMG (fixes trueaim) 679/head
Martin Taibr [Tue, 13 Aug 2019 11:51:40 +0000 (13:51 +0200)]
add WEP_FLAG_PENETRATEWALLS to HMG (fixes trueaim)

2 years agoOptimize WarpZoneLib_MoveOutOfSolid_Expand (constant folding)
terencehill [Tue, 13 Aug 2019 11:19:29 +0000 (13:19 +0200)]
Optimize WarpZoneLib_MoveOutOfSolid_Expand (constant folding)

2 years agoReduce LOG_INFO calls in bot waypoint code
terencehill [Tue, 13 Aug 2019 11:14:43 +0000 (13:14 +0200)]
Reduce LOG_INFO calls in bot waypoint code

2 years agoRemove a global (and a wasted vlen call) that has never been used
terencehill [Tue, 13 Aug 2019 11:12:04 +0000 (13:12 +0200)]
Remove a global (and a wasted vlen call) that has never been used

2 years agoMG solpen value from my server, HMG to match
Martin Taibr [Tue, 13 Aug 2019 10:35:20 +0000 (12:35 +0200)]
MG solpen value from my server, HMG to match

2 years agoFix compilation unit test
Mario [Tue, 13 Aug 2019 05:32:42 +0000 (15:32 +1000)]
Fix compilation unit test

2 years agorestore old armor / physics in OK
Martin Taibr [Mon, 12 Aug 2019 20:43:38 +0000 (22:43 +0200)]
restore old armor / physics in OK

2 years agoIn CTS, allow spawnpoints to have an invalid target (fixes a crash on several defrag...
Mario [Mon, 12 Aug 2019 19:21:36 +0000 (05:21 +1000)]
In CTS, allow spawnpoints to have an invalid target (fixes a crash on several defrag maps)

2 years agonerf resistance in OK
Martin Taibr [Mon, 12 Aug 2019 16:35:11 +0000 (18:35 +0200)]
nerf resistance in OK

2 years agoold blaster behavior in OK
Martin Taibr [Mon, 12 Aug 2019 16:31:48 +0000 (18:31 +0200)]
old blaster behavior in OK

2 years agoincrease HMG solpen to be higher than MG
Martin Taibr [Mon, 12 Aug 2019 15:31:15 +0000 (17:31 +0200)]
increase HMG solpen to be higher than MG

2 years agoImprove wpeditor help message; use correct command to show help message
terencehill [Mon, 12 Aug 2019 13:25:55 +0000 (15:25 +0200)]
Improve wpeditor help message; use correct command to show help message

2 years agoMerge branch 'marin-t/fix' into 'master'
Mario [Mon, 12 Aug 2019 10:54:26 +0000 (10:54 +0000)]
Merge branch 'marin-t/fix' into 'master'

Fix for hash change

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

2 years agoupdate hash 678/head
Martin Taibr [Mon, 12 Aug 2019 10:27:58 +0000 (12:27 +0200)]
update hash

2 years agoMerge branch 'master' into marin-t/fix
Martin Taibr [Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)]
Merge branch 'master' into marin-t/fix

2 years agoFix a newly added bug to match old behavior *exactly*
Martin Taibr [Mon, 12 Aug 2019 10:10:44 +0000 (12:10 +0200)]
Fix a newly added bug to match old behavior *exactly*

2 years agoIf an item has a valid target, use it on touch (defrag support)
Mario [Mon, 12 Aug 2019 09:43:29 +0000 (19:43 +1000)]
If an item has a valid target, use it on touch (defrag support)

2 years agoBot waypoints: add wpeditor_menu alias to open the waypoint editor quickmenu, allow...
terencehill [Sun, 11 Aug 2019 23:49:02 +0000 (01:49 +0200)]
Bot waypoints: add wpeditor_menu alias to open the waypoint editor quickmenu, allow to bind it with the key binder in the menu

2 years agoBot waypoints: add more settings to the waypoint editor quickmenu
terencehill [Sun, 11 Aug 2019 23:39:30 +0000 (01:39 +0200)]
Bot waypoints: add more settings to the waypoint editor quickmenu

2 years agoSimplify and optimize count_ordinal
terencehill [Sun, 11 Aug 2019 13:28:14 +0000 (15:28 +0200)]
Simplify and optimize count_ordinal

2 years agoMerge branch 'terencehill/shuffleteams_delay' into 'master'
Mario [Sun, 11 Aug 2019 12:05:32 +0000 (12:05 +0000)]
Merge branch 'terencehill/shuffleteams_delay' into 'master'

Shuffleteams delay

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

2 years agoMerge branch 'terencehill/megaerebus_glow' into 'master'
Mario [Sun, 11 Aug 2019 10:54:25 +0000 (10:54 +0000)]
Merge branch 'terencehill/megaerebus_glow' into 'master'

Fix glowing of megaerebus, erebus fullbright and nyx fullbright

Closes #2018

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

2 years agoMerge branch 'martin-t/whoosh' into 'master'
Mario [Sun, 11 Aug 2019 10:34:55 +0000 (10:34 +0000)]
Merge branch 'martin-t/whoosh' into 'master'

Fixes for nex whoosh

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

2 years agoFix compilation unit test 676/head
Mario [Sun, 11 Aug 2019 10:13:16 +0000 (20:13 +1000)]
Fix compilation unit test

2 years agoUpdate gameplay hash to match the blaster force fix
Mario [Sun, 11 Aug 2019 09:41:43 +0000 (19:41 +1000)]
Update gameplay hash to match the blaster force fix

2 years agoFix the force_zscale cvar on blaster affecting horizontal push force
Mario [Sun, 11 Aug 2019 09:05:29 +0000 (19:05 +1000)]
Fix the force_zscale cvar on blaster affecting horizontal push force

2 years agoClean up steerlib a bit
Mario [Sun, 11 Aug 2019 08:57:36 +0000 (18:57 +1000)]
Clean up steerlib a bit

2 years agoAdd an option to only show turret waypoints for a short period after the turret has...
Mario [Sun, 11 Aug 2019 07:29:04 +0000 (17:29 +1000)]
Add an option to only show turret waypoints for a short period after the turret has been hurt (disabled by default)

2 years agoInclude the modicons files for the other gamemodes (CA and CTS excluded)
Mario [Sun, 11 Aug 2019 07:22:45 +0000 (17:22 +1000)]
Include the modicons files for the other gamemodes (CA and CTS excluded)

2 years agoMove most gametype's modicons functions into their directories
Mario [Sun, 11 Aug 2019 07:21:49 +0000 (17:21 +1000)]
Move most gametype's modicons functions into their directories

2 years agoAdd a mutator hook to append special item codes to the death log
Mario [Sun, 11 Aug 2019 06:24:26 +0000 (16:24 +1000)]
Add a mutator hook to append special item codes to the death log

2 years agoMerge branch 'terencehill/waypoint_on_items' into 'master'
Mario [Sat, 10 Aug 2019 17:53:50 +0000 (17:53 +0000)]
Merge branch 'terencehill/waypoint_on_items' into 'master'

Waypoint on items

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

2 years agoRename some variables according to their use
terencehill [Sat, 10 Aug 2019 17:36:57 +0000 (19:36 +0200)]
Rename some variables according to their use

2 years agoFix a newly added bug
terencehill [Sat, 10 Aug 2019 17:33:34 +0000 (19:33 +0200)]
Fix a newly added bug

2 years agoBot waypoints: add quick menu wpeditor.txt with various commands and useful settings...
terencehill [Fri, 9 Aug 2019 14:43:37 +0000 (16:43 +0200)]
Bot waypoints: add quick menu wpeditor.txt with various commands and useful settings. Open it with 'quickmenu file "" wpeditor.txt'

2 years agoAdd partial support for the cd loop parameter in legacy map's .cfg files, allows...
Mario [Sat, 10 Aug 2019 16:44:23 +0000 (02:44 +1000)]
Add partial support for the cd loop parameter in legacy map's .cfg files, allows music to work on Nexuiz maps

2 years agoClean up some misplaced fields/globals in sv_main
Mario [Sat, 10 Aug 2019 14:19:09 +0000 (00:19 +1000)]
Clean up some misplaced fields/globals in sv_main

2 years agoDon't profile model/sound precaching, greatly reduces trace spam in the log
Mario [Sat, 10 Aug 2019 13:49:35 +0000 (23:49 +1000)]
Don't profile model/sound precaching, greatly reduces trace spam in the log

2 years agoSpeed up bot bunnyhop logic a bit by using cheap distance checks
Mario [Sat, 10 Aug 2019 13:41:35 +0000 (23:41 +1000)]
Speed up bot bunnyhop logic a bit by using cheap distance checks

2 years agoReset swamp status on respawn
Mario [Sat, 10 Aug 2019 12:44:45 +0000 (22:44 +1000)]
Reset swamp status on respawn

2 years agoMake sure trigger_heal uses the .health field instead of a resource, since this is...
Mario [Sat, 10 Aug 2019 12:02:47 +0000 (22:02 +1000)]
Make sure trigger_heal uses the .health field instead of a resource, since this is mapper defined

2 years agoAllow personal points to save buffs
Mario [Sat, 10 Aug 2019 09:06:53 +0000 (19:06 +1000)]
Allow personal points to save buffs

2 years agoExclude hidden weapons from the allguns list
Mario [Sat, 10 Aug 2019 03:54:58 +0000 (13:54 +1000)]
Exclude hidden weapons from the allguns list

2 years agoSome cleanup of the buff code revolving around timers (and supporting them on legacy...
Mario [Fri, 9 Aug 2019 19:46:54 +0000 (05:46 +1000)]
Some cleanup of the buff code revolving around timers (and supporting them on legacy maps)

2 years agoBot waypoints: add "wpeditor lock" command that replaces the usage of the 'use' butto...
terencehill [Fri, 9 Aug 2019 14:26:56 +0000 (16:26 +0200)]
Bot waypoints: add "wpeditor lock" command that replaces the usage of the 'use' button and works instantly

2 years agoClean up turret_checkpoint code a bit
Mario [Fri, 9 Aug 2019 10:13:37 +0000 (20:13 +1000)]
Clean up turret_checkpoint code a bit

2 years agoAdd an option to configure the damage force players take from attacks
Mario [Fri, 9 Aug 2019 02:05:41 +0000 (12:05 +1000)]
Add an option to configure the damage force players take from attacks

2 years agoDisable trigger_music when the match ends, so it doesn't overlap with the intermissio...
Mario [Tue, 6 Aug 2019 08:12:56 +0000 (18:12 +1000)]
Disable trigger_music when the match ends, so it doesn't overlap with the intermission cdtrack

2 years agoInclude a couple more used fields in the spawnfunc field list
Mario [Tue, 6 Aug 2019 00:52:11 +0000 (10:52 +1000)]
Include a couple more used fields in the spawnfunc field list

2 years agoDon't do jumpoff checks when the monster isn't on the ground
Mario [Mon, 5 Aug 2019 05:42:22 +0000 (15:42 +1000)]
Don't do jumpoff checks when the monster isn't on the ground

2 years agoBot waypoints: add command "wpeditor hardwire crosshair" that marks the waypoint...
terencehill [Sun, 4 Aug 2019 13:25:33 +0000 (15:25 +0200)]
Bot waypoints: add command "wpeditor hardwire crosshair" that marks the waypoint at crosshair instead of the nearest waypoint as origin of a new hardwired link

2 years agoBot waypoints: "wpeditor spawn crosshair" can now detect existing waypoints making...
terencehill [Sun, 4 Aug 2019 12:54:05 +0000 (14:54 +0200)]
Bot waypoints: "wpeditor spawn crosshair" can now detect existing waypoints making it possible to create hardwired and special links from existing waypoints with ease (instead of spawning waypoint at the exact waypoint position)

2 years agoFix allow_jumpoff code so 2D monsters can turn around at ledges
Mario [Sun, 4 Aug 2019 05:43:52 +0000 (15:43 +1000)]
Fix allow_jumpoff code so 2D monsters can turn around at ledges