xonotic/xonotic-data.pk3dir.git
12 hours agoMerge branch 'martin-t/xdf-mg' into 'master' byteManiak/misc-fixes master
Martin Taibr [Wed, 18 Sep 2019 11:44:52 +0000 (11:44 +0000)]
Merge branch 'martin-t/xdf-mg' into 'master'

Fix "infinite" burst happening when reload ammo was 0 (as in XDF)

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

13 hours agofix "infinite" burst happening when reload ammo was 0 (as in XDF) 718/head
Martin Taibr [Wed, 18 Sep 2019 09:54:20 +0000 (11:54 +0200)]
fix "infinite" burst happening when reload ammo was 0 (as in XDF)

3 days agoApply default values in code to the gameplayfix cvars
Mario [Sun, 15 Sep 2019 17:45:07 +0000 (03:45 +1000)]
Apply default values in code to the gameplayfix cvars

3 days agoMake stepnormal available to the above functions, fixes some discrepancies in QC...
Mario [Sun, 15 Sep 2019 06:09:28 +0000 (16:09 +1000)]
Make stepnormal available to the above functions, fixes some discrepancies in QC physics

4 days agoMerge branch 'martin-t/qc2rust' into 'master'
Mario [Sat, 14 Sep 2019 20:36:36 +0000 (20:36 +0000)]
Merge branch 'martin-t/qc2rust' into 'master'

Qc2rust branch with tiny changes

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

4 days agorestore var name so branch can be merged 716/head
Martin Taibr [Sat, 14 Sep 2019 18:31:09 +0000 (20:31 +0200)]
restore var name so branch can be merged

5 days agoMerge branch 'martin-t/seta' into 'master'
Mario [Fri, 13 Sep 2019 12:51:28 +0000 (12:51 +0000)]
Merge branch 'martin-t/seta' into 'master'

Seta -> set in server configs

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

6 days agoMerge branch 'cloudwalk9/mgburstfix' into 'master'
Martin Taibr [Thu, 12 Sep 2019 21:34:17 +0000 (21:34 +0000)]
Merge branch 'cloudwalk9/mgburstfix' into 'master'

Improve machinegun burst fire

This fixes #2215

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

6 days agofix burst when no ammo for reload, update hash 656/head
Martin Taibr [Thu, 12 Sep 2019 21:19:55 +0000 (23:19 +0200)]
fix burst when no ammo for reload, update hash

6 days agocleanup
Martin Taibr [Thu, 12 Sep 2019 20:05:19 +0000 (22:05 +0200)]
cleanup

6 days agoMerge branch 'master' into cloudwalk9/mgburstfix
Martin Taibr [Thu, 12 Sep 2019 19:21:25 +0000 (21:21 +0200)]
Merge branch 'master' into cloudwalk9/mgburstfix

6 days agoTransifex autosync
Rudolf Polzer [Thu, 12 Sep 2019 05:25:13 +0000 (07:25 +0200)]
Transifex autosync

7 days agoremove redundant cvar in OK ruleset
Martin Taibr [Wed, 11 Sep 2019 23:09:32 +0000 (01:09 +0200)]
remove redundant cvar in OK ruleset

8 days agoMerge branch 'Mario/spike_removal' into 'master'
Mario [Tue, 10 Sep 2019 13:31:46 +0000 (13:31 +0000)]
Merge branch 'Mario/spike_removal' into 'master'

Merge branch Mario/spike_removal (XS merge request)

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

8 days agoDon't dequeue the projectile if it's already been done 714/head
Mario [Tue, 10 Sep 2019 11:19:46 +0000 (21:19 +1000)]
Don't dequeue the projectile if it's already been done

8 days agoUse destructors to dequeue crylink spikes, fixes some potential crashes from unsafe...
Mario [Tue, 10 Sep 2019 10:49:13 +0000 (20:49 +1000)]
Use destructors to dequeue crylink spikes, fixes some potential crashes from unsafe spike removal

11 days agoDisable sv_cullentities_trace_eyejitter (spams the network with item updates)
Mario [Sat, 7 Sep 2019 17:04:36 +0000 (03:04 +1000)]
Disable sv_cullentities_trace_eyejitter (spams the network with item updates)

