xonotic/xonotic-data.pk3dir.git
4 months agoMerge branch 'martin-t/ok-balances' into 'master'
Mario [Sun, 1 Sep 2019 04:27:03 +0000 (04:27 +0000)]
Merge branch 'martin-t/ok-balances' into 'master'

Sync OK configs to minimize modified cvars

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

4 months agosync OK configs to minimize modified cvars 705/head
Martin Taibr [Sat, 31 Aug 2019 17:33:08 +0000 (19:33 +0200)]
sync OK configs to minimize modified cvars

4 months agoAdjust the values of the network speed sliders and default to the new Fast ADSL setti...
Mario [Sat, 31 Aug 2019 15:22:13 +0000 (01:22 +1000)]
Adjust the values of the network speed sliders and default to the new Fast ADSL setting of 40000 (was 20000)

4 months agoWhitelist fs_gamedir (not a gameplay relevant setting)
Mario [Sat, 31 Aug 2019 10:56:51 +0000 (20:56 +1000)]
Whitelist fs_gamedir (not a gameplay relevant setting)

4 months agoAllow g_new_toys_autoreplace to be changed without affecting purity (it's a preferenc...
Mario [Sat, 31 Aug 2019 08:34:05 +0000 (18:34 +1000)]
Allow g_new_toys_autoreplace to be changed without affecting purity (it's a preference for the already reported new toys mutator, not so much a gameplay relevant setting)

4 months agoMake genmod.sh output compile again
Mario [Sat, 31 Aug 2019 03:21:36 +0000 (13:21 +1000)]
Make genmod.sh output compile again

4 months agoFix #2283 "cl_gunalign fails, weapon always right"
terencehill [Fri, 30 Aug 2019 23:12:46 +0000 (01:12 +0200)]
Fix #2283 "cl_gunalign fails, weapon always right"

4 months agoDisable vehicle alarm by default
Mario [Fri, 30 Aug 2019 18:01:28 +0000 (04:01 +1000)]
Disable vehicle alarm by default

4 months agoDon't replace bullets with shells when sv_q3acompat_machineshotgunswap is enabled
Mario [Fri, 30 Aug 2019 17:31:04 +0000 (03:31 +1000)]
Don't replace bullets with shells when sv_q3acompat_machineshotgunswap is enabled

4 months agoFix sv_q3acompat_machineshotgunswap
Mario [Fri, 30 Aug 2019 16:37:51 +0000 (02:37 +1000)]
Fix sv_q3acompat_machineshotgunswap

4 months agoRestore the old hook sound (new one introduces overlapping issues)
Mario [Fri, 30 Aug 2019 10:37:52 +0000 (20:37 +1000)]
Restore the old hook sound (new one introduces overlapping issues)

4 months agoMerge branch 'Mario/tenshihan_newsounds' into 'master'
Mario [Fri, 30 Aug 2019 08:32:49 +0000 (08:32 +0000)]
Merge branch 'Mario/tenshihan_newsounds' into 'master'

Merge branch Mario/tenshihan_newsounds (S merge request)

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

4 months agoRestore old Mortar fire sound 697/head
Mario [Fri, 30 Aug 2019 08:19:23 +0000 (18:19 +1000)]
Restore old Mortar fire sound

4 months agoTransifex autosync
Rudolf Polzer [Fri, 30 Aug 2019 05:24:52 +0000 (07:24 +0200)]
Transifex autosync

4 months agoDon't send each team choice cvar 4 times to the server (we can do it now thanks to...
terencehill [Thu, 29 Aug 2019 20:09:45 +0000 (22:09 +0200)]
Don't send each team choice cvar 4 times to the server (we can do it now thanks to commit e05fde461f)

4 months agoMerge branch 'terencehill/date_format' into 'master'
terencehill [Thu, 29 Aug 2019 18:48:19 +0000 (18:48 +0000)]
Merge branch 'terencehill/date_format' into 'master'

Menu Xonstats date format: allow changing it in other languages; display cardinal day number (e.g. "January 1, 2019" instead of "January 1st, 2019")

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

4 months agoRestore functionality to the phaser turret
Mario [Thu, 29 Aug 2019 18:31:17 +0000 (04:31 +1000)]
Restore functionality to the phaser turret

4 months agoAdd a cvar to control the minimum speed a vehicle needs to be travelling to crush...
Mario [Thu, 29 Aug 2019 17:03:18 +0000 (03:03 +1000)]
Add a cvar to control the minimum speed a vehicle needs to be travelling to crush a player and increase the speed from 30 to 100

4 months agoOptimize vehicle impact code by only calling vlen() if damage would be taken
Mario [Thu, 29 Aug 2019 17:00:11 +0000 (03:00 +1000)]
Optimize vehicle impact code by only calling vlen() if damage would be taken

4 months agoDon't allow voice messages while dead
Mario [Thu, 29 Aug 2019 07:04:35 +0000 (17:04 +1000)]
Don't allow voice messages while dead

4 months agoMerge branch 'terencehill/less_fields' into 'master'
Mario [Thu, 29 Aug 2019 06:14:10 +0000 (06:14 +0000)]
Merge branch 'terencehill/less_fields' into 'master'

Less fields

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

4 months agoMerge branch 'master' into terencehill/less_fields 659/head
Mario [Thu, 29 Aug 2019 05:44:29 +0000 (15:44 +1000)]
Merge branch 'master' into terencehill/less_fields

# Conflicts:
# qcsrc/common/notifications/all.qh

4 months agoRemove the effectively unused teams parameter from notifications
Mario [Thu, 29 Aug 2019 05:39:06 +0000 (15:39 +1000)]
Remove the effectively unused teams parameter from notifications

4 months agoMerge branch 'Mario/stats_eloranking' into 'master'
Mario [Thu, 29 Aug 2019 05:24:36 +0000 (05:24 +0000)]
Merge branch 'Mario/stats_eloranking' into 'master'

Merge branch Mario/stats_eloranking (S merge request)

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

4 months agoRegister the ranking cvar in CSQC so it has a default value on older clients 487/head
Mario [Thu, 29 Aug 2019 05:02:25 +0000 (15:02 +1000)]
Register the ranking cvar in CSQC so it has a default value on older clients

4 months agoAdd cl_allow_uidranking to the Profile menu
Mario [Thu, 29 Aug 2019 04:56:38 +0000 (14:56 +1000)]
Add cl_allow_uidranking to the Profile menu

4 months agoMerge branch 'master' into Mario/stats_eloranking
Mario [Thu, 29 Aug 2019 04:44:42 +0000 (14:44 +1000)]
Merge branch 'master' into Mario/stats_eloranking

4 months agoMerge branch 'terencehill/bot_waypoints' into 'master'
Mario [Thu, 29 Aug 2019 04:30:01 +0000 (04:30 +0000)]
Merge branch 'terencehill/bot_waypoints' into 'master'

Bot waypoints updates

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

4 months agoMerge branch 'master' into terencehill/bot_waypoints 670/head
Mario [Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)]
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# .gitlab-ci.yml

4 months agoFix #2279 "Randomised powerups not working correctly"
terencehill [Wed, 28 Aug 2019 22:17:52 +0000 (00:17 +0200)]
Fix #2279 "Randomised powerups not working correctly"

4 months agoFix some inconsistent indentation in t_items.qc
terencehill [Wed, 28 Aug 2019 22:08:23 +0000 (00:08 +0200)]
Fix some inconsistent indentation in t_items.qc

4 months agoMerge branch 'martin-t/blaster' into 'master'
Mario [Wed, 28 Aug 2019 17:15:48 +0000 (17:15 +0000)]
Merge branch 'martin-t/blaster' into 'master'

Restore blaster push

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

4 months agoMerge branch 'martin-t/available' into 'master'
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

4 months agoMerge branch 'master' into martin-t/available 699/head
Martin Taibr [Wed, 28 Aug 2019 16:18:50 +0000 (18:18 +0200)]
Merge branch 'master' into martin-t/available

4 months agoDon't mark the Ball Stealer as a special attack, as it's a valid weapon in Nexball
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

4 months agoDon't apply chase crosshair in eventchase mode
Mario [Wed, 28 Aug 2019 10:26:52 +0000 (20:26 +1000)]
Don't apply chase crosshair in eventchase mode

4 months agoAdjust crosshair position while in third person mode, make the player invisible while...
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

4 months agoMerge branch 'martin-t/shootfromeye' into 'master'
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

4 months agoUpdate weapon skin with CSQC
Mario [Tue, 27 Aug 2019 04:16:37 +0000 (14:16 +1000)]
Update weapon skin with CSQC

4 months agorestore blaster and vaporizer in all balances 701/head
Martin Taibr [Mon, 26 Aug 2019 17:33:30 +0000 (19:33 +0200)]
restore blaster and vaporizer in all balances

4 months agothis is gmail's fault
Martin Taibr [Mon, 26 Aug 2019 17:12:23 +0000 (19:12 +0200)]
this is gmail's fault

4 months agoupdate hash
Martin Taibr [Mon, 26 Aug 2019 16:46:27 +0000 (18:46 +0200)]
update hash

4 months agowhitelist g_shootfromeye from pure cvars 702/head
Martin Taibr [Mon, 26 Aug 2019 16:41:15 +0000 (18:41 +0200)]
whitelist g_shootfromeye from pure cvars

4 months agorestore blaster push
Martin Taibr [Mon, 26 Aug 2019 16:30:45 +0000 (18:30 +0200)]
restore blaster push

4 months agodefaults in code
Martin Taibr [Mon, 26 Aug 2019 16:13:00 +0000 (18:13 +0200)]
defaults in code

4 months agoMake g_spawn_alloweffects not affect purity
Mario [Mon, 26 Aug 2019 11:36:05 +0000 (21:36 +1000)]
Make g_spawn_alloweffects not affect purity

4 months agoMerge branch 'master' into martin-t/available
Martin Taibr [Sun, 25 Aug 2019 23:00:59 +0000 (01:00 +0200)]
Merge branch 'master' into martin-t/available

4 months agoremove debug output, old comments
Martin Taibr [Sun, 25 Aug 2019 21:02:51 +0000 (23:02 +0200)]
remove debug output, old comments

4 months agoremove todos, cleanup
Martin Taibr [Sun, 25 Aug 2019 20:49:17 +0000 (22:49 +0200)]
remove todos, cleanup

4 months agocleanup weapon_defaultspawnfunc
Martin Taibr [Sun, 25 Aug 2019 19:46:43 +0000 (21:46 +0200)]
cleanup weapon_defaultspawnfunc

4 months agominor cleanup
Martin Taibr [Sun, 25 Aug 2019 19:43:39 +0000 (21:43 +0200)]
minor cleanup

4 months agowaeponarena {all,most}_available
Martin Taibr [Sun, 25 Aug 2019 18:08:58 +0000 (20:08 +0200)]
waeponarena {all,most}_available

4 months agoDon't respond to color/topcolor/bottomcolor commands in teamplay modes
Mario [Sun, 25 Aug 2019 17:50:33 +0000 (03:50 +1000)]
Don't respond to color/topcolor/bottomcolor commands in teamplay modes

4 months agoInclude some more turret fields in the spawnfunc whitelist, reduces spam on some...
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

4 months agoRemove duplicated cvar intializations
terencehill [Sun, 25 Aug 2019 12:41:18 +0000 (14:41 +0200)]
Remove duplicated cvar intializations

4 months agoMenu: don't wire up some settings to the "Apply immediately" button since menu can...
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

4 months agoAdd the weaponarena weapons onto start_weapons instead of setting it, fixes new toys Mario/weaponarena_available 677/head
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

4 months agoFix weaponarena available including hidden weapons, also fix available weapons not...
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

4 months agoMerge branch 'terencehill/automatic_sendcvar' into 'master'
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

4 months agoUpdate gameplay hash
Mario [Sat, 24 Aug 2019 08:35:41 +0000 (18:35 +1000)]
Update gameplay hash

4 months agoDon't link teleporter destinations to CSQC if they aren't targeted
Mario [Sat, 24 Aug 2019 08:24:46 +0000 (18:24 +1000)]
Don't link teleporter destinations to CSQC if they aren't targeted

4 months agoIf the monster already has flags set to FL_MONSTER, don't push it to the monster...
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)

