]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Wed, 28 Aug 2019 16:58:52 +0000 (16:58 +0000)]
Merge branch 'martin-t/available' into 'master'
Give only available weapons in CA/FT/LMS v2
See merge request xonotic/xonotic-data.pk3dir!699
Martin Taibr [Wed, 28 Aug 2019 16:18:50 +0000 (18:18 +0200)]
Merge branch 'master' into martin-t/available
Mario [Wed, 28 Aug 2019 15:25:13 +0000 (01:25 +1000)]
Don't mark the Ball Stealer as a special attack, as it's a valid weapon in Nexball
Mario [Wed, 28 Aug 2019 10:26:52 +0000 (20:26 +1000)]
Don't apply chase crosshair in eventchase mode
Mario [Wed, 28 Aug 2019 08:49:19 +0000 (18:49 +1000)]
Adjust crosshair position while in third person mode, make the player invisible while they obstruct the view
Mario [Tue, 27 Aug 2019 15:41:16 +0000 (15:41 +0000)]
Merge branch 'martin-t/shootfromeye' into 'master'
Whitelist g_shootfromeye from pure cvars
See merge request xonotic/xonotic-data.pk3dir!702
Mario [Tue, 27 Aug 2019 04:16:37 +0000 (14:16 +1000)]
Update weapon skin with CSQC
Martin Taibr [Mon, 26 Aug 2019 16:41:15 +0000 (18:41 +0200)]
whitelist g_shootfromeye from pure cvars
Martin Taibr [Mon, 26 Aug 2019 16:13:00 +0000 (18:13 +0200)]
defaults in code
Mario [Mon, 26 Aug 2019 11:36:05 +0000 (21:36 +1000)]
Make g_spawn_alloweffects not affect purity
Martin Taibr [Sun, 25 Aug 2019 23:00:59 +0000 (01:00 +0200)]
Merge branch 'master' into martin-t/available
Martin Taibr [Sun, 25 Aug 2019 21:02:51 +0000 (23:02 +0200)]
remove debug output, old comments
Martin Taibr [Sun, 25 Aug 2019 20:49:17 +0000 (22:49 +0200)]
remove todos, cleanup
Martin Taibr [Sun, 25 Aug 2019 19:46:43 +0000 (21:46 +0200)]
cleanup weapon_defaultspawnfunc
Martin Taibr [Sun, 25 Aug 2019 19:43:39 +0000 (21:43 +0200)]
minor cleanup
Martin Taibr [Sun, 25 Aug 2019 18:08:58 +0000 (20:08 +0200)]
waeponarena {all,most}_available
Mario [Sun, 25 Aug 2019 17:50:33 +0000 (03:50 +1000)]
Don't respond to color/topcolor/bottomcolor commands in teamplay modes
Mario [Sun, 25 Aug 2019 13:24:14 +0000 (23:24 +1000)]
Include some more turret fields in the spawnfunc whitelist, reduces spam on some maps
terencehill [Sun, 25 Aug 2019 12:41:18 +0000 (14:41 +0200)]
Remove duplicated cvar intializations
terencehill [Sun, 25 Aug 2019 12:24:55 +0000 (14:24 +0200)]
Menu: don't wire up some settings to the "Apply immediately" button since menu can automatically send changed cvar values to the server. Also fix 2 settings that couldn't be applied immediately in any way
Mario [Sat, 24 Aug 2019 18:29:36 +0000 (04:29 +1000)]
Add the weaponarena weapons onto start_weapons instead of setting it, fixes new toys
Mario [Sat, 24 Aug 2019 18:07:29 +0000 (04:07 +1000)]
Fix weaponarena available including hidden weapons, also fix available weapons not being included in the warmup weapons list
Mario [Sat, 24 Aug 2019 17:09:17 +0000 (17:09 +0000)]
Merge branch 'terencehill/automatic_sendcvar' into 'master'
Automatic sendcvar
Closes #2270
See merge request xonotic/xonotic-data.pk3dir!694
Mario [Sat, 24 Aug 2019 08:35:41 +0000 (18:35 +1000)]
Update gameplay hash
Mario [Sat, 24 Aug 2019 08:24:46 +0000 (18:24 +1000)]
Don't link teleporter destinations to CSQC if they aren't targeted
Mario [Sat, 24 Aug 2019 07:49:58 +0000 (17:49 +1000)]
If the monster already has flags set to FL_MONSTER, don't push it to the monster list, as it should already exist there (fixes warnings when setting monsters to appear)
terencehill [Fri, 23 Aug 2019 15:04:05 +0000 (17:04 +0200)]
Remove references to sendcvar from cvar descriptions, mark setreport as deprecated. Fix compilation units.
terencehill [Fri, 23 Aug 2019 13:18:43 +0000 (15:18 +0200)]
Fix server needlessly respawning PlayerState and Inventory entities (without deleting old entities) every time a player respawns
Mario [Fri, 23 Aug 2019 09:11:36 +0000 (19:11 +1000)]
Disable client prediction when spectating, fixes some issues with QC physics
Mario [Fri, 23 Aug 2019 07:13:09 +0000 (17:13 +1000)]
Properly check against the world when trying for worldstartsolid, fixes some issues with elevators
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
Mario [Wed, 21 Aug 2019 18:22:56 +0000 (04:22 +1000)]
Update gameplay hash
Mario [Wed, 21 Aug 2019 18:05:05 +0000 (04:05 +1000)]
Restore official machinegun balance to current master
Mario [Wed, 21 Aug 2019 17:10:36 +0000 (03:10 +1000)]
Update gameplay hash
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
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
Martin Taibr [Wed, 21 Aug 2019 14:28:53 +0000 (16:28 +0200)]
remove default showaccuracy bind
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
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
Martin Taibr [Tue, 20 Aug 2019 11:43:20 +0000 (13:43 +0200)]
fix typo
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)
terencehill [Mon, 19 Aug 2019 22:07:08 +0000 (00:07 +0200)]
Stop server from requesting cvar values to the client on connection as it's no longer necessary
terencehill [Mon, 19 Aug 2019 17:20:10 +0000 (19:20 +0200)]
Limit sendcvar calls to one per frame
terencehill [Sun, 18 Aug 2019 16:18:58 +0000 (18:18 +0200)]
Automatically send cvar values (when changed) to the server for settings that need a sendcvar call so that they can be applied instantly, e.g. cl_casings
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
Martin Taibr [Sun, 18 Aug 2019 12:27:38 +0000 (14:27 +0200)]
suggestion to increase autocap
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
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
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
Martin Taibr [Sun, 18 Aug 2019 09:47:31 +0000 (11:47 +0200)]
typo
Mario [Sun, 18 Aug 2019 09:26:50 +0000 (19:26 +1000)]
Merge branch 'master' into martin-t/rulesets
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
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
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
Mario [Sat, 17 Aug 2019 17:11:13 +0000 (03:11 +1000)]
Add a note to zscale and default it to 1 in RadiusDamage
Mario [Sat, 17 Aug 2019 16:32:34 +0000 (02:32 +1000)]
Update gameplay hash
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
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"
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)
Martin Taibr [Fri, 16 Aug 2019 19:34:51 +0000 (21:34 +0200)]
remove `set` from XPM
Martin Taibr [Fri, 16 Aug 2019 19:32:09 +0000 (21:32 +0200)]
remove `set` and a nonexistent cvar from XDF
Martin Taibr [Fri, 16 Aug 2019 18:15:34 +0000 (20:15 +0200)]
use g_use_ammunition instead of hardcoding unlimited ammo
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
Mario [Thu, 15 Aug 2019 13:19:50 +0000 (23:19 +1000)]
Restore overkill nex secondary force
Mario [Thu, 15 Aug 2019 13:18:26 +0000 (23:18 +1000)]
Restore overkill machinegun secondary force
Mario [Thu, 15 Aug 2019 11:36:10 +0000 (21:36 +1000)]
Add a force_zscale setting to weapons that use the blaster secondary
Martin Taibr [Thu, 15 Aug 2019 10:29:07 +0000 (12:29 +0200)]
restore balance to insta
Martin Taibr [Thu, 15 Aug 2019 10:03:52 +0000 (12:03 +0200)]
restore overkill blaster balance
Mario [Thu, 15 Aug 2019 08:53:07 +0000 (18:53 +1000)]
Add parenthesis to some bitflag checks
terencehill [Thu, 15 Aug 2019 07:24:23 +0000 (09:24 +0200)]
Compact weapon flag checks
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
Martin Taibr [Tue, 13 Aug 2019 19:30:39 +0000 (21:30 +0200)]
Merge branch 'master' into martin-t/ok-config
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
Mario [Tue, 13 Aug 2019 14:15:34 +0000 (00:15 +1000)]
Don't add WEP_FLAG_NORMAL to the overkill weapons
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
Mario [Tue, 13 Aug 2019 12:39:45 +0000 (22:39 +1000)]
Adjust crylink secondary a bit in the Mario balance configuration
Mario [Tue, 13 Aug 2019 12:13:44 +0000 (22:13 +1000)]
Restore parity to the weapon balance configs
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
Martin Taibr [Tue, 13 Aug 2019 12:07:49 +0000 (14:07 +0200)]
OK: add fullbright, remove "set"
Martin Taibr [Tue, 13 Aug 2019 11:51:40 +0000 (13:51 +0200)]
add WEP_FLAG_PENETRATEWALLS to HMG (fixes trueaim)
terencehill [Tue, 13 Aug 2019 11:19:29 +0000 (13:19 +0200)]
Optimize WarpZoneLib_MoveOutOfSolid_Expand (constant folding)
terencehill [Tue, 13 Aug 2019 11:14:43 +0000 (13:14 +0200)]
Reduce LOG_INFO calls in bot waypoint code
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
Martin Taibr [Tue, 13 Aug 2019 10:35:20 +0000 (12:35 +0200)]
MG solpen value from my server, HMG to match
Mario [Tue, 13 Aug 2019 05:32:42 +0000 (15:32 +1000)]
Fix compilation unit test
Martin Taibr [Mon, 12 Aug 2019 20:43:38 +0000 (22:43 +0200)]
restore old armor / physics in OK
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)
Martin Taibr [Mon, 12 Aug 2019 16:35:11 +0000 (18:35 +0200)]
nerf resistance in OK
Martin Taibr [Mon, 12 Aug 2019 16:31:48 +0000 (18:31 +0200)]
old blaster behavior in OK
Martin Taibr [Mon, 12 Aug 2019 15:31:15 +0000 (17:31 +0200)]
increase HMG solpen to be higher than MG
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
Martin Taibr [Mon, 12 Aug 2019 10:27:58 +0000 (12:27 +0200)]
update hash
Martin Taibr [Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)]
Merge branch 'master' into marin-t/fix
Martin Taibr [Mon, 12 Aug 2019 10:10:44 +0000 (12:10 +0200)]
Fix a newly added bug to match old behavior *exactly*
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)
terencehill [Sun, 11 Aug 2019 13:28:14 +0000 (15:28 +0200)]
Simplify and optimize count_ordinal
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
Mario [Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)]
Merge branch 'master' into Mario/weaponarena_available
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
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