]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
2 years agoMerge branch 'master' into terencehill/welcome_dialog_translatable
terencehill [Fri, 8 Apr 2022 12:37:02 +0000 (14:37 +0200)]
Merge branch 'master' into terencehill/welcome_dialog_translatable

2 years agoAdd some comments, fix wrong name of a constant
terencehill [Fri, 1 Apr 2022 13:04:10 +0000 (15:04 +0200)]
Add some comments, fix wrong name of a constant

2 years agoTransifex autosync
Rudolf Polzer [Wed, 6 Apr 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't send the welcome message twice on connection. This change also fixes the welcom...
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

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

2 years agoFix #2681 "pressing ESC during a demo no longer brings up menu"
terencehill [Mon, 4 Apr 2022 22:33:04 +0000 (00:33 +0200)]
Fix #2681 "pressing ESC during a demo no longer brings up menu"

2 years agoMerge branch 'bones_was_here/subtlebloom' into 'master'
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

2 years agoMerge branch 'terencehill/menu_quit_confirmation' into 'master'
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

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

2 years agoFix g_race_qualifying type assignments. Make "???" (missing campaign title) not trans...
terencehill [Sun, 3 Apr 2022 19:56:27 +0000 (21:56 +0200)]
Fix g_race_qualifying type assignments. Make "???" (missing campaign title) not translatable

2 years agoSmall race_SendTime cleanup. XonStats: make sure latency stat isn't negative (can...
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)

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

2 years agoIn the Game menu dialog on Quit press show the confirmation dialog in order to avoid...
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.

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

2 years agoFix #2679 for real
terencehill [Fri, 1 Apr 2022 22:32:02 +0000 (00:32 +0200)]
Fix #2679 for real

2 years agoFix #2679 "Campaign levels behave like if you're creating and playing generic Multipl...
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

2 years agoImprove client side weapon arena options parsing
terencehill [Fri, 1 Apr 2022 13:02:38 +0000 (15:02 +0200)]
Improve client side weapon arena options parsing

2 years agoMerge branch 'z411/revert_resetvote' into 'master'
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

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

2 years agoFix a few mutator names
terencehill [Thu, 31 Mar 2022 23:51:16 +0000 (01:51 +0200)]
Fix a few mutator names

2 years agoFix gameplay tips appearing even if the relative mutators aren't enabled by implement...
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

2 years agoMerge branch 'master' into terencehill/welcome_dialog_translatable
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

2 years agoGame menu dialog: add more space between the Quit button and other buttons to reduce...
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

2 years agoAllow closing the Welcome dialog by clicking anywhere outside of it
terencehill [Thu, 31 Mar 2022 14:58:43 +0000 (16:58 +0200)]
Allow closing the Welcome dialog by clicking anywhere outside of it

2 years agoRevert buggy implementation of sending the welcome message only once on connection
terencehill [Thu, 31 Mar 2022 13:05:08 +0000 (15:05 +0200)]
Revert buggy implementation of sending the welcome message only once on connection

2 years agoSend the welcome message together with the gametype on connection in order to avoid...
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

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

2 years agoRevert "Make vcall restart do a resetmatch instead"
z411 [Thu, 31 Mar 2022 01:58:09 +0000 (22:58 -0300)]
Revert "Make vcall restart do a resetmatch instead"

This reverts commit 02dcc36e026ecad5a6d8ee74f52bc5403cb35ae6.

2 years agoGroup Fx binds in binds-xonotic.cfg
terencehill [Wed, 30 Mar 2022 13:08:06 +0000 (15:08 +0200)]
Group Fx binds in binds-xonotic.cfg

2 years agoRestore white tos text in the server info dialog too
terencehill [Wed, 30 Mar 2022 12:58:56 +0000 (14:58 +0200)]
Restore white tos text in the server info dialog too

2 years agoMove _menu_welcome_dialog_available initialization to XonoticWelcomeDialog_fill ...
terencehill [Wed, 30 Mar 2022 12:54:34 +0000 (14:54 +0200)]
Move _menu_welcome_dialog_available initialization to XonoticWelcomeDialog_fill (no functional change)

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

2 years agoMerge branch 'z411/new_centerprint' into 'master'
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

2 years agoMerge branch 'terencehill/menu_quit_game' into 'master'
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

2 years agor_bloom: less extreme default settings
bones_was_here [Mon, 28 Mar 2022 14:52:20 +0000 (00:52 +1000)]
r_bloom: less extreme default settings

2 years agoRename a button
terencehill [Mon, 28 Mar 2022 15:36:10 +0000 (17:36 +0200)]
Rename a button

2 years agoMerge branch 'master' into terencehill/menu_quit_game
terencehill [Mon, 28 Mar 2022 15:14:35 +0000 (17:14 +0200)]
Merge branch 'master' into terencehill/menu_quit_game

2 years agoMerge branch 'terencehill/welcome_dialog_simple' into 'master'
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

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

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

