]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Wed, 13 Apr 2022 11:42:42 +0000 (13:42 +0200)]
Remove cvar default value from a tooltip. Add some comments to make clear what PlayerScore_Clear and SetPlayerTeam do
bones_was_here [Wed, 13 Apr 2022 06:30:38 +0000 (06:30 +0000)]
Merge branch 'terencehill/campaign_restart_level' into 'master'
Minor campaign improvements
See merge request xonotic/xonotic-data.pk3dir!1009
bones_was_here [Wed, 13 Apr 2022 06:29:51 +0000 (06:29 +0000)]
Merge branch 'drjaska/run-genmod' into 'master'
updated _mod. files with qcsrc\tools\genmod.sh shell script
See merge request xonotic/xonotic-data.pk3dir!1006
bones_was_here [Wed, 13 Apr 2022 06:29:17 +0000 (06:29 +0000)]
Merge branch 'z411/duel_center' into 'master'
Calculate centerprint title offset in real time in duel
See merge request xonotic/xonotic-data.pk3dir!1007
z411 [Wed, 13 Apr 2022 06:29:16 +0000 (06:29 +0000)]
Calculate centerprint title offset in real time in duel
Rudolf Polzer [Wed, 13 Apr 2022 05:23:21 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 12 Apr 2022 17:28:07 +0000 (17:28 +0000)]
Merge branch 'terencehill/welcome_dialog_translatable' into 'master'
Make the Welcome message translatable
Closes #2217
See merge request xonotic/xonotic-data.pk3dir!1000
terencehill [Tue, 12 Apr 2022 17:22:18 +0000 (19:22 +0200)]
Fix compilation units
terencehill [Tue, 12 Apr 2022 17:11:20 +0000 (19:11 +0200)]
Merge branch 'master' into terencehill/welcome_dialog_translatable
terencehill [Tue, 12 Apr 2022 16:40:39 +0000 (18:40 +0200)]
Campaign: replace the "Join!" button with a "Restart level" button in the game menu to allow a quick level restart
terencehill [Tue, 12 Apr 2022 16:36:18 +0000 (18:36 +0200)]
Campaign: reset the match on join so that timer is cleared and a nice 3 second countdown show up
terencehill [Tue, 12 Apr 2022 16:32:11 +0000 (18:32 +0200)]
Campaign: make work resetmatch without entering warmup (if enabled in the server)
Rudolf Polzer [Tue, 12 Apr 2022 05:23:31 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 11 Apr 2022 22:30:40 +0000 (00:30 +0200)]
Remove a few useless comments from CSQC_UpdateView. Move scoreboard_pos declaration to the correct file
drjaska [Mon, 11 Apr 2022 19:03:32 +0000 (22:03 +0300)]
updated mod. files with qcsrc\tools\genmod.sh shell script
It seemed to remove 1 resources mention, maybe a deleted file?
2 entries got relocated to their alphabetical place
terencehill [Mon, 11 Apr 2022 17:18:33 +0000 (19:18 +0200)]
Fix centerprint Welcome message displayed together with the Welcome dialog when a local client connects to a local dedicated server
terencehill [Mon, 11 Apr 2022 17:07:30 +0000 (19:07 +0200)]
Fix this Welcome dialog bug: "If I start up with +map boil then it appears, but when i close it, the old centreprint appears instead and can't be closed except by joining the match."
terencehill [Mon, 11 Apr 2022 17:01:14 +0000 (19:01 +0200)]
Fix missing Welcome dialog when a local client connects to a local dedicated server
Rudolf Polzer [Mon, 11 Apr 2022 05:24:24 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Sun, 10 Apr 2022 21:18:32 +0000 (23:18 +0200)]
Quickmenu: make sure player team info is updated before showing a player list
terencehill [Sun, 10 Apr 2022 21:15:11 +0000 (23:15 +0200)]
Allow color codes in the Welcome message title (hostname)
terencehill [Sun, 10 Apr 2022 21:13:39 +0000 (23:13 +0200)]
Fix #2684 "The welcome dialog randomly fails to appear"
This commit partially reverts
47d309fd (only the "Don't send the welcome message twice on connection." part, the remaining part is implemented in a different way)
Rudolf Polzer [Sun, 10 Apr 2022 05:24:01 +0000 (07:24 +0200)]
Transifex autosync
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
terencehill [Fri, 8 Apr 2022 12:37:02 +0000 (14:37 +0200)]
Merge branch 'master' into terencehill/welcome_dialog_translatable
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
terencehill [Fri, 1 Apr 2022 13:04:10 +0000 (15:04 +0200)]
Add some comments, fix wrong name of a constant
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
terencehill [Fri, 1 Apr 2022 13:02:38 +0000 (15:02 +0200)]
Improve client side weapon arena options parsing
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 23:51:16 +0000 (01:51 +0200)]
Fix a few mutator names
terencehill [Thu, 31 Mar 2022 23:06:20 +0000 (01:06 +0200)]
Fix gameplay tips appearing even if the relative mutators aren't enabled by implementing a system to detect active mutators in client and menu code
terencehill [Thu, 31 Mar 2022 16:32:53 +0000 (18:32 +0200)]
Merge branch 'master' into terencehill/welcome_dialog_translatable
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/server/client.qc
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