]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
22 months agoAdd missing teamplay logic to winnerteam comparison
z411 [Mon, 30 Jan 2023 11:17:17 +0000 (08:17 -0300)]
Add missing teamplay logic to winnerteam comparison

22 months agoWait until relative announcing merge
z411 [Mon, 30 Jan 2023 11:05:05 +0000 (08:05 -0300)]
Wait until relative announcing merge

22 months agoAdd team scoring/lead announcing
z411 [Mon, 30 Jan 2023 10:41:47 +0000 (07:41 -0300)]
Add team scoring/lead announcing

2 years agoRemoving debugging information
z411 [Mon, 3 Oct 2022 04:13:14 +0000 (01:13 -0300)]
Removing debugging information

2 years agoUpdate notifications.cfg
z411 [Mon, 3 Oct 2022 03:24:39 +0000 (00:24 -0300)]
Update notifications.cfg

2 years agoFix test compilation units
z411 [Mon, 3 Oct 2022 00:45:22 +0000 (21:45 -0300)]
Fix test compilation units

2 years agoImplemented lead announcing
z411 [Sun, 2 Oct 2022 03:05:23 +0000 (00:05 -0300)]
Implemented lead announcing

2 years agoTransifex autosync
Rudolf Polzer [Sat, 1 Oct 2022 05:23:48 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't write notification count to file: it's useless and often causes merge conflicts
terencehill [Fri, 30 Sep 2022 23:02:25 +0000 (01:02 +0200)]
Don't write notification count to file: it's useless and often causes merge conflicts

2 years agoMerge branch 'bones_was_here/playernums' into 'master'
terencehill [Fri, 30 Sep 2022 13:55:08 +0000 (13:55 +0000)]
Merge branch 'bones_was_here/playernums' into 'master'

Automatic per-map min & max player limits, many warmup and player count and Welcome message things

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

2 years agoTransifex autosync
Rudolf Polzer [Fri, 30 Sep 2022 05:23:51 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 29 Sep 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoClean up welcome message newlines
bones_was_here [Mon, 26 Sep 2022 05:23:33 +0000 (15:23 +1000)]
Clean up welcome message newlines

2 years agoMake MOTD header fancier in welcome message
bones_was_here [Mon, 26 Sep 2022 05:23:23 +0000 (15:23 +1000)]
Make MOTD header fancier in welcome message

2 years agoUse a translatable chatcon notification for "Match is restarting..."
bones_was_here [Mon, 26 Sep 2022 05:23:20 +0000 (15:23 +1000)]
Use a translatable chatcon notification for "Match is restarting..."

2 years agog_warmup -1: abort countdown if player count falls too low
bones_was_here [Mon, 26 Sep 2022 05:23:16 +0000 (15:23 +1000)]
g_warmup -1: abort countdown if player count falls too low

Includes translatable chatcon + centreprint notification for this case.

2 years agoFix unnecessary inflation of g_warmup_majority_factor in some cases
bones_was_here [Mon, 26 Sep 2022 05:23:11 +0000 (15:23 +1000)]
Fix unnecessary inflation of g_warmup_majority_factor in some cases

For example with 10 players joined and g_warmup_majority_factor 0.8
the old code required 9 players to be ready, new code requires 8.
Behaviour is unchanged when joined players * factor is not an integer.

Also improve cvar description.

2 years agoImprove centreprint shown when max player limit blocks joining
bones_was_here [Mon, 26 Sep 2022 05:23:07 +0000 (15:23 +1000)]
Improve centreprint shown when max player limit blocks joining

2 years agoPrevent "Begin!" announcement & centreprint when returning to warmup
bones_was_here [Mon, 26 Sep 2022 05:23:02 +0000 (15:23 +1000)]
Prevent "Begin!" announcement & centreprint when returning to warmup

Applicable to ReadyRestart() / qc_cmd_sv resetmatch,
switching from unlimited to timed warmup (g_warmup -1),
and countdown abort (g_warmup -1).

2 years agoDisplay current and maximum player numbers on scoreboard
bones_was_here [Mon, 26 Sep 2022 05:22:57 +0000 (15:22 +1000)]
Display current and maximum player numbers on scoreboard

2 years agoTransifex autosync
Rudolf Polzer [Wed, 28 Sep 2022 05:23:45 +0000 (07:23 +0200)]
Transifex autosync

2 years agoRemove unnecessary client global shortmapname
bones_was_here [Mon, 26 Sep 2022 05:22:50 +0000 (15:22 +1000)]
Remove unnecessary client global shortmapname

2 years agoDisplay untimed Warmup or min players requirement (g_warmup -1) in HUD timer and...
bones_was_here [Tue, 27 Sep 2022 17:05:34 +0000 (03:05 +1000)]
Display untimed Warmup or min players requirement (g_warmup -1) in HUD timer and info panels

Adds numplayers client global as it will also be used in Scoreboard_Draw().

Slightly increases default timer panel width.

2 years agoDisplay map shortname and longname in welcome message
bones_was_here [Mon, 26 Sep 2022 05:22:33 +0000 (15:22 +1000)]
Display map shortname and longname in welcome message

2 years agoDisplay minplayers and maxplayers in welcome message
bones_was_here [Mon, 26 Sep 2022 05:22:05 +0000 (15:22 +1000)]
Display minplayers and maxplayers in welcome message

These are stored in globals as they will be read by HUD and scoreboard

2 years agoImplement automatic per-map min & max player limits
bones_was_here [Mon, 26 Sep 2022 05:21:58 +0000 (15:21 +1000)]
Implement automatic per-map min & max player limits

Enabled by g_warmup -1 and g_maxplayers -1 respectively.

Map settings are loaded from .sizes files
and are rounded to a multiple of the number of teams.
At the midpoint, min players is rounded down and max players is rounded up.
Neither can exceed engine maxplayers which is also rounded down if necessary.

g_warmup -1 means stay in warmup until enough players have joined,
then switch to g_warmup_limit and wait for ready players.
"Enough" has a lower limit of 2 or 2 * number of teams,
so this can be useful on maps with no set minimum.

2 years agoRemove AvailableTeams(), instead store team number in existing teamplay global
bones_was_here [Mon, 26 Sep 2022 05:21:46 +0000 (15:21 +1000)]
Remove AvailableTeams(), instead store team number in existing teamplay global

2 years agoFix inconsistent ReadyCount() calling logic
bones_was_here [Mon, 26 Sep 2022 05:21:33 +0000 (15:21 +1000)]
Fix inconsistent ReadyCount() calling logic

timeout_status was checked at only 1 call site,
and readiness changes during a timeout were sometimes ignored.

ReadyCount() was sometimes called when not in warmup.

2 years agoSeparate and improve MapReadSizes()
bones_was_here [Mon, 26 Sep 2022 05:21:19 +0000 (15:21 +1000)]
Separate and improve MapReadSizes()

Ensure maps with small minimum player count can be selected for voting
when player count is low or zero, even if their minimum would otherwise be
too high, to reduce chance of maplist fallback (which ignores sizes).
Setting (for example) every CTF map to min 4 and every DM map to min 2
is a viable config with this code.

Add g_maplist_sizes_specparty, reduces player count used when selecting
maps to allow for a consistent spectator population.

Better debugging messages.

2 years agoMisc cleanups for warmup and welcome message
bones_was_here [Mon, 26 Sep 2022 05:20:48 +0000 (15:20 +1000)]
Misc cleanups for warmup and welcome message

2 years agoTransifex autosync
Rudolf Polzer [Sun, 25 Sep 2022 05:24:18 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 24 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 22 Sep 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 20 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 19 Sep 2022 05:23:48 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'terencehill/shotgun_fixes' into 'master'
terencehill [Sun, 18 Sep 2022 20:24:20 +0000 (20:24 +0000)]
Merge branch 'terencehill/shotgun_fixes' into 'master'

Fix some shotgun bugs

Closes #2728

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

2 years agoTransifex autosync
Rudolf Polzer [Sun, 18 Sep 2022 05:24:20 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 17 Sep 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'terencehill/servers_quickmenu' into 'master'
terencehill [Fri, 16 Sep 2022 14:50:10 +0000 (14:50 +0000)]
Merge branch 'terencehill/servers_quickmenu' into 'master'

Custom server's quickmenu

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

2 years agoMake 2 strings translatable
terencehill [Fri, 16 Sep 2022 14:39:55 +0000 (16:39 +0200)]
Make 2 strings translatable

2 years agoSmooth v_deathtiltangle effect; don't apply v_deathtiltangle if cl_eventchase_death...
terencehill [Fri, 16 Sep 2022 10:58:01 +0000 (12:58 +0200)]
Smooth v_deathtiltangle effect; don't apply v_deathtiltangle if cl_eventchase_death is 2; avoid executing cl_rollangle code if cl_rollangle is 0

2 years agoTransifex autosync
Rudolf Polzer [Fri, 16 Sep 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 15 Sep 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'bones_was_here/font' into 'master'
terencehill [Tue, 13 Sep 2022 13:50:33 +0000 (13:50 +0000)]
Merge branch 'bones_was_here/font' into 'master'

Change default font hinting to 2, group font cvars better

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

2 years agoTransifex autosync
Rudolf Polzer [Mon, 12 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'Mario/nade_orb_overlay' into 'master'
terencehill [Sun, 11 Sep 2022 21:26:15 +0000 (21:26 +0000)]
Merge branch 'Mario/nade_orb_overlay' into 'master'

Merge branch Mario/nade_orb_overlay  (S merge request)

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

2 years agoTransifex autosync
Rudolf Polzer [Sun, 11 Sep 2022 05:24:14 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Wed, 7 Sep 2022 05:23:42 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 6 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 5 Sep 2022 05:23:42 +0000 (07:23 +0200)]
Transifex autosync

2 years agoLMS: fix visible leaders message appearing even when there are no leaders
terencehill [Wed, 31 Aug 2022 20:17:30 +0000 (22:17 +0200)]
LMS: fix visible leaders message appearing even when there are no leaders

2 years agoFix wrong projectile size used in W_Seeker_Fire_Missile
terencehill [Wed, 31 Aug 2022 20:08:51 +0000 (22:08 +0200)]
Fix wrong projectile size used in W_Seeker_Fire_Missile

2 years agoFix wrong cvar name in a cvar description
terencehill [Wed, 31 Aug 2022 20:06:18 +0000 (22:06 +0200)]
Fix wrong cvar name in a cvar description

2 years agoTransifex autosync
Rudolf Polzer [Wed, 31 Aug 2022 05:23:42 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sun, 28 Aug 2022 05:24:14 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 27 Aug 2022 05:23:40 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 26 Aug 2022 05:23:42 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 25 Aug 2022 05:23:42 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 23 Aug 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 22 Aug 2022 05:23:35 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 19 Aug 2022 05:23:28 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 18 Aug 2022 05:23:32 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Wed, 17 Aug 2022 05:23:32 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 16 Aug 2022 05:23:40 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 15 Aug 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 13 Aug 2022 05:23:37 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 12 Aug 2022 05:23:30 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 11 Aug 2022 05:23:31 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'bones_was_here/team_selection_compatibility' into 'master'
terencehill [Wed, 10 Aug 2022 12:58:00 +0000 (12:58 +0000)]
Merge branch 'bones_was_here/team_selection_compatibility' into 'master'

Fix team selection for 0.8.5 clients on current servers that use g_balance_teams 0

Closes #2729

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

2 years agoMerge branch 'Mario/ctf_colormaps' into 'master'
terencehill [Wed, 10 Aug 2022 12:56:16 +0000 (12:56 +0000)]
Merge branch 'Mario/ctf_colormaps' into 'master'

Merge branch Mario/ctf_colormaps (S merge request)

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

2 years agoTransifex autosync
Rudolf Polzer [Wed, 10 Aug 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync

2 years agoReloadable shotgun: fix primary fire triggering melee attack too if clip has some...
terencehill [Tue, 9 Aug 2022 13:33:11 +0000 (15:33 +0200)]
Reloadable shotgun: fix primary fire triggering melee attack too if clip has some ammo but player has none

Implementation notes:
- the first return was added to fix only the case where clip has exactly 1 bullet but player has none
- the second return was added for consistency's sake and avoids wasting a couple checks because if(WEP_CVAR(shotgun, secondary) == 1) will always return false

2 years agoReloadable shotgun: fix broken automatic switch to best weapon when out of ammo
terencehill [Tue, 9 Aug 2022 13:02:22 +0000 (15:02 +0200)]
Reloadable shotgun: fix broken automatic switch to best weapon when out of ammo

2 years agoReloadable shotgun: when clip is empty automatically reload regardless of whether...
terencehill [Mon, 8 Aug 2022 23:00:46 +0000 (01:00 +0200)]
Reloadable shotgun: when clip is empty automatically reload regardless of whether melee attack is available or not, and make sure player has some some ammo left

Note: WEP_CVAR(shotgun, secondary) < 2 check was wrong because it included secondary mode 0 where secondary attack is off

2 years agoTransifex autosync
Rudolf Polzer [Tue, 9 Aug 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 8 Aug 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMake scoreboard team selection on spacebar press work for old clients. While at it...
terencehill [Mon, 1 Aug 2022 23:23:54 +0000 (01:23 +0200)]
Make scoreboard team selection on spacebar press work for old clients. While at it give team selection aliases more consistent names

2 years agoTransifex autosync
Rudolf Polzer [Sun, 7 Aug 2022 05:24:01 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 6 Aug 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 5 Aug 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 4 Aug 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 1 Aug 2022 05:23:28 +0000 (07:23 +0200)]
Transifex autosync

2 years agoFix #2728 "Spectating a bot displays a "no ammo for shotgun slap but primary can...
terencehill [Sun, 31 Jul 2022 21:11:37 +0000 (23:11 +0200)]
Fix #2728 "Spectating a bot displays a "no ammo for shotgun slap but primary can fire" when they begin to slap but their target moves out of their reach"

Fixed by removing an ugly hack that reported insufficient ammo for melee attack and changing shotgun behaviour to no longer automatically turn attack1 into attack2 (melee) if bots are out of ammo

2 years agoTransifex autosync
Rudolf Polzer [Sun, 31 Jul 2022 05:24:01 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 29 Jul 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync

2 years agoFix #2727 "New esc-menu shouldn't open a standard settings page"
terencehill [Thu, 28 Jul 2022 09:01:34 +0000 (11:01 +0200)]
Fix #2727 "New esc-menu shouldn't open a standard settings page"

2 years agoTransifex autosync
Rudolf Polzer [Thu, 28 Jul 2022 05:23:23 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 26 Jul 2022 05:23:28 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 25 Jul 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't allow opening scoreboard UI / team selection in demos
terencehill [Sun, 24 Jul 2022 16:26:36 +0000 (18:26 +0200)]
Don't allow opening scoreboard UI / team selection in demos

2 years agoTransifex autosync
Rudolf Polzer [Sun, 24 Jul 2022 05:24:03 +0000 (07:24 +0200)]
Transifex autosync

2 years agoOops, forgot to commit changes of main.qc in the previous commit
terencehill [Sat, 23 Jul 2022 17:30:49 +0000 (19:30 +0200)]
Oops, forgot to commit changes of main.qc in the previous commit

2 years agoShow the team selection dialog on old servers
terencehill [Sat, 23 Jul 2022 16:55:16 +0000 (18:55 +0200)]
Show the team selection dialog on old servers

2 years agoMerge branch 'terencehill/scoreboard_ui' into 'master'
LegendaryGuard [Fri, 22 Jul 2022 17:11:04 +0000 (17:11 +0000)]
Merge branch 'terencehill/scoreboard_ui' into 'master'

Scoreboard UI and team selection

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

2 years agoTransifex autosync
Rudolf Polzer [Fri, 22 Jul 2022 05:23:36 +0000 (07:23 +0200)]
Transifex autosync

2 years agoFix #2722 "Voting endmatch during intermission will skip the next map and go into...
terencehill [Thu, 21 Jul 2022 23:35:05 +0000 (01:35 +0200)]
Fix #2722 "Voting endmatch during intermission will skip the next map and go into a random map"

2 years agoMerge branch 'terencehill/gotomap_fix' into 'master'
LegendaryGuard [Thu, 21 Jul 2022 14:09:13 +0000 (14:09 +0000)]
Merge branch 'terencehill/gotomap_fix' into 'master'

Fix #2718 "Online dedicated servers panic when gotomap is called during an intermission"

Closes #2718

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

2 years agoTransifex autosync
Rudolf Polzer [Thu, 21 Jul 2022 05:23:24 +0000 (07:23 +0200)]
Transifex autosync

2 years agoFix #2718 "Online dedicated servers panic when gotomap is called during an intermission"
terencehill [Wed, 20 Jul 2022 21:13:12 +0000 (23:13 +0200)]
Fix #2718 "Online dedicated servers panic when gotomap is called during an intermission"

2 years agoDisambiguate a parameter name in a few functions
terencehill [Tue, 19 Jul 2022 14:16:29 +0000 (16:16 +0200)]
Disambiguate a parameter name in a few functions