2 years agoForbid setting sudden death overtime when the game ends
terencehill [Sat, 26 Mar 2022 22:28:31 +0000 (23:28 +0100)]
Forbid setting sudden death overtime when the game ends

2 years agoFix indentation
terencehill [Sat, 26 Mar 2022 22:19:44 +0000 (23:19 +0100)]
Fix indentation

2 years agoMerge branch 'bones_was_here/pipeline' into 'master'
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

2 years agoRestore white tos text
terencehill [Sat, 26 Mar 2022 14:28:18 +0000 (15:28 +0100)]
Restore white tos text

2 years agoMake it "Gametype:" like another existing translatable string in the Serverinfo dialo...
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

2 years agoShow the Welcome dialog in the campaign too
terencehill [Sat, 26 Mar 2022 10:48:01 +0000 (11:48 +0100)]
Show the Welcome dialog in the campaign too

2 years agoImprove a few strings
terencehill [Sat, 26 Mar 2022 10:44:40 +0000 (11:44 +0100)]
Improve a few strings

2 years agoMerge branch 'master' into terencehill/welcome_dialog_simple
terencehill [Sat, 26 Mar 2022 09:33:54 +0000 (10:33 +0100)]
Merge branch 'master' into terencehill/welcome_dialog_simple

2 years agoTransifex autosync
Rudolf Polzer [Sat, 26 Mar 2022 06:23:20 +0000 (07:23 +0100)]
Transifex autosync

2 years agoDisplay client binds in gameplay tips
terencehill [Fri, 25 Mar 2022 17:28:47 +0000 (18:28 +0100)]
Display client binds in gameplay tips

2 years agoAllow translating gameplay tips (ported them from server to client)
terencehill [Fri, 25 Mar 2022 16:55:33 +0000 (17:55 +0100)]
Allow translating gameplay tips (ported them from server to client)

2 years agoDo not translate "Dev All Weapons Arena"
terencehill [Fri, 25 Mar 2022 13:58:13 +0000 (14:58 +0100)]
Do not translate "Dev All Weapons Arena"

2 years agoTransifex autosync
Rudolf Polzer [Fri, 25 Mar 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync

2 years agoAllow translating version message
terencehill [Thu, 24 Mar 2022 22:47:43 +0000 (23:47 +0100)]
Allow translating version message

2 years agoMerge branch 'z411/new_timer_fix' into 'master'
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

2 years agoAllow translating active modifications in the Welcome message
terencehill [Thu, 24 Mar 2022 19:08:18 +0000 (20:08 +0100)]
Allow translating active modifications in the Welcome message

2 years agoShow "No weapons" if no valid weapon can be found in g_weaponarena
terencehill [Thu, 24 Mar 2022 17:55:33 +0000 (18:55 +0100)]
Show "No weapons" if no valid weapon can be found in g_weaponarena

2 years agopipeline: don't complain about lack of zip program and git tags
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

2 years agoFixed timer in unlimited warmup
z411 [Thu, 24 Mar 2022 04:26:33 +0000 (01:26 -0300)]
Fixed timer in unlimited warmup

2 years agoRevert "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.

2 years agoFixed timer in unlimited warmup
z411 [Thu, 24 Mar 2022 04:24:39 +0000 (01:24 -0300)]
Fixed timer in unlimited warmup

2 years agoTransifex autosync
Rudolf Polzer [Wed, 23 Mar 2022 06:23:21 +0000 (07:23 +0100)]
Transifex autosync

2 years agoWelcome message: fix broken version check by giving the client time to send its versi...
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)

2 years agoPartially build the Welcome message in client code, allowing translating some parts...
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

2 years agoTransifex autosync
Rudolf Polzer [Tue, 22 Mar 2022 06:23:25 +0000 (07:23 +0100)]
Transifex autosync

2 years agoCenter "vs" in centerprint title in duel
z411 [Tue, 22 Mar 2022 05:05:13 +0000 (02:05 -0300)]
Center "vs" in centerprint title in duel

2 years agoClose the menu calling team_auto (F6 key) to get rid of the Welcome dialog
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

2 years agoMerge branch 'ferreum/demoseeking-overhaul' into 'master'
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

2 years agoantilag.qc: fix indenting
bones_was_here [Mon, 21 Mar 2022 17:28:15 +0000 (03:28 +1000)]
antilag.qc: fix indenting

2 years agopipeline: use make jobserver to run 3 compilationunits.sh in parallel
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

2 years agopipeline: merge test_sv_unit into test_sv_game
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.

2 years agopipeline: optimise builds and stop ASAP if any fail
bones_was_here [Mon, 21 Mar 2022 14:36:57 +0000 (00:36 +1000)]
pipeline: optimise builds and stop ASAP if any fail

2 years agoUsing proper centerprint title spacing
z411 [Mon, 21 Mar 2022 18:58:31 +0000 (15:58 -0300)]
Using proper centerprint title spacing

2 years agopipeline: fail if notifications.cfg is outdated
bones_was_here [Mon, 21 Mar 2022 12:58:41 +0000 (22:58 +1000)]
pipeline: fail if notifications.cfg is outdated

