]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
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 agoTransifex autosync
Rudolf Polzer [Fri, 25 Mar 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync

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 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 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 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 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 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 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

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

2 years agoMake stepping up while jumping reliable
bones_was_here [Fri, 18 Mar 2022 18:04:06 +0000 (18:04 +0000)]
Make stepping up while jumping reliable

2 years agomake demoseeking options non-persisted
ferreum [Fri, 18 Mar 2022 15:15:04 +0000 (16:15 +0100)]
make demoseeking options non-persisted

2 years agoAdd NearestPointOnBoundingBox (copy of WarpZoneLib_NearestPointOnBox) as shared funct...
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

2 years agoFix #2672 "Projectile damage unreliability regarding projectile size and rotation"
terencehill [Fri, 18 Mar 2022 07:45:22 +0000 (08:45 +0100)]
Fix #2672 "Projectile damage unreliability regarding projectile size and rotation"

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

2 years agoPrevent players moving too far/fast when stepping up a staircase
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

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

2 years agoMerge branch 'morosophos/xdf-speed-cfg-fix' into 'master'
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

2 years agoXDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg
Morosophos [Thu, 17 Mar 2022 17:19:15 +0000 (17:19 +0000)]
XDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg

2 years agoShow the Game menu dialog by pressing ESC instead of F11
terencehill [Mon, 14 Mar 2022 14:36:39 +0000 (15:36 +0100)]
Show the Game menu dialog by pressing ESC instead of F11

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

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

2 years agoSmall cleanup
terencehill [Mon, 14 Mar 2022 17:14:52 +0000 (18:14 +0100)]
Small cleanup

2 years agoGame menu dialog: add Servers button
terencehill [Mon, 14 Mar 2022 14:31:19 +0000 (15:31 +0100)]
Game menu dialog: add Servers button

2 years agoFix compilation units
terencehill [Sun, 13 Mar 2022 23:18:14 +0000 (00:18 +0100)]
Fix compilation units

2 years agoAdd a small Menu game dialog that can be opened with F11
terencehill [Sun, 13 Mar 2022 19:08:56 +0000 (20:08 +0100)]
Add a small Menu game dialog that can be opened with F11

2 years agoAdd isServerSingleplayer
terencehill [Sun, 13 Mar 2022 13:41:58 +0000 (14:41 +0100)]
Add isServerSingleplayer

2 years agoMerge branch 'master' into terencehill/menu_quit_game
terencehill [Sun, 13 Mar 2022 11:07:14 +0000 (12:07 +0100)]
Merge branch 'master' into terencehill/menu_quit_game

2 years agoRemove an unused field; make it clear with a comment that cvars starting with "_...
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

2 years agoSlightly optimize Spawn Near Teammate code mainly for readability
terencehill [Sun, 13 Mar 2022 10:53:30 +0000 (11:53 +0100)]
Slightly optimize Spawn Near Teammate code mainly for readability

2 years agoFix compilation units
terencehill [Sun, 13 Mar 2022 01:17:00 +0000 (02:17 +0100)]
Fix compilation units

2 years agoSmall cleanups
terencehill [Sat, 12 Mar 2022 22:59:31 +0000 (23:59 +0100)]
Small cleanups

2 years agoDisplay the welcome message as centerprint message in demos since menu dialogs can...
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

2 years agoImplement reliable detection of the Welcome dialog availability
terencehill [Sat, 12 Mar 2022 14:16:44 +0000 (15:16 +0100)]
Implement reliable detection of the Welcome dialog availability

2 years agocl_welcome_in_menu_dialog 1 "1: show the welcome message in a dedicated menu dialog...
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"

2 years agoDon't show the Welcome dialog in the campaign, centerprint level description works...
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

2 years agoBind i to menu_showwelcomedialog
terencehill [Thu, 10 Mar 2022 23:41:07 +0000 (00:41 +0100)]
Bind i to menu_showwelcomedialog

2 years agoAllow closing the Welcome dialog with Enter and Space
terencehill [Thu, 10 Mar 2022 23:25:40 +0000 (00:25 +0100)]
Allow closing the Welcome dialog with Enter and Space

2 years agoClose the centerprint welcome message too when closing the welcome dialog
terencehill [Thu, 10 Mar 2022 20:41:29 +0000 (21:41 +0100)]
Close the centerprint welcome message too when closing the welcome dialog

2 years agoShow a welcome window with MOTD on server connection
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

2 years agoRemove redundant quotes in a name in the credits
terencehill [Wed, 9 Mar 2022 16:29:48 +0000 (17:29 +0100)]
Remove redundant quotes in a name in the credits

2 years agoAllow exporting menu credits to data/data/credits.txt with the menu_credits_export...
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

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

2 years agoFix double "5 minutes remaining" announcement if timelimit is <= 5 on map start and...
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

2 years agoMake the timer turn red at 1:00, not 0:59 seconds remaining
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

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

2 years agoFade in centerprint messages that last less than 2 seconds (with default setting...
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)

2 years agoMove out of hud skins some personal centerprint settings
terencehill [Mon, 7 Mar 2022 14:08:53 +0000 (15:08 +0100)]
Move out of hud skins some personal centerprint settings

2 years agoStop countdown to timeout start if timeout was aborted with timein
terencehill [Mon, 7 Mar 2022 13:16:02 +0000 (14:16 +0100)]
Stop countdown to timeout start if timeout was aborted with timein

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

2 years agoFix powerup sound not stopped on disconnection and becoming observer
terencehill [Sun, 6 Mar 2022 16:20:22 +0000 (17:20 +0100)]
Fix powerup sound not stopped on disconnection and becoming observer

2 years agoFix powerup sound not stopped on death if powerup was given with the give command
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

2 years agoTransifex autosync
Rudolf Polzer [Sun, 6 Mar 2022 06:24:05 +0000 (07:24 +0100)]
Transifex autosync

2 years agoTimer panel: fix timeout check and whitespace
terencehill [Sun, 6 Mar 2022 01:47:28 +0000 (02:47 +0100)]
Timer panel: fix timeout check and whitespace

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

2 years agoCentered timer on luminos minimal skin
z411 [Sun, 6 Mar 2022 00:53:04 +0000 (21:53 -0300)]
Centered timer on luminos minimal skin

2 years agoOptimize process_time(2, x) to use half the number of strcat calls and compact code...
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

2 years agoAligned timer dimensions to grid
z411 [Sat, 5 Mar 2022 18:55:46 +0000 (15:55 -0300)]
Aligned timer dimensions to grid

2 years agoDon't show "0 seconds" in human readable time format, unless time is 0
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

2 years agoAdd subtimer vertical padding
z411 [Fri, 4 Mar 2022 21:47:55 +0000 (18:47 -0300)]
Add subtimer vertical padding

2 years agoUsing a separate global to keep track of overtime phase
z411 [Fri, 4 Mar 2022 21:28:59 +0000 (18:28 -0300)]
Using a separate global to keep track of overtime phase

2 years agoNot setting overtimes to -1 in suddendeath
z411 [Thu, 3 Mar 2022 19:12:05 +0000 (16:12 -0300)]
Not setting overtimes to -1 in suddendeath

2 years agoExecute TRANSMUTE(Observer, this); slightly earlier in PutObserverInServer (no functi...
terencehill [Thu, 3 Mar 2022 14:01:15 +0000 (15:01 +0100)]
Execute TRANSMUTE(Observer, this); slightly earlier in PutObserverInServer (no functional change)