]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
drjaska [Thu, 17 Mar 2022 19:27:17 +0000 (21:27 +0200)]
Merge branch 'master' into drjaska/balance/crylink
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
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 [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 [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
z411 [Thu, 3 Mar 2022 19:12:05 +0000 (16:12 -0300)]
Not setting overtimes to -1 in suddendeath
terencehill [Thu, 3 Mar 2022 14:01:15 +0000 (15:01 +0100)]
Execute TRANSMUTE(Observer, this); slightly earlier in PutObserverInServer (no functional change)
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
Rudolf Polzer [Thu, 3 Mar 2022 06:23:25 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Wed, 2 Mar 2022 06:23:25 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Tue, 1 Mar 2022 18:07:20 +0000 (19:07 +0100)]
Adjust smoke position of tuba and alternative instruments
z411 [Tue, 1 Mar 2022 13:06:30 +0000 (10:06 -0300)]
Fixed typo and standardized function names
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.
z411 [Tue, 1 Mar 2022 03:09:38 +0000 (00:09 -0300)]
Fix but where sudden death could remove timelimit accidentally when ReadyRestarting
z411 [Tue, 1 Mar 2022 03:08:29 +0000 (00:08 -0300)]
Refactored time calculation in timer
z411 [Tue, 1 Mar 2022 02:42:28 +0000 (23:42 -0300)]
Removed intermission from timer subtext
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
Rudolf Polzer [Mon, 28 Feb 2022 06:23:22 +0000 (07:23 +0100)]
Transifex autosync
z411 [Mon, 28 Feb 2022 04:50:02 +0000 (01:50 -0300)]
Fixed intermission freeze for secondary timer
z411 [Sun, 27 Feb 2022 20:52:43 +0000 (17:52 -0300)]
Fixed compilation units
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
z411 [Sun, 27 Feb 2022 20:25:24 +0000 (17:25 -0300)]
Added secondary timer to menu
z411 [Sun, 27 Feb 2022 18:56:02 +0000 (15:56 -0300)]
Using GAME_STOPPED to freeze the round timer
Rudolf Polzer [Sun, 27 Feb 2022 06:24:04 +0000 (07:24 +0100)]
Transifex autosync
terencehill [Fri, 25 Feb 2022 23:01:04 +0000 (00:01 +0100)]
CA: don't show "Press space to join" to eliminated players
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
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
z411 [Tue, 22 Feb 2022 03:01:03 +0000 (00:01 -0300)]
Change overtimes and timeout status to int
terencehill [Mon, 21 Feb 2022 23:17:19 +0000 (00:17 +0100)]
Remove a debug print
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
z411 [Mon, 21 Feb 2022 22:35:32 +0000 (19:35 -0300)]
Show invalid ranks as N/A
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
Rudolf Polzer [Sun, 20 Feb 2022 06:23:56 +0000 (07:23 +0100)]
Transifex autosync
z411 [Sat, 19 Feb 2022 21:11:37 +0000 (18:11 -0300)]
Adjusted skins to make room for new timer
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
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
Freddy [Sat, 19 Feb 2022 13:54:16 +0000 (14:54 +0100)]
Add sv_termsofservice_url to xonotic-server.cfg
Freddy [Sat, 19 Feb 2022 13:51:08 +0000 (14:51 +0100)]
Remove an old debug logging
Freddy [Sat, 19 Feb 2022 13:50:17 +0000 (14:50 +0100)]
ToS: only load Xonotic ToS when actually needed
bones_was_here [Sat, 19 Feb 2022 11:02:12 +0000 (21:02 +1000)]
Work around imagemagick regression that puts everything upside down
Rudolf Polzer [Thu, 17 Feb 2022 06:23:26 +0000 (07:23 +0100)]
Transifex autosync
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.
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
Rudolf Polzer [Wed, 16 Feb 2022 06:23:23 +0000 (07:23 +0100)]
Transifex autosync
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
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
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.
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
z411 [Thu, 10 Feb 2022 23:38:19 +0000 (20:38 -0300)]
Make timer subtext green
terencehill [Thu, 10 Feb 2022 22:19:52 +0000 (23:19 +0100)]
Fix 2 typos in mutators.cfg, slightly optimize the SetSpectatee code
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
Rudolf Polzer [Thu, 10 Feb 2022 06:23:23 +0000 (07:23 +0100)]
Transifex autosync
z411 [Thu, 10 Feb 2022 02:29:55 +0000 (23:29 -0300)]
Use timer color for secondary timer too
terencehill [Thu, 10 Feb 2022 01:21:11 +0000 (02:21 +0100)]
Merge branch 'master' into terencehill/replicatevars_enhancements
terencehill [Thu, 10 Feb 2022 01:20:39 +0000 (02:20 +0100)]
REPLICATE_FIELD -> REPLICATE_INIT
z411 [Wed, 9 Feb 2022 19:54:41 +0000 (16:54 -0300)]
Merge branch 'master' into z411/new_timer
z411 [Wed, 9 Feb 2022 19:43:38 +0000 (16:43 -0300)]
Add sudden death to timer
z411 [Wed, 9 Feb 2022 19:43:22 +0000 (16:43 -0300)]
Adjusting default timer sizes
z411 [Wed, 9 Feb 2022 19:18:37 +0000 (16:18 -0300)]
Added timeout subtext
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
z411 [Mon, 7 Feb 2022 22:36:41 +0000 (19:36 -0300)]
Implement secondary timer and subtext
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
Dr. Jaska [Mon, 7 Feb 2022 18:30:17 +0000 (18:30 +0000)]
cvar to unbind both timer increment styles
Rudolf Polzer [Mon, 7 Feb 2022 06:23:27 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sun, 6 Feb 2022 15:03:52 +0000 (16:03 +0100)]
Merge branch 'terencehill/seconds_tostring'
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
terencehill [Sun, 6 Feb 2022 14:29:29 +0000 (15:29 +0100)]
Merge mmsss and mmssss code into a new function called clockedtime_tostring
terencehill [Sun, 6 Feb 2022 11:43:38 +0000 (12:43 +0100)]
Allow seconds_tostring to work with a negative number of seconds
Rudolf Polzer [Sun, 6 Feb 2022 06:24:04 +0000 (07:24 +0100)]
Transifex autosync
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
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
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
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