]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
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 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 978/head
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)

2 years agoMerge branch 'z411/ready_improvements' into 'master'
terencehill [Thu, 3 Mar 2022 07:57:32 +0000 (07:57 +0000)]
Merge branch 'z411/ready_improvements' into 'master'

Improvements for Ready system in warmup

See merge request xonotic/xonotic-data.pk3dir!966

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

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

2 years agoAdjust smoke position of tuba and alternative instruments
terencehill [Tue, 1 Mar 2022 18:07:20 +0000 (19:07 +0100)]
Adjust smoke position of tuba and alternative instruments

2 years agoFixed typo and standardized function names
z411 [Tue, 1 Mar 2022 13:06:30 +0000 (10:06 -0300)]
Fixed typo and standardized function names

2 years agocmd setbots: add more than one bot at once.
Rudolf Polzer [Tue, 1 Mar 2022 03:31:54 +0000 (22:31 -0500)]
cmd setbots: add more than one bot at once.

We now have logic to normally only add one bot per frame. This is all nice,
but breaks the Xonotic Bot Orchestra.

So, let's make it so that the XBO has special privileges to spawn more than
one bot per frame; in normal gameplay bot spawns remain spaced out.

2 years agoFix but where sudden death could remove timelimit accidentally when ReadyRestarting
z411 [Tue, 1 Mar 2022 03:09:38 +0000 (00:09 -0300)]
Fix but where sudden death could remove timelimit accidentally when ReadyRestarting

2 years agoRefactored time calculation in timer
z411 [Tue, 1 Mar 2022 03:08:29 +0000 (00:08 -0300)]
Refactored time calculation in timer

2 years agoRemoved intermission from timer subtext
z411 [Tue, 1 Mar 2022 02:42:28 +0000 (23:42 -0300)]
Removed intermission from timer subtext

2 years agoAvoid changing timelimit in the endmatch alias so that the timer shows the correct...
terencehill [Mon, 28 Feb 2022 22:26:50 +0000 (23:26 +0100)]
Avoid changing timelimit in the endmatch alias so that the timer shows the correct elapsed / remaining time

2 years agoTransifex autosync
Rudolf Polzer [Mon, 28 Feb 2022 06:23:22 +0000 (07:23 +0100)]
Transifex autosync

2 years agoFixed intermission freeze for secondary timer
z411 [Mon, 28 Feb 2022 04:50:02 +0000 (01:50 -0300)]
Fixed intermission freeze for secondary timer

2 years agoFixed compilation units
z411 [Sun, 27 Feb 2022 20:52:43 +0000 (17:52 -0300)]
Fixed compilation units

2 years agoFixed bug where swapped timer wouldn't show anything in non round-based modes
z411 [Sun, 27 Feb 2022 20:27:36 +0000 (17:27 -0300)]
Fixed bug where swapped timer wouldn't show anything in non round-based modes

2 years agoAdded secondary timer to menu
z411 [Sun, 27 Feb 2022 20:25:24 +0000 (17:25 -0300)]
Added secondary timer to menu

2 years agoUsing GAME_STOPPED to freeze the round timer
z411 [Sun, 27 Feb 2022 18:56:02 +0000 (15:56 -0300)]
Using GAME_STOPPED to freeze the round timer

2 years agoTransifex autosync
Rudolf Polzer [Sun, 27 Feb 2022 06:24:04 +0000 (07:24 +0100)]
Transifex autosync

2 years agoCA: don't show "Press space to join" to eliminated players
terencehill [Fri, 25 Feb 2022 23:01:04 +0000 (00:01 +0100)]
CA: don't show "Press space to join" to eliminated players

2 years agoMerge branch 'z411/hide_invalid_ranks' into 'master'
terencehill [Wed, 23 Feb 2022 17:31:48 +0000 (17:31 +0000)]
Merge branch 'z411/hide_invalid_ranks' into 'master'

Show invalid ranks as N/A

Closes #2604

See merge request xonotic/xonotic-data.pk3dir!982

2 years agoMerge branch 'terencehill/observer_spawnpoint' into 'master'
terencehill [Wed, 23 Feb 2022 17:15:20 +0000 (17:15 +0000)]
Merge branch 'terencehill/observer_spawnpoint' into 'master'