11 days agoDo a trace when throwing the flag to ensure it isn't placed inside a solid ceiling
Mario [Sat, 7 Sep 2019 15:10:03 +0000 (01:10 +1000)]
Do a trace when throwing the flag to ensure it isn't placed inside a solid ceiling

11 days agoBot waypoints: fix creation of a jump / support link from wp A to wp B breaking hardw...
terencehill [Sat, 7 Sep 2019 14:30:32 +0000 (16:30 +0200)]
Bot waypoints: fix creation of a jump / support link from wp A to wp B breaking hardwired links of wp B

11 days agoFix g_rocket_flying_disabledelays (below 0 means proximity, not instant)
Mario [Sat, 7 Sep 2019 12:23:21 +0000 (22:23 +1000)]
Fix g_rocket_flying_disabledelays (below 0 means proximity, not instant)

11 days agoRestore XPM modname to the XPM Testing balance configuration
Mario [Sat, 7 Sep 2019 12:04:08 +0000 (22:04 +1000)]
Restore XPM modname to the XPM Testing balance configuration

11 days agoAllow g_rocket_flying_disabledelays to be changed without affecting purity
Mario [Sat, 7 Sep 2019 11:36:52 +0000 (21:36 +1000)]
Allow g_rocket_flying_disabledelays to be changed without affecting purity

11 days agoFix g_rocket_flying_disabledelays adding a slight delay to rocket detonation
Mario [Sat, 7 Sep 2019 11:13:46 +0000 (21:13 +1000)]
Fix g_rocket_flying_disabledelays adding a slight delay to rocket detonation

11 days agoReduce vampire buff's health steal amount, reduce the amount of damage the vengeance...
Mario [Sat, 7 Sep 2019 11:09:05 +0000 (21:09 +1000)]
Reduce vampire buff's health steal amount, reduce the amount of damage the vengeance buff reflects, reduce luck buff's damage multiplier to double damage

11 days agoApply invisibility to crosshair chase, fixes players becoming more visible when their...
Mario [Sat, 7 Sep 2019 10:57:25 +0000 (20:57 +1000)]
Apply invisibility to crosshair chase, fixes players becoming more visible when their crosshair is obstructed

11 days agoAllow admins to use the rocket flying mutator without breaking purity
Mario [Sat, 7 Sep 2019 10:02:20 +0000 (20:02 +1000)]
Allow admins to use the rocket flying mutator without breaking purity

11 days agoGive g_balance_devastator_remote_jump_radius a default value now that it isn't the...
Mario [Sat, 7 Sep 2019 08:58:46 +0000 (18:58 +1000)]
Give g_balance_devastator_remote_jump_radius a default value now that it isn't the controller for rocket flying, restore rocket flying in the balance configurations that had it

11 days agoAdd g_balance_devastator_remote_jump as a controller cvar for rocket flying, force...
Mario [Sat, 7 Sep 2019 08:55:57 +0000 (18:55 +1000)]
Add g_balance_devastator_remote_jump as a controller cvar for rocket flying, force it enabled in the rocket flying mutator

11 days agoUpdate gameplay hash
Mario [Sat, 7 Sep 2019 08:13:41 +0000 (18:13 +1000)]
Update gameplay hash

11 days agoEnable Devastator remote jumping in the Testing balance, as per !708
Mario [Sat, 7 Sep 2019 07:45:43 +0000 (17:45 +1000)]
Enable Devastator remote jumping in the Testing balance, as per !708

11 days agoAdjust Crylink's secondary attack to be a faster spread-out shot in the Testing balan...
Mario [Sat, 7 Sep 2019 07:31:34 +0000 (17:31 +1000)]
Adjust Crylink's secondary attack to be a faster spread-out shot in the Testing balance, as per !614

11 days agoIncrease machinegun solidpenetration to 63 in the Testing balance, as per !709
Mario [Sat, 7 Sep 2019 07:08:24 +0000 (17:08 +1000)]
Increase machinegun solidpenetration to 63 in the Testing balance, as per !709

11 days agoMerge branch 'martin-t/mg-solidpen' into 'master'
Mario [Sat, 7 Sep 2019 07:00:41 +0000 (07:00 +0000)]
Merge branch 'martin-t/mg-solidpen' into 'master'

Increase MG solidpenetration

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