4 months agoRemove references to sendcvar from cvar descriptions, mark setreport as deprecated... 694/head
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.

4 months agoFix server needlessly respawning PlayerState and Inventory entities (without deleting...
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

4 months agoAdding in Tenshihan's new sounds, from his released v0.04 pack
Mario [Fri, 23 Aug 2019 09:47:42 +0000 (19:47 +1000)]
Adding in Tenshihan's new sounds, from his released v0.04 pack

4 months agoDisable client prediction when spectating, fixes some issues with QC physics
Mario [Fri, 23 Aug 2019 09:11:36 +0000 (19:11 +1000)]
Disable client prediction when spectating, fixes some issues with QC physics

4 months agoProperly check against the world when trying for worldstartsolid, fixes some issues...
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

5 months agoFix compilation units and update hash
terencehill [Thu, 22 Aug 2019 00:57:30 +0000 (02:57 +0200)]
Fix compilation units and update hash

5 months agoSmall cleanups
terencehill [Thu, 22 Aug 2019 00:56:40 +0000 (02:56 +0200)]
Small cleanups

5 months agoAdd parentheses
terencehill [Thu, 22 Aug 2019 00:38:55 +0000 (02:38 +0200)]
Add parentheses

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

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

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

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

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

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

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

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

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

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

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

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

5 months agoStop server from requesting cvar values to the client on connection as it's no longer...
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

5 months agoLimit sendcvar calls to one per frame
terencehill [Mon, 19 Aug 2019 17:20:10 +0000 (19:20 +0200)]
Limit sendcvar calls to one per frame

5 months agoAutomatically send cvar values (when changed) to the server for settings that need...
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

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

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

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

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

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

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

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

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

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

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

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

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

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

5 months 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"

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