When switching from spectator to observer don't place the camera in a random spawnpoint

See merge request xonotic/xonotic-data.pk3dir!979

2 years agoChange overtimes and timeout status to int
z411 [Tue, 22 Feb 2022 03:01:03 +0000 (00:01 -0300)]
Change overtimes and timeout status to int

2 years agoRemove a debug print
terencehill [Mon, 21 Feb 2022 23:17:19 +0000 (00:17 +0100)]
Remove a debug print

2 years agoMerge branch 'DefaultUser/ToS_2' into 'master'
terencehill [Mon, 21 Feb 2022 23:02:34 +0000 (23:02 +0000)]
Merge branch 'DefaultUser/ToS_2' into 'master'

Minor improvements to the ToS system

See merge request xonotic/xonotic-data.pk3dir!981

2 years agoShow invalid ranks as N/A 982/head
z411 [Mon, 21 Feb 2022 22:35:32 +0000 (19:35 -0300)]
Show invalid ranks as N/A

2 years agoLMS: Remove "^1Match has already begun" hud message, spectators now can freely join...
terencehill [Mon, 21 Feb 2022 13:42:17 +0000 (14:42 +0100)]
LMS: Remove "^1Match has already begun" hud message, spectators now can freely join when the match has already begun

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

2 years agoAdjusted skins to make room for new timer
z411 [Sat, 19 Feb 2022 21:11:37 +0000 (18:11 -0300)]
Adjusted skins to make room for new timer

2 years agoAdd cvar to show or hide secondary timer, and to show it swapped
z411 [Sat, 19 Feb 2022 20:55:26 +0000 (17:55 -0300)]
Add cvar to show or hide secondary timer, and to show it swapped

2 years agoMerge branch 'bones_was_here/imagejank' into 'master'
terencehill [Sat, 19 Feb 2022 17:57:42 +0000 (17:57 +0000)]
Merge branch 'bones_was_here/imagejank' into 'master'

Work around imagemagick regression that puts everything upside down

See merge request xonotic/xonotic-data.pk3dir!980

2 years agoAdd sv_termsofservice_url to xonotic-server.cfg 981/head
Freddy [Sat, 19 Feb 2022 13:54:16 +0000 (14:54 +0100)]
Add sv_termsofservice_url to xonotic-server.cfg

2 years agoRemove an old debug logging
Freddy [Sat, 19 Feb 2022 13:51:08 +0000 (14:51 +0100)]
Remove an old debug logging

2 years agoToS: only load Xonotic ToS when actually needed
Freddy [Sat, 19 Feb 2022 13:50:17 +0000 (14:50 +0100)]
ToS: only load Xonotic ToS when actually needed

2 years agoWork around imagemagick regression that puts everything upside down 980/head
bones_was_here [Sat, 19 Feb 2022 11:02:12 +0000 (21:02 +1000)]
Work around imagemagick regression that puts everything upside down

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

