]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sat, 9 Apr 2022 11:49:21 +0000 (11:49 +0000)]
Merge branch 'drjaska/mayhemicons' into 'master'
Mayhem and Team Mayhem gamemode icons for all 4 themes.
See merge request xonotic/xonotic-data.pk3dir!999
terencehill [Sat, 9 Apr 2022 10:20:32 +0000 (10:20 +0000)]
Merge branch 'bones_was_here/jlhooks' into 'master'
Call a hook when the server player count changes to or from zero
See merge request xonotic/xonotic-data.pk3dir!1005
terencehill [Sat, 9 Apr 2022 10:16:09 +0000 (10:16 +0000)]
Merge branch 'z411/centerprint_fix' into 'master'
Fixes a few new centerprint issues
Closes #2678
See merge request xonotic/xonotic-data.pk3dir!1001
z411 [Sat, 9 Apr 2022 01:22:10 +0000 (21:22 -0400)]
Avoid running UpdatePlayerTeams twice per frame
z411 [Fri, 8 Apr 2022 22:20:02 +0000 (18:20 -0400)]
Make "vs" easier to translate
terencehill [Fri, 8 Apr 2022 20:13:13 +0000 (20:13 +0000)]
Merge branch 'bones_was_here/netsettings' into 'master'
menu: misc settings polishing
See merge request xonotic/xonotic-data.pk3dir!996
bones_was_here [Fri, 8 Apr 2022 18:53:11 +0000 (18:53 +0000)]
Merge branch 'bones_was_here/lightsettings' into 'master'
menu: improve lighting settings
See merge request xonotic/xonotic-data.pk3dir!994
bones_was_here [Fri, 8 Apr 2022 18:51:44 +0000 (18:51 +0000)]
Merge branch 'bones_was_here/chkupd' into 'master'
Update how xonotic.org services are accessed
See merge request xonotic/xonotic-data.pk3dir!995
bones_was_here [Fri, 8 Apr 2022 18:51:30 +0000 (18:51 +0000)]
Merge branch 'bones_was_here/vidsettings' into 'master'
menu: video settings polishing
See merge request xonotic/xonotic-data.pk3dir!997
terencehill [Fri, 8 Apr 2022 15:01:56 +0000 (17:01 +0200)]
Rearrange code to avoid redundant checks
terencehill [Fri, 8 Apr 2022 14:45:55 +0000 (16:45 +0200)]
Fix #2682 "Bad welcome dialog's backwards compatibility"; behaviour of the welcome message key is slightly different in old servers: on key press it shows the message for 2 seconds and then hides it
Rudolf Polzer [Fri, 8 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Fri, 8 Apr 2022 00:22:48 +0000 (00:22 +0000)]
Merge branch 'Spike29/credits_update' into 'master'
Update the credits
See merge request xonotic/xonotic-data.pk3dir!1003
SpiKe [Fri, 8 Apr 2022 00:22:47 +0000 (00:22 +0000)]
Update the credits
bones_was_here [Wed, 30 Mar 2022 04:30:26 +0000 (14:30 +1000)]
menu: misc settings polishing
Improved layout and labelling
Removed cl_port as it's for very rare corner cases
Removed cl_movement as nobody should disable it, but sometimes people
did by accident or without understanding the effect,
also https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2549
Added cl_netrepeatinput as this compensation has a cost and hides issues
Modernised speed limit options (should not imply xonotic supports 56k)
Removed 30fps from cl_maxfps options
Added 40fps cl_minfps option, fixes "Custom" being displayed by default
Added an Apply button for the `developer` setting
Rudolf Polzer [Thu, 7 Apr 2022 05:23:23 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sat, 2 Apr 2022 07:40:46 +0000 (17:40 +1000)]
Call a hook when the server player count changes to or from zero
bones_was_here [Wed, 6 Apr 2022 07:04:58 +0000 (17:04 +1000)]
menu: video settings: add support for GL32 renderer (DP master)
It uses viewscale for antialiasing, instead of vid_samples
bones_was_here [Wed, 6 Apr 2022 06:55:11 +0000 (16:55 +1000)]
menu: video settings polishing
Adjusts layout and vsync description
Removes obsolete gl_vbo from menu and changes default to 1
This should be 1 on all usable hardware, 3 was to support certain
fixed function GPUs with buggy drivers.
The GL32 renderer always uses 1 (cvar is removed).
Rudolf Polzer [Wed, 6 Apr 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 5 Apr 2022 14:11:40 +0000 (16:11 +0200)]
Don't send the welcome message twice on connection. This change also fixes the welcome message being displayed in Race when the qualifying session is over and the race starts
Rudolf Polzer [Tue, 5 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 4 Apr 2022 22:33:04 +0000 (00:33 +0200)]
Fix #2681 "pressing ESC during a demo no longer brings up menu"
z411 [Mon, 4 Apr 2022 21:10:09 +0000 (17:10 -0400)]
Fixed string management of duel title
z411 [Mon, 4 Apr 2022 20:00:25 +0000 (16:00 -0400)]
Use strcpy for centerprint title
terencehill [Mon, 4 Apr 2022 14:26:19 +0000 (14:26 +0000)]
Merge branch 'bones_was_here/subtlebloom' into 'master'
r_bloom: less extreme default settings
See merge request xonotic/xonotic-data.pk3dir!992
terencehill [Mon, 4 Apr 2022 14:25:17 +0000 (14:25 +0000)]
Merge branch 'terencehill/menu_quit_confirmation' into 'master'
Confirmation dialog on Quit press from the Game menu dialog
See merge request xonotic/xonotic-data.pk3dir!1002
Rudolf Polzer [Mon, 4 Apr 2022 05:23:24 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 3 Apr 2022 19:56:27 +0000 (21:56 +0200)]
Fix g_race_qualifying type assignments. Make "???" (missing campaign title) not translatable
terencehill [Sun, 3 Apr 2022 19:51:34 +0000 (21:51 +0200)]
Small race_SendTime cleanup. XonStats: make sure latency stat isn't negative (can be slightly lower than 0 in local games due to precision errors)
Rudolf Polzer [Sun, 3 Apr 2022 05:24:15 +0000 (07:24 +0200)]
Transifex autosync
z411 [Sat, 2 Apr 2022 22:43:42 +0000 (19:43 -0300)]
Update duel title when players change in countdown
z411 [Sat, 2 Apr 2022 21:27:41 +0000 (18:27 -0300)]
Making centerprint font slightly smaller
terencehill [Sat, 2 Apr 2022 12:42:46 +0000 (14:42 +0200)]
In the Game menu dialog on Quit press show the confirmation dialog in order to avoid quitting the game by mistake. Restore the old Quit dialog without the Leave match button, no longer needed since it's present in the Game menu dialog.
Rudolf Polzer [Sat, 2 Apr 2022 05:23:21 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 1 Apr 2022 22:32:02 +0000 (00:32 +0200)]
Fix #2679 for real
z411 [Fri, 1 Apr 2022 22:25:30 +0000 (19:25 -0300)]
Clear title when starting a round based match
z411 [Fri, 1 Apr 2022 22:20:52 +0000 (19:20 -0300)]
Fixes countdown centerprints not getting killed
terencehill [Fri, 1 Apr 2022 17:58:55 +0000 (19:58 +0200)]
Fix #2679 "Campaign levels behave like if you're creating and playing generic Multiplayer match locally"
Previous code worked fine on DP master though
bones_was_here [Fri, 1 Apr 2022 10:21:24 +0000 (10:21 +0000)]
Merge branch 'z411/revert_resetvote' into 'master'
Revert "Make vcall restart do a resetmatch instead"
See merge request xonotic/xonotic-data.pk3dir!998
Rudolf Polzer [Fri, 1 Apr 2022 05:23:23 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Thu, 31 Mar 2022 15:22:37 +0000 (17:22 +0200)]
Game menu dialog: add more space between the Quit button and other buttons to reduce chances of clicking on it by mistake
terencehill [Thu, 31 Mar 2022 14:58:43 +0000 (16:58 +0200)]
Allow closing the Welcome dialog by clicking anywhere outside of it
terencehill [Thu, 31 Mar 2022 13:05:08 +0000 (15:05 +0200)]
Revert buggy implementation of sending the welcome message only once on connection
drjaska [Sun, 7 Mar 2021 19:18:10 +0000 (21:18 +0200)]
Added gamemode icons for all 4 themes.
terencehill [Thu, 31 Mar 2022 09:56:53 +0000 (11:56 +0200)]
Send the welcome message together with the gametype on connection in order to avoid printing it when gametype hasn't received yet
Rudolf Polzer [Thu, 31 Mar 2022 05:23:24 +0000 (07:23 +0200)]
Transifex autosync
z411 [Thu, 31 Mar 2022 01:58:09 +0000 (22:58 -0300)]
Revert "Make vcall restart do a resetmatch instead"
This reverts commit
02dcc36e026ecad5a6d8ee74f52bc5403cb35ae6 .
terencehill [Wed, 30 Mar 2022 13:08:06 +0000 (15:08 +0200)]
Group Fx binds in binds-xonotic.cfg
terencehill [Wed, 30 Mar 2022 12:58:56 +0000 (14:58 +0200)]
Restore white tos text in the server info dialog too
terencehill [Wed, 30 Mar 2022 12:54:34 +0000 (14:54 +0200)]
Move _menu_welcome_dialog_available initialization to XonoticWelcomeDialog_fill (no functional change)
bones_was_here [Tue, 29 Mar 2022 22:19:12 +0000 (08:19 +1000)]
Use https to access xonotic.org services
bones_was_here [Sun, 2 Jan 2022 01:18:01 +0000 (11:18 +1000)]
Simplify updateCheck()
Rudolf Polzer [Tue, 29 Mar 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Tue, 29 Mar 2022 02:35:42 +0000 (12:35 +1000)]
menu: improve lighting settings
Makes the UI more closely represent the implementation
Clarifies descriptions
Adds corona brightness adjustment (previously it was just on/off)
Saves some vertical space
bones_was_here [Mon, 28 Mar 2022 21:27:19 +0000 (21:27 +0000)]
Merge branch 'z411/new_centerprint' into 'master'
Centerprint overhaul
See merge request xonotic/xonotic-data.pk3dir!984
bones_was_here [Mon, 28 Mar 2022 18:41:15 +0000 (18:41 +0000)]
Merge branch 'terencehill/menu_quit_game' into 'master'
Add a button to properly quit the campaign, a "Game menu" (on ESC) and remove the Disconnect dialogue
See merge request xonotic/xonotic-data.pk3dir!900
bones_was_here [Mon, 28 Mar 2022 14:52:20 +0000 (00:52 +1000)]
r_bloom: less extreme default settings
terencehill [Mon, 28 Mar 2022 15:36:10 +0000 (17:36 +0200)]
Rename a button
terencehill [Mon, 28 Mar 2022 15:14:35 +0000 (17:14 +0200)]
Merge branch 'master' into terencehill/menu_quit_game
bones_was_here [Mon, 28 Mar 2022 10:31:15 +0000 (10:31 +0000)]
Merge branch 'terencehill/welcome_dialog_simple' into 'master'
Welcome dialog
See merge request xonotic/xonotic-data.pk3dir!985
Rudolf Polzer [Mon, 28 Mar 2022 05:23:23 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sun, 27 Mar 2022 05:24:08 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Sat, 26 Mar 2022 22:28:31 +0000 (23:28 +0100)]
Forbid setting sudden death overtime when the game ends
terencehill [Sat, 26 Mar 2022 22:19:44 +0000 (23:19 +0100)]
Fix indentation
terencehill [Sat, 26 Mar 2022 15:37:19 +0000 (15:37 +0000)]
Merge branch 'bones_was_here/pipeline' into 'master'
gitlab CI pipeline optimisations
See merge request xonotic/xonotic-data.pk3dir!988
terencehill [Sat, 26 Mar 2022 14:28:18 +0000 (15:28 +0100)]
Restore white tos text
terencehill [Sat, 26 Mar 2022 14:27:39 +0000 (15:27 +0100)]
Make it "Gametype:" like another existing translatable string in the Serverinfo dialog. Rename TE_CSQC_SERVERINFO to TE_CSQC_SERVERWELCOME to remove ambiguity
terencehill [Sat, 26 Mar 2022 10:48:01 +0000 (11:48 +0100)]
Show the Welcome dialog in the campaign too
terencehill [Sat, 26 Mar 2022 10:44:40 +0000 (11:44 +0100)]
Improve a few strings
terencehill [Sat, 26 Mar 2022 09:33:54 +0000 (10:33 +0100)]
Merge branch 'master' into terencehill/welcome_dialog_simple
Rudolf Polzer [Sat, 26 Mar 2022 06:23:20 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Fri, 25 Mar 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync
bones_was_here [Thu, 24 Mar 2022 20:11:29 +0000 (20:11 +0000)]
Merge branch 'z411/new_timer_fix' into 'master'
Fixed timer in unlimited warmup
Closes #2676
See merge request xonotic/xonotic-data.pk3dir!989
bones_was_here [Thu, 24 Mar 2022 12:02:34 +0000 (22:02 +1000)]
pipeline: don't complain about lack of zip program and git tags
we don't want to fetch the tags or install a zip program as it would be
slow and not useful
z411 [Thu, 24 Mar 2022 04:26:33 +0000 (01:26 -0300)]
Fixed timer in unlimited warmup
z411 [Thu, 24 Mar 2022 04:26:13 +0000 (01:26 -0300)]
Revert "Fixed timer in unlimited warmup"
This reverts commit
488cf5c88f686df4aacc41fbdaf5b73ff57c74c9 .
z411 [Thu, 24 Mar 2022 04:24:39 +0000 (01:24 -0300)]
Fixed timer in unlimited warmup
Rudolf Polzer [Wed, 23 Mar 2022 06:23:21 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Wed, 23 Mar 2022 02:23:14 +0000 (03:23 +0100)]
Welcome message: fix broken version check by giving the client time to send its version. This change also allows getting the gametype name from the gametype entity instead of receiving it from the server (and gametype name is now translatable)
terencehill [Tue, 22 Mar 2022 23:11:57 +0000 (00:11 +0100)]
Partially build the Welcome message in client code, allowing translating some parts of it
Rudolf Polzer [Tue, 22 Mar 2022 06:23:25 +0000 (07:23 +0100)]
Transifex autosync
z411 [Tue, 22 Mar 2022 05:05:13 +0000 (02:05 -0300)]
Center "vs" in centerprint title in duel
terencehill [Mon, 21 Mar 2022 22:33:43 +0000 (23:33 +0100)]
Close the menu calling team_auto (F6 key) to get rid of the Welcome dialog
bones_was_here [Mon, 21 Mar 2022 21:31:59 +0000 (21:31 +0000)]
Merge branch 'ferreum/demoseeking-overhaul' into 'master'
Fix many issues with input-demoseeking.cfg
See merge request xonotic/xonotic-data.pk3dir!959
bones_was_here [Mon, 21 Mar 2022 17:28:15 +0000 (03:28 +1000)]
antilag.qc: fix indenting
bones_was_here [Mon, 21 Mar 2022 15:21:08 +0000 (01:21 +1000)]
pipeline: use make jobserver to run 3 compilationunits.sh in parallel
compilationunits.sh has 3 main tasks, one for each progs.
They were run sequentially without making use of multi threading.
Also make clean now removes the temp files created by compilationunits.sh
bones_was_here [Mon, 21 Mar 2022 15:09:22 +0000 (01:09 +1000)]
pipeline: merge test_sv_unit into test_sv_game
The test only takes a few seconds including engine startup,
most of the time was used in preparing the environment and
compiling the same binaries as used in test_sv_game.
Also removed a bashism for robustness.
bones_was_here [Mon, 21 Mar 2022 14:36:57 +0000 (00:36 +1000)]
pipeline: optimise builds and stop ASAP if any fail
z411 [Mon, 21 Mar 2022 18:58:31 +0000 (15:58 -0300)]
Using proper centerprint title spacing
bones_was_here [Mon, 21 Mar 2022 12:58:41 +0000 (22:58 +1000)]
pipeline: fail if notifications.cfg is outdated
terencehill [Mon, 21 Mar 2022 11:07:49 +0000 (11:07 +0000)]
Merge branch 'bones_was_here/lms_specwarn' into 'master'
LMS: add a centreprint for the spectate warning
See merge request xonotic/xonotic-data.pk3dir!987
bones_was_here [Sun, 20 Mar 2022 09:02:17 +0000 (19:02 +1000)]
LMS: add a centreprint for the spectate warning
Rudolf Polzer [Mon, 21 Mar 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync
bones_was_here [Sun, 20 Mar 2022 20:15:36 +0000 (20:15 +0000)]
Merge branch 'terencehill/LMS_forfeits_end_match' into 'master'
Fix forfeits do not end the match in LMS
Closes #2647
See merge request xonotic/xonotic-data.pk3dir!983
terencehill [Sun, 20 Mar 2022 20:15:36 +0000 (20:15 +0000)]
LMS: end the game if after 30s less than 2 players remain due to forfeits
terencehill [Sun, 20 Mar 2022 17:07:52 +0000 (17:07 +0000)]
Merge branch 'terencehill/full_damage_fix' into 'master'
Fix 3 minor issues with damage calculation
Closes #2406 and #2672
See merge request xonotic/xonotic-data.pk3dir!986
terencehill [Sun, 20 Mar 2022 16:52:58 +0000 (17:52 +0100)]
Update hash
terencehill [Sun, 20 Mar 2022 16:44:51 +0000 (17:44 +0100)]
Reduce MIN_DAMAGEEXTRARADIUS because radius was increased by projectile size in
a8f331de
terencehill [Sun, 20 Mar 2022 15:27:35 +0000 (16:27 +0100)]
Offset Resource hook args to avoid conflicts as much as possible with other hooks