2 years agoMerge branch 'bones_was_here/lms_specwarn' into 'master'
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

2 years agoLMS: add a centreprint for the spectate warning
bones_was_here [Sun, 20 Mar 2022 09:02:17 +0000 (19:02 +1000)]
LMS: add a centreprint for the spectate warning

2 years agoTransifex autosync
Rudolf Polzer [Mon, 21 Mar 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync

2 years agoMerge branch 'terencehill/LMS_forfeits_end_match' into 'master'
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

2 years agoLMS: end the game if after 30s less than 2 players remain due to forfeits
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

2 years agoMerge branch 'terencehill/full_damage_fix' into 'master'
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

2 years agoUpdate hash
terencehill [Sun, 20 Mar 2022 16:52:58 +0000 (17:52 +0100)]
Update hash

2 years agoReduce MIN_DAMAGEEXTRARADIUS because radius was increased by projectile size in a8f331de
terencehill [Sun, 20 Mar 2022 16:44:51 +0000 (17:44 +0100)]
Reduce MIN_DAMAGEEXTRARADIUS because radius was increased by projectile size in a8f331de

2 years agoOffset Resource hook args to avoid conflicts as much as possible with other hooks
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

2 years agoFix instagib bug where ammo pickups give nothing if the player has no ammo. This...
terencehill [Sun, 20 Mar 2022 13:29:00 +0000 (14:29 +0100)]
Fix instagib bug where ammo pickups give nothing if the player has no ammo. This bug was introduced by 6d997e7e when M_ARGV(1, float) was changed to M_ARGV(1, entity) in *Resource functions

2 years agoTransifex autosync
Rudolf Polzer [Sun, 20 Mar 2022 06:23:56 +0000 (07:23 +0100)]
Transifex autosync

2 years agoShow player names in centerprint title in 1v1 games
z411 [Sun, 20 Mar 2022 03:57:30 +0000 (00:57 -0300)]
Show player names in centerprint title in 1v1 games

2 years agoMerge branch 'master' into z411/new_centerprint
z411 [Sun, 20 Mar 2022 03:30:29 +0000 (00:30 -0300)]
Merge branch 'master' into z411/new_centerprint

2 years agoGet rid of Duel gametype checks in client code
terencehill [Sun, 20 Mar 2022 03:10:15 +0000 (04:10 +0100)]
Get rid of Duel gametype checks in client code

2 years agoUsing CCR to process centerprint titles
z411 [Sun, 20 Mar 2022 00:20:02 +0000 (21:20 -0300)]
Using CCR to process centerprint titles

2 years agoFlipped centerprint title fix
z411 [Sun, 20 Mar 2022 00:15:00 +0000 (21:15 -0300)]
Flipped centerprint title fix

2 years agoFixed centerprint title testing
z411 [Sat, 19 Mar 2022 23:58:46 +0000 (20:58 -0300)]
Fixed centerprint title testing

2 years agoUsing proper BOLD operator and separating untranslatable lines
z411 [Sat, 19 Mar 2022 23:52:07 +0000 (20:52 -0300)]
Using proper BOLD operator and separating untranslatable lines

2 years agoRemoving short fade in cvar - we really never want fade in for counts
z411 [Sat, 19 Mar 2022 23:35:19 +0000 (20:35 -0300)]
Removing short fade in cvar - we really never want fade in for counts

2 years agoMake centerprint base fontsize slightly bigger
z411 [Sat, 19 Mar 2022 23:30:58 +0000 (20:30 -0300)]
Make centerprint base fontsize slightly bigger

2 years agoFix powerdown sound being played in instagib on death; also compact play_countdown...
terencehill [Sat, 19 Mar 2022 21:57:44 +0000 (22:57 +0100)]
Fix powerdown sound being played in instagib on death; also compact play_countdown code

2 years agoRemove duplicate bind
terencehill [Sat, 19 Mar 2022 11:38:39 +0000 (12:38 +0100)]
Remove duplicate bind

2 years agoHUD editor: find keys for toggleconsole only when needed
terencehill [Sat, 19 Mar 2022 11:35:31 +0000 (12:35 +0100)]
HUD editor: find keys for toggleconsole only when needed

2 years agoFix #2675 "Quickmenu closes when navigated by mouse"
terencehill [Sat, 19 Mar 2022 11:21:19 +0000 (12:21 +0100)]
Fix #2675 "Quickmenu closes when navigated by mouse"

2 years agoMerge branch 'master' into terencehill/full_damage_fix
terencehill [Fri, 18 Mar 2022 22:30:13 +0000 (23:30 +0100)]
Merge branch 'master' into terencehill/full_damage_fix

2 years agoRefactor edgedamage calculation to be clearer and fix a bug where projectiles with...
terencehill [Fri, 18 Mar 2022 21:43:01 +0000 (22:43 +0100)]
Refactor edgedamage calculation to be clearer and fix a bug where projectiles with damage radius 0 could potentially cause damage even if player is not hit