2 years agoKA: assign time points every second (rather than every g_keepaway_score_timeinterval...
terencehill [Wed, 16 Feb 2022 17:11:05 +0000 (18:11 +0100)]
KA: assign time points every second (rather than every g_keepaway_score_timeinterval seconds) but divide points by g_keepaway_score_timeinterval so to assign the same score as before. Make sure time points are never assigned as float.

2 years agoMove code adding score as int to a dedicated function that can be used by other game...
terencehill [Wed, 16 Feb 2022 16:52:48 +0000 (17:52 +0100)]
Move code adding score as int to a dedicated function that can be used by other game modes

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

2 years agoCA: refactor damage scoring code to avoid initializing ca_damage_counter to something...
terencehill [Tue, 15 Feb 2022 22:39:47 +0000 (23:39 +0100)]
CA: refactor damage scoring code to avoid initializing ca_damage_counter to something != 0

2 years agoCA: fix scoring bug where players with negative scores have one point more
terencehill [Tue, 15 Feb 2022 13:44:52 +0000 (14:44 +0100)]
CA: fix  scoring bug where players with negative scores have one point more

2 years agoImplement #2662 "Remove inability to use waypoints when the round is about to start...
terencehill [Sat, 12 Feb 2022 21:26:11 +0000 (22:26 +0100)]
Implement #2662 "Remove inability to use waypoints when the round is about to start". Allow cheat impulses too and forbid weapon reload. Since only a few impulses are now forbidden, turn impulse whitelist into a blacklist.

2 years agoWhen switching from spectator to observer don't place the camera in a random spawnpoi... 979/head
terencehill [Thu, 10 Feb 2022 22:35:22 +0000 (23:35 +0100)]
When switching from spectator to observer don't place the camera in a random spawnpoint but keep it in its current location so you don't lose sight of the spectated player

2 years agoMake timer subtext green
z411 [Thu, 10 Feb 2022 23:38:19 +0000 (20:38 -0300)]
Make timer subtext green

2 years agoFix 2 typos in mutators.cfg, slightly optimize the SetSpectatee code
terencehill [Thu, 10 Feb 2022 22:19:52 +0000 (23:19 +0100)]
Fix 2 typos in mutators.cfg, slightly optimize the SetSpectatee code

2 years agoMerge branch 'terencehill/replicatevars_enhancements' into 'master'
terencehill [Thu, 10 Feb 2022 11:55:12 +0000 (11:55 +0000)]
Merge branch 'terencehill/replicatevars_enhancements' into 'master'

ReplicateVars API improvements

See merge request xonotic/xonotic-data.pk3dir!964

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

2 years agoUse timer color for secondary timer too
z411 [Thu, 10 Feb 2022 02:29:55 +0000 (23:29 -0300)]
Use timer color for secondary timer too

2 years agoMerge branch 'master' into terencehill/replicatevars_enhancements 964/head
terencehill [Thu, 10 Feb 2022 01:21:11 +0000 (02:21 +0100)]
Merge branch 'master' into terencehill/replicatevars_enhancements

2 years agoREPLICATE_FIELD -> REPLICATE_INIT
terencehill [Thu, 10 Feb 2022 01:20:39 +0000 (02:20 +0100)]
REPLICATE_FIELD -> REPLICATE_INIT

2 years agoMerge branch 'master' into z411/new_timer
z411 [Wed, 9 Feb 2022 19:54:41 +0000 (16:54 -0300)]
Merge branch 'master' into z411/new_timer

2 years agoAdd sudden death to timer
z411 [Wed, 9 Feb 2022 19:43:38 +0000 (16:43 -0300)]
Add sudden death to timer

2 years agoAdjusting default timer sizes
z411 [Wed, 9 Feb 2022 19:43:22 +0000 (16:43 -0300)]
Adjusting default timer sizes

2 years agoAdded timeout subtext
z411 [Wed, 9 Feb 2022 19:18:37 +0000 (16:18 -0300)]
Added timeout subtext

2 years agoDon't reset bindmap on connection, no longer needed since the map vote selection...
terencehill [Tue, 8 Feb 2022 17:21:51 +0000 (18:21 +0100)]
Don't reset bindmap on connection, no longer needed since the map vote selection system doesn't set alternative bindmaps

2 years agoImplement secondary timer and subtext
z411 [Mon, 7 Feb 2022 22:36:41 +0000 (19:36 -0300)]
Implement secondary timer and subtext

2 years agoMerge branch 'drjaska/timerbounding' into 'master'
terencehill [Mon, 7 Feb 2022 18:30:17 +0000 (18:30 +0000)]
Merge branch 'drjaska/timerbounding' into 'master'

cvar to unbind both timer increment styles

See merge request xonotic/xonotic-data.pk3dir!976

2 years agocvar to unbind both timer increment styles
Dr. Jaska [Mon, 7 Feb 2022 18:30:17 +0000 (18:30 +0000)]
cvar to unbind both timer increment styles

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

2 years agoMerge branch 'terencehill/seconds_tostring'
terencehill [Sun, 6 Feb 2022 15:03:52 +0000 (16:03 +0100)]
Merge branch 'terencehill/seconds_tostring'

2 years agoRename mmssss to mmssth and mmsss to mmsst, more correct and easier to tell them...
terencehill [Sun, 6 Feb 2022 14:51:50 +0000 (15:51 +0100)]
Rename mmssss to mmssth and mmsss to mmsst, more correct and easier to tell them apart

2 years agoMerge mmsss and mmssss code into a new function called clockedtime_tostring
terencehill [Sun, 6 Feb 2022 14:29:29 +0000 (15:29 +0100)]
Merge mmsss and mmssss code into a new function called clockedtime_tostring

2 years agoAllow seconds_tostring to work with a negative number of seconds
terencehill [Sun, 6 Feb 2022 11:43:38 +0000 (12:43 +0100)]
Allow seconds_tostring to work with a negative number of seconds

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

2 years agoMerge branch 'z411/fix_resetmatch_scores' into 'master'
terencehill [Sat, 5 Feb 2022 11:47:39 +0000 (11:47 +0000)]
Merge branch 'z411/fix_resetmatch_scores' into 'master'

Fixes scores not being reset in resetmatch warmup if sv_ready_restart_after_countdown is 1

See merge request xonotic/xonotic-data.pk3dir!969

2 years agoFixes scores not being reset in resetmatch warmup if sv_ready_restart_after_countdown...
z411 [Sat, 5 Feb 2022 11:47:38 +0000 (11:47 +0000)]
Fixes scores not being reset in resetmatch warmup if sv_ready_restart_after_countdown is 1

2 years agoMerge branch 'terencehill/chat_maximized_scrollable' into 'master'
terencehill [Sat, 5 Feb 2022 11:06:03 +0000 (11:06 +0000)]
Merge branch 'terencehill/chat_maximized_scrollable' into 'master'

Allow scrolling the maximized chat history by pressing mouse wheel up/down

See merge request xonotic/xonotic-data.pk3dir!974

2 years agoMerge branch 'Juhu/lmsrot' into 'master'
terencehill [Sat, 5 Feb 2022 11:01:52 +0000 (11:01 +0000)]
Merge branch 'Juhu/lmsrot' into 'master'

Allow rot and regeneration to be enabled individually in LMS

Closes #2555

See merge request xonotic/xonotic-data.pk3dir!972

2 years agoAllow rot and regeneration to be enabled individually in LMS
Juhu [Sat, 5 Feb 2022 11:01:52 +0000 (11:01 +0000)]
Allow rot and regeneration to be enabled individually in LMS

2 years agoMerge branch 'z411/fix_nostats' into 'master'
terencehill [Sat, 5 Feb 2022 10:38:57 +0000 (10:38 +0000)]
Merge branch 'z411/fix_nostats' into 'master'

Fixes serverlist displaying Jeff icon when server has stats disabled

See merge request xonotic/xonotic-data.pk3dir!977

2 years agoRevert "Display noisy ready message in chat instead of console" 966/head
z411 [Fri, 4 Feb 2022 18:27:53 +0000 (15:27 -0300)]
Revert "Display noisy ready message in chat instead of console"

This reverts commit 6267ad78b67a155381b455da96e988b5f156ce12.

2 years agoFixes serverlist displaying Jeff icon when server has stats disabled 977/head
z411 [Fri, 4 Feb 2022 17:35:37 +0000 (14:35 -0300)]
Fixes serverlist displaying Jeff icon when server has stats disabled

2 years agoAuto skill: clarify bot skill down / up messages; print debug messages in a single...
terencehill [Fri, 4 Feb 2022 10:50:39 +0000 (11:50 +0100)]
Auto skill: clarify bot skill down / up messages; print debug messages in a single line as it was originally meant to be

2 years agoFix #2651 "12th campaign level is incompleteable with recent LMS non-forced join...
terencehill [Fri, 4 Feb 2022 10:03:26 +0000 (11:03 +0100)]
Fix #2651 "12th campaign level is incompleteable with recent LMS non-forced join changes and with default g_start_delay being 0"

2 years agoTransifex autosync
Rudolf Polzer [Fri, 4 Feb 2022 06:23:20 +0000 (07:23 +0100)]
Transifex autosync

2 years agoUpdate credits to include the new extended team members
Mario [Fri, 4 Feb 2022 02:43:31 +0000 (12:43 +1000)]
Update credits to include the new extended team members