11 days agoRestore original solid penetration settings (to be applied in a separate branch) 619/head
Mario [Sat, 7 Sep 2019 06:59:49 +0000 (16:59 +1000)]
Restore original solid penetration settings (to be applied in a separate branch)

11 days agoDisable Vortex charge and reduce damage to 65 in the Testing balance, as per !704
Mario [Sat, 7 Sep 2019 06:50:07 +0000 (16:50 +1000)]
Disable Vortex charge and reduce damage to 65 in the Testing balance, as per !704

11 days agoEnable Crylink linkexplode, as per !706
Mario [Sat, 7 Sep 2019 06:48:07 +0000 (16:48 +1000)]
Enable Crylink linkexplode, as per !706

11 days agoInclude a Testing balance configuration to allow testing upcoming balance changes...
Mario [Sat, 7 Sep 2019 06:47:22 +0000 (16:47 +1000)]
Include a Testing balance configuration to allow testing upcoming balance changes without affecting purity

11 days agoMerge branch 'Mario/warmup_end_hook'
Mario [Sat, 7 Sep 2019 06:25:34 +0000 (16:25 +1000)]
Merge branch 'Mario/warmup_end_hook'

11 days agoAdd a server hook alias for the end of warmup stage (when the real match is going...
Mario [Sat, 7 Sep 2019 06:17:01 +0000 (16:17 +1000)]
Add a server hook alias for the end of warmup stage (when the real match is going to begin)

11 days agoMerge branch 'martin-t/degotofication' into 'master'
Mario [Sat, 7 Sep 2019 05:21:52 +0000 (05:21 +0000)]
Merge branch 'martin-t/degotofication' into 'master'

Remove some gotos

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

12 days agoFix cl_hitsound description
Mario [Fri, 6 Sep 2019 12:44:05 +0000 (22:44 +1000)]
Fix cl_hitsound description

12 days agoAllow g_player_brightness changes without affecting purity
Mario [Fri, 6 Sep 2019 00:53:45 +0000 (10:53 +1000)]
Allow g_player_brightness changes without affecting purity

2 weeks agoMove this.goalcurrent check inside havocbot_bunnyhop
terencehill [Wed, 4 Sep 2019 20:30:50 +0000 (22:30 +0200)]
Move this.goalcurrent check inside havocbot_bunnyhop

2 weeks agoBot AI: clear current route if goalcurrent has been freed; it should avoid occasional...
terencehill [Wed, 4 Sep 2019 20:28:04 +0000 (22:28 +0200)]
Bot AI: clear current route if goalcurrent has been freed; it should avoid occasional "checkpvs: can not check free entity" warnings generated by the bunnyhop code

2 weeks agoremove some easy gotos 707/head
Martin Taibr [Wed, 4 Sep 2019 17:25:48 +0000 (19:25 +0200)]
remove some easy gotos

2 weeks agoAllow g_tdm_on_dm_maps and g_duel_not_dm_maps to be changed without affecting purity...
Mario [Wed, 4 Sep 2019 15:27:30 +0000 (01:27 +1000)]
Allow g_tdm_on_dm_maps and g_duel_not_dm_maps to be changed without affecting purity (gameplay irrelevant)

2 weeks agoAdd an option to prevent Deathmatch maps showing up in Duel (off by default since...
Mario [Wed, 4 Sep 2019 15:20:03 +0000 (01:20 +1000)]
Add an option to prevent Deathmatch maps showing up in Duel (off by default since no maps list support for Duel)

2 weeks agoDon't perform antilag takeback on every single bullet in the Shotgun attack
Mario [Wed, 4 Sep 2019 13:09:20 +0000 (23:09 +1000)]
Don't perform antilag takeback on every single bullet in the Shotgun attack

2 weeks agoInclude some sane options in the cl_maxfps slider and increase the default to 250
Mario [Wed, 4 Sep 2019 11:44:44 +0000 (21:44 +1000)]
Include some sane options in the cl_maxfps slider and increase the default to 250

2 weeks agoDisable cl_maxfps_alwayssleep (Xonotic caps FPS by default, this setting is not neces...
Mario [Wed, 4 Sep 2019 11:24:09 +0000 (21:24 +1000)]
Disable cl_maxfps_alwayssleep (Xonotic caps FPS by default, this setting is not necessary anymore)

2 weeks agoFix items not providing all their resources if they have multiple
Mario [Wed, 4 Sep 2019 10:35:09 +0000 (20:35 +1000)]
Fix items not providing all their resources if they have multiple

2 weeks agoDisable zombie spawn sound (none exists), fixes a warning when zombies spawn
Mario [Wed, 4 Sep 2019 09:41:02 +0000 (19:41 +1000)]
Disable zombie spawn sound (none exists), fixes a warning when zombies spawn

2 weeks agoIf an attack would be fatal, don't play the armor hit sound
Mario [Wed, 4 Sep 2019 09:37:51 +0000 (19:37 +1000)]
If an attack would be fatal, don't play the armor hit sound

2 weeks agoAdjust resistance and vengeance buffs to 50% damage instead of 70% (resistance) and...
Mario [Tue, 3 Sep 2019 12:26:34 +0000 (22:26 +1000)]
Adjust resistance and vengeance buffs to 50% damage instead of 70% (resistance) and 60% (vengeance)

2 weeks agoupdate hash
Martin Taibr [Tue, 3 Sep 2019 10:39:08 +0000 (12:39 +0200)]
update hash

2 weeks agoMerge branch 'master' into martin-t/mg-solidpen
Martin Taibr [Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)]
Merge branch 'master' into martin-t/mg-solidpen

2 weeks agoEnforce first person view while in vehicle gunner slots
Mario [Tue, 3 Sep 2019 10:13:37 +0000 (20:13 +1000)]
Enforce first person view while in vehicle gunner slots

2 weeks agoupdate hash (bot waypoints changed)
Martin Taibr [Mon, 2 Sep 2019 21:15:11 +0000 (23:15 +0200)]
update hash (bot waypoints changed)

2 weeks agoWhitelist some settings that don't change gameplay
Mario [Mon, 2 Sep 2019 07:21:40 +0000 (17:21 +1000)]
Whitelist some settings that don't change gameplay

2 weeks agoFix map sizes not actually listening to the count bots setting
Mario [Mon, 2 Sep 2019 06:46:24 +0000 (16:46 +1000)]
Fix map sizes not actually listening to the count bots setting

2 weeks agoAdd an option to count bots when getting the size restrictions on maps (enabled by...
Mario [Mon, 2 Sep 2019 06:14:16 +0000 (16:14 +1000)]
Add an option to count bots when getting the size restrictions on maps (enabled by default - old behaviour)

2 weeks agoOptimize bandwidth and memory usage of item stats networking
terencehill [Sun, 1 Sep 2019 13:14:46 +0000 (15:14 +0200)]
Optimize bandwidth and memory usage of item stats networking

2 weeks agoIf the local player is dead, don't apply chase camera opacity changes
Mario [Sun, 1 Sep 2019 12:51:50 +0000 (22:51 +1000)]
If the local player is dead, don't apply chase camera opacity changes

2 weeks agoFix item stats networking by refactoring algorithm that sends item stats
terencehill [Sun, 1 Sep 2019 08:41:06 +0000 (10:41 +0200)]
Fix item stats networking by refactoring algorithm that sends item stats

2 weeks agoSimplify normal_or_gentle macro
terencehill [Sun, 1 Sep 2019 08:38:22 +0000 (10:38 +0200)]
Simplify normal_or_gentle macro

2 weeks 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

2 weeks 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

2 weeks 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)

2 weeks 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)

2 weeks 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)

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

2 weeks 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"

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

2 weeks 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

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

2 weeks 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)

2 weeks 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

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

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

2 weeks agoupdate hash
Martin Taibr [Thu, 29 Aug 2019 23:58:15 +0000 (01:58 +0200)]
update hash

2 weeks agoMG solpen 63 in XPM
Martin Taibr [Thu, 29 Aug 2019 23:49:48 +0000 (01:49 +0200)]
MG solpen 63 in XPM

2 weeks agoMerge branch 'master' into martin-t/mg-solidpen
Martin Taibr [Thu, 29 Aug 2019 23:48:17 +0000 (01:48 +0200)]
Merge branch 'master' into martin-t/mg-solidpen

2 weeks 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)

2 weeks 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

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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

3 weeks 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"

3 weeks 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

3 weeks 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