]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
z411 [Sat, 26 Feb 2022 18:50:33 +0000 (15:50 -0300)]
Merge branch 'master' into z411/bai-server
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:42:15 +0000 (00:42 -0300)]
Using REPLICATE API
z411 [Tue, 22 Feb 2022 03:32:48 +0000 (00:32 -0300)]
Merge branch 'master' into z411/bai-server
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
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
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
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
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:45:48 +0000 (19:45 -0300)]
Fixed rank showing twice in Duel Scoreboard
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
Juhu [Sat, 5 Feb 2022 11:01:52 +0000 (11:01 +0000)]
Allow rot and regeneration to be enabled individually in LMS
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
z411 [Fri, 4 Feb 2022 17:35:37 +0000 (14:35 -0300)]
Fixes serverlist displaying Jeff icon when server has stats disabled
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
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"
Rudolf Polzer [Fri, 4 Feb 2022 06:23:20 +0000 (07:23 +0100)]
Transifex autosync
Mario [Fri, 4 Feb 2022 02:43:31 +0000 (12:43 +1000)]
Update credits to include the new extended team members
z411 [Thu, 3 Feb 2022 16:40:59 +0000 (13:40 -0300)]
Merge branch 'drjaska/mayhem' into z411/bai-server
z411 [Thu, 3 Feb 2022 16:40:54 +0000 (13:40 -0300)]
Merge branch 'master' into z411/bai-server
terencehill [Thu, 3 Feb 2022 14:03:21 +0000 (14:03 +0000)]
Merge branch 'DefaultUser/ToS' into 'master'
Add Terms of Service Popup and server-specific Terms of Service tab
Closes #2036
See merge request xonotic/xonotic-data.pk3dir!752
Freddy [Thu, 3 Feb 2022 14:03:21 +0000 (14:03 +0000)]
Add Terms of Service Popup and server-specific Terms of Service tab
Author Freddy, contributed by z411, minor contributions by Mario, LegendaryGuard and terencehill
terencehill [Mon, 31 Jan 2022 15:53:43 +0000 (16:53 +0100)]
Allow scrolling the maximized chat history by pressing mouse wheel up/down and page up/down
drjaska [Tue, 1 Feb 2022 07:11:01 +0000 (09:11 +0200)]
disable X frags left announcements
they do poorly with upscaled score counters
Rudolf Polzer [Tue, 1 Feb 2022 06:23:22 +0000 (07:23 +0100)]
Transifex autosync
z411 [Mon, 31 Jan 2022 21:11:54 +0000 (18:11 -0300)]
Show ranks in scoreboard and spect HUD
Rudolf Polzer [Mon, 31 Jan 2022 06:23:21 +0000 (07:23 +0100)]
Transifex autosync
drjaska [Sun, 30 Jan 2022 00:33:22 +0000 (02:33 +0200)]
fix regeneration also enabling rotting, now seperately available
terencehill [Sat, 29 Jan 2022 20:17:10 +0000 (21:17 +0100)]
Merge W_RocketMinsta_Attack2 and W_RocketMinsta_Attack3 code and do some minor cleanups while at it
terencehill [Sat, 29 Jan 2022 19:48:41 +0000 (20:48 +0100)]
Use only one field instead of 3 to calculate rocketminsta attack damage
drjaska [Sat, 29 Jan 2022 06:29:38 +0000 (08:29 +0200)]
Merge branch 'master' into drjaska/mayhem
drjaska [Sat, 29 Jan 2022 06:26:30 +0000 (08:26 +0200)]
set mayhem_fraglimit to respect fraglimit_override and set menu to use fraglimit_override + some cleanup
terencehill [Sat, 29 Jan 2022 00:04:55 +0000 (01:04 +0100)]
Fix #2657 "Arc beam does not follow player direction in 3rd person if cl_lockview is 1"
terencehill [Sat, 29 Jan 2022 00:00:09 +0000 (01:00 +0100)]
Remove a wrong comment
Rudolf Polzer [Fri, 28 Jan 2022 06:23:23 +0000 (07:23 +0100)]
Transifex autosync
z411 [Wed, 26 Jan 2022 20:34:20 +0000 (17:34 -0300)]
Fix rank display variable
Rudolf Polzer [Wed, 26 Jan 2022 06:23:28 +0000 (07:23 +0100)]
Transifex autosync
z411 [Tue, 25 Jan 2022 18:58:54 +0000 (15:58 -0300)]
Rank added to spects
z411 [Tue, 25 Jan 2022 18:53:11 +0000 (15:53 -0300)]
Rank handle empty string
Rudolf Polzer [Tue, 25 Jan 2022 06:23:21 +0000 (07:23 +0100)]
Transifex autosync
z411 [Mon, 24 Jan 2022 20:52:45 +0000 (17:52 -0300)]
Allow strings as ranks
z411 [Mon, 24 Jan 2022 01:01:00 +0000 (22:01 -0300)]
Add player ranks
z411 [Sun, 23 Jan 2022 17:43:35 +0000 (14:43 -0300)]
Fixing cvar names
z411 [Sun, 23 Jan 2022 17:18:15 +0000 (14:18 -0300)]
Merge branch 'master' into z411/bai-server
Rudolf Polzer [Sun, 23 Jan 2022 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 22 Jan 2022 06:23:13 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Wed, 19 Jan 2022 18:10:21 +0000 (18:10 +0000)]
Merge branch 'terencehill/ca_integer_score' into 'master'
CA: avoid fractional score by giving players 1 point every 100 units of damage
Closes #2653 and #2356
See merge request xonotic/xonotic-data.pk3dir!952
terencehill [Wed, 19 Jan 2022 18:10:21 +0000 (18:10 +0000)]
CA: avoid fractional score by giving players 1 point every 100 units of damage
drjaska [Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)]
Merge branch 'master' into drjaska/mayhem
z411 [Tue, 18 Jan 2022 21:16:26 +0000 (18:16 -0300)]
Fix compilation units
z411 [Tue, 18 Jan 2022 21:01:17 +0000 (18:01 -0300)]
Add missing ready anti-flood line
z411 [Tue, 18 Jan 2022 21:00:22 +0000 (18:00 -0300)]
Merge branch 'master' into z411/bai-server
drjaska [Tue, 18 Jan 2022 18:30:51 +0000 (20:30 +0200)]
finish refactoring score system
debug prints are in the code still but disabled, enable to test easily and more accurately
terencehill [Tue, 18 Jan 2022 18:02:17 +0000 (18:02 +0000)]
Merge branch 'Mario/resource_registry' into 'master'
Migrating resources (ammo, health etc) to a registry for ease of maintenance and a cleaner codebase.
Closes #2030
See merge request xonotic/xonotic-data.pk3dir!910
Mario [Tue, 18 Jan 2022 18:02:17 +0000 (18:02 +0000)]
Migrating resources (ammo, health etc) to a registry for ease of maintenance and a cleaner codebase.
drjaska [Mon, 17 Jan 2022 22:09:58 +0000 (00:09 +0200)]
a little bit of refactoring
terencehill [Sun, 16 Jan 2022 23:15:46 +0000 (00:15 +0100)]
Small cleanup
Rudolf Polzer [Sun, 16 Jan 2022 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 15 Jan 2022 06:23:17 +0000 (07:23 +0100)]
Transifex autosync
drjaska [Fri, 14 Jan 2022 14:46:49 +0000 (16:46 +0200)]
refactored player score calculations and tried to fix floating point inaccuracy
drjaska [Fri, 14 Jan 2022 10:50:25 +0000 (12:50 +0200)]
whitespace removal
drjaska [Fri, 14 Jan 2022 10:45:44 +0000 (12:45 +0200)]
refactor score system and try to avoid float inaccuracy to best capabilities, damage based scoring might never be accurate
z411 [Fri, 14 Jan 2022 04:15:31 +0000 (01:15 -0300)]
Update sv_game hash
z411 [Fri, 14 Jan 2022 04:09:39 +0000 (01:09 -0300)]
Merge branch 'master' into z411/bai-server
z411 [Fri, 14 Jan 2022 03:53:30 +0000 (00:53 -0300)]
sv_game expected hash updated
z411 [Fri, 14 Jan 2022 03:46:27 +0000 (00:46 -0300)]
Fixed compilation units
terencehill [Thu, 13 Jan 2022 22:04:04 +0000 (23:04 +0100)]
Rename misleading DAMAGE_DEALT_TOTAL and damage_dealt to HITSOUND_DAMAGE_DEALT_TOTAL and hitsound_damage_dealt since damage is counted only if dealt to players that aren't typing
terencehill [Thu, 13 Jan 2022 18:30:00 +0000 (19:30 +0100)]
Add a comment about DAMAGE_DEALT_TOTAL accuracy