]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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
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
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
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
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
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
Rudolf Polzer [Sun, 20 Mar 2022 06:23:56 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sun, 20 Mar 2022 03:10:15 +0000 (04:10 +0100)]
Get rid of Duel gametype checks in client code
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
terencehill [Sat, 19 Mar 2022 11:38:39 +0000 (12:38 +0100)]
Remove duplicate bind
terencehill [Sat, 19 Mar 2022 11:35:31 +0000 (12:35 +0100)]
HUD editor: find keys for toggleconsole only when needed
terencehill [Sat, 19 Mar 2022 11:21:19 +0000 (12:21 +0100)]
Fix #2675 "Quickmenu closes when navigated by mouse"
terencehill [Fri, 18 Mar 2022 22:30:13 +0000 (23:30 +0100)]
Merge branch 'master' into terencehill/full_damage_fix
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
bones_was_here [Fri, 18 Mar 2022 18:04:06 +0000 (18:04 +0000)]
Merge branch 'bones_was_here/stepup_reliability' into 'master'
Make stepping up while jumping reliable
Closes #2643
See merge request xonotic/xonotic-data.pk3dir!936
bones_was_here [Fri, 18 Mar 2022 18:04:06 +0000 (18:04 +0000)]
Make stepping up while jumping reliable
ferreum [Fri, 18 Mar 2022 15:15:04 +0000 (16:15 +0100)]
make demoseeking options non-persisted
terencehill [Fri, 18 Mar 2022 13:50:33 +0000 (14:50 +0100)]
Add NearestPointOnBoundingBox (copy of WarpZoneLib_NearestPointOnBox) as shared function to be used outside the warpzone lib code
terencehill [Fri, 18 Mar 2022 07:45:22 +0000 (08:45 +0100)]
Fix #2672 "Projectile damage unreliability regarding projectile size and rotation"
bones_was_here [Thu, 17 Mar 2022 18:17:46 +0000 (18:17 +0000)]
Merge branch 'bones_was_here/stepup_distance' into 'master'
Prevent players moving too far/fast when stepping up a staircase
Closes #2586
See merge request xonotic/xonotic-data.pk3dir!935
bones_was_here [Thu, 17 Mar 2022 18:17:46 +0000 (18:17 +0000)]
Prevent players moving too far/fast when stepping up a staircase
bones_was_here [Thu, 17 Mar 2022 17:24:17 +0000 (17:24 +0000)]
Merge branch 'bones_was_here/doxygen' into 'master'
Doxygen: more complete and useful config
See merge request xonotic/xonotic-data.pk3dir!963
bones_was_here [Thu, 17 Mar 2022 17:19:16 +0000 (17:19 +0000)]
Merge branch 'morosophos/xdf-speed-cfg-fix' into 'master'
XDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg
See merge request xonotic/xonotic-data.pk3dir!973
Morosophos [Thu, 17 Mar 2022 17:19:15 +0000 (17:19 +0000)]
XDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg
terencehill [Mon, 14 Mar 2022 14:36:39 +0000 (15:36 +0100)]
Show the Game menu dialog by pressing ESC instead of F11
Rudolf Polzer [Thu, 17 Mar 2022 06:23:23 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Wed, 16 Mar 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Mon, 14 Mar 2022 17:14:52 +0000 (18:14 +0100)]
Small cleanup
terencehill [Mon, 14 Mar 2022 14:31:19 +0000 (15:31 +0100)]
Game menu dialog: add Servers button
terencehill [Sun, 13 Mar 2022 23:18:14 +0000 (00:18 +0100)]
Fix compilation units
terencehill [Sun, 13 Mar 2022 19:08:56 +0000 (20:08 +0100)]
Add a small Menu game dialog that can be opened with F11
terencehill [Sun, 13 Mar 2022 13:41:58 +0000 (14:41 +0100)]
Add isServerSingleplayer
terencehill [Sun, 13 Mar 2022 11:07:14 +0000 (12:07 +0100)]
Merge branch 'master' into terencehill/menu_quit_game
terencehill [Sun, 13 Mar 2022 10:58:44 +0000 (11:58 +0100)]
Remove an unused field; make it clear with a comment that cvars starting with "_" are excluded in the cvar list dialog
terencehill [Sun, 13 Mar 2022 10:53:30 +0000 (11:53 +0100)]
Slightly optimize Spawn Near Teammate code mainly for readability
terencehill [Sun, 13 Mar 2022 01:17:00 +0000 (02:17 +0100)]
Fix compilation units
terencehill [Sat, 12 Mar 2022 22:59:31 +0000 (23:59 +0100)]
Small cleanups
terencehill [Sat, 12 Mar 2022 14:28:41 +0000 (15:28 +0100)]
Display the welcome message as centerprint message in demos since menu dialogs can't be displayed
terencehill [Sat, 12 Mar 2022 14:16:44 +0000 (15:16 +0100)]
Implement reliable detection of the Welcome dialog availability
terencehill [Fri, 11 Mar 2022 20:39:33 +0000 (21:39 +0100)]
cl_welcome_in_menu_dialog 1 "1: show the welcome message in a dedicated menu dialog; 0: show it as a centerprint message"
terencehill [Fri, 11 Mar 2022 00:22:14 +0000 (01:22 +0100)]
Don't show the Welcome dialog in the campaign, centerprint level description works best here
terencehill [Thu, 10 Mar 2022 23:41:07 +0000 (00:41 +0100)]
Bind i to menu_showwelcomedialog
terencehill [Thu, 10 Mar 2022 23:25:40 +0000 (00:25 +0100)]
Allow closing the Welcome dialog with Enter and Space
terencehill [Thu, 10 Mar 2022 20:41:29 +0000 (21:41 +0100)]
Close the centerprint welcome message too when closing the welcome dialog
terencehill [Thu, 10 Mar 2022 10:51:33 +0000 (11:51 +0100)]
Show a welcome window with MOTD on server connection
Usual welcome message not removed for compatibility with previous Xonotic versions
terencehill [Wed, 9 Mar 2022 16:29:48 +0000 (17:29 +0100)]
Remove redundant quotes in a name in the credits
terencehill [Wed, 9 Mar 2022 16:14:36 +0000 (17:14 +0100)]
Allow exporting menu credits to data/data/credits.txt with the menu_credits_export alias
Rudolf Polzer [Wed, 9 Mar 2022 06:23:36 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Tue, 8 Mar 2022 20:48:12 +0000 (21:48 +0100)]
Fix double "5 minutes remaining" announcement if timelimit is <= 5 on map start and fix missing announcements after a resetmatch if warmup is enabled
terencehill [Tue, 8 Mar 2022 20:40:07 +0000 (21:40 +0100)]
Make the timer turn red at 1:00, not 0:59 seconds remaining
Rudolf Polzer [Tue, 8 Mar 2022 06:23:29 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Mon, 7 Mar 2022 14:29:28 +0000 (15:29 +0100)]
Fade in centerprint messages that last less than 2 seconds (with default setting only countdown messages last less than 2 seconds)
terencehill [Mon, 7 Mar 2022 14:08:53 +0000 (15:08 +0100)]
Move out of hud skins some personal centerprint settings
terencehill [Mon, 7 Mar 2022 13:16:02 +0000 (14:16 +0100)]
Stop countdown to timeout start if timeout was aborted with timein
Rudolf Polzer [Mon, 7 Mar 2022 06:23:26 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sun, 6 Mar 2022 16:20:22 +0000 (17:20 +0100)]
Fix powerup sound not stopped on disconnection and becoming observer
terencehill [Sun, 6 Mar 2022 16:01:29 +0000 (17:01 +0100)]
Fix powerup sound not stopped on death if powerup was given with the give command
Rudolf Polzer [Sun, 6 Mar 2022 06:24:05 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Sun, 6 Mar 2022 01:47:28 +0000 (02:47 +0100)]
Timer panel: fix timeout check and whitespace
terencehill [Sun, 6 Mar 2022 01:09:13 +0000 (01:09 +0000)]
Merge branch 'z411/new_timer' into 'master'
New timer with secondary round timer and sub text indicating game phase
Closes #2636
See merge request xonotic/xonotic-data.pk3dir!978
z411 [Sun, 6 Mar 2022 00:53:04 +0000 (21:53 -0300)]
Centered timer on luminos minimal skin
terencehill [Sat, 5 Mar 2022 19:15:53 +0000 (20:15 +0100)]
Optimize process_time(2, x) to use half the number of strcat calls and compact code thanks to a macro
z411 [Sat, 5 Mar 2022 18:55:46 +0000 (15:55 -0300)]
Aligned timer dimensions to grid
terencehill [Sat, 5 Mar 2022 18:38:44 +0000 (19:38 +0100)]
Don't show "0 seconds" in human readable time format, unless time is 0
z411 [Fri, 4 Mar 2022 21:47:55 +0000 (18:47 -0300)]
Add subtimer vertical padding
z411 [Fri, 4 Mar 2022 21:28:59 +0000 (18:28 -0300)]
Using a separate global to keep track of overtime phase