]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sat, 11 Jun 2022 19:18:19 +0000 (21:18 +0200)]
Merge branch 'master' into terencehill/scoreboard_ui
terencehill [Sat, 11 Jun 2022 19:08:30 +0000 (21:08 +0200)]
Avoid checking Arc overheat twice
terencehill [Sat, 11 Jun 2022 18:40:35 +0000 (20:40 +0200)]
Compact some conditions in the Arc code
terencehill [Sat, 11 Jun 2022 17:25:09 +0000 (19:25 +0200)]
Scoreboard UI: remove Enter to join if no player is selected because it isn't really needed and is bugged in team games
terencehill [Sat, 11 Jun 2022 17:24:29 +0000 (19:24 +0200)]
Allow scoreboard team selection to fade out cleanly
LegendaryGuard [Thu, 9 Jun 2022 17:09:23 +0000 (17:09 +0000)]
Merge branch 'drjaska/frozenarcfix' into 'master'
Add a frozen status check to arc
See merge request xonotic/xonotic-data.pk3dir!1029
Rudolf Polzer [Wed, 8 Jun 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 7 Jun 2022 22:05:02 +0000 (00:05 +0200)]
Forbid opening scoreboard team selection when the game is over
terencehill [Tue, 7 Jun 2022 21:43:51 +0000 (23:43 +0200)]
Scoreboard UI and team selection: add SHIFT+TAB shortcuts to reverse cycling
terencehill [Tue, 7 Jun 2022 21:41:29 +0000 (23:41 +0200)]
Scoreboard UI: fix not being able to switch to the Rankings panel
terencehill [Tue, 7 Jun 2022 16:23:58 +0000 (18:23 +0200)]
Fix ESC key not closing team selection if automatically opened by the server, scoreboard_team_selection spam, jump sometimes stuck. This change also allowed to get rid of a no longer needed workaround
Rudolf Polzer [Tue, 7 Jun 2022 05:23:32 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 6 Jun 2022 21:01:51 +0000 (21:01 +0000)]
Merge branch 'terencehill/weapon_model_fixes' into 'master'
Fix electro and blaster shadow artifacts
Closes #2667
See merge request xonotic/xonotic-data.pk3dir!1011
drjaska [Mon, 6 Jun 2022 19:45:22 +0000 (22:45 +0300)]
Add a frozen status check to arc
LegendaryGuard [Mon, 6 Jun 2022 19:33:52 +0000 (19:33 +0000)]
Merge branch 'terencehill/clockedtime_tostring_improvements' into 'master'
Show compact times (1.34 instead of 0:01.34) in some places
See merge request xonotic/xonotic-data.pk3dir!1015
LegendaryGuard [Mon, 6 Jun 2022 19:24:24 +0000 (19:24 +0000)]
Merge branch 'Mario/speed_powerup_noeffects' into 'master'
Merge branch Mario/speed_powerup_noeffects (XXS merge request)
Closes #2668
See merge request xonotic/xonotic-data.pk3dir!1028
Mario [Mon, 6 Jun 2022 08:19:43 +0000 (18:19 +1000)]
Disable the bubbly particles that show while holding the Speed powerup, as the effect is too subtle to notice while being a distraction in first person view, closes #2668
Rudolf Polzer [Mon, 6 Jun 2022 05:23:31 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sun, 5 Jun 2022 05:24:06 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Sat, 4 Jun 2022 21:05:48 +0000 (21:05 +0000)]
Merge branch 'z411/welcome_join' into 'master'
Add join button to Welcome dialog and make it default
See merge request xonotic/xonotic-data.pk3dir!1021
bones_was_here [Sat, 4 Jun 2022 18:29:00 +0000 (04:29 +1000)]
Welcome dialog: use capitals in Join and Spectate, fix compilation unit test
bones_was_here [Sat, 4 Jun 2022 18:03:11 +0000 (04:03 +1000)]
Merge translatable strings for !1017 (Mario/monsters) early
LegendaryGuard [Thu, 2 Jun 2022 20:02:55 +0000 (20:02 +0000)]
Merge branch 'drjaska/weaponindepency' into 'master'
weapon independency fixes
See merge request xonotic/xonotic-data.pk3dir!1024
terencehill [Tue, 31 May 2022 11:24:43 +0000 (11:24 +0000)]
Merge branch 'bones_was_here/matchid_eventlog' into 'master'
Always use a monotonic matchid to prevent random rejections by xonstat
See merge request xonotic/xonotic-data.pk3dir!1019
drjaska [Mon, 30 May 2022 02:36:56 +0000 (05:36 +0300)]
fix if else branching logic
terencehill [Sun, 29 May 2022 23:02:19 +0000 (01:02 +0200)]
Make sure client has received gametype name before displaying it in the centerprint title
terencehill [Sun, 29 May 2022 23:00:34 +0000 (01:00 +0200)]
Small cleanup
Rudolf Polzer [Sat, 28 May 2022 05:23:24 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Fri, 27 May 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 24 May 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 22 May 2022 19:37:30 +0000 (21:37 +0200)]
Scoreboard UI: ctrl-c to change default / all / custom columns layout. Other minor fixes
drjaska [Sun, 22 May 2022 18:58:42 +0000 (21:58 +0300)]
weapon independency fixes
Damage() function now checks that the target entity does not have a realowner which is another independent player before dealing damage and/or force to it
fireball's primary BFG no longer tries to target independent players
fireball's secondary "turrets" no longer try to target independent players
they also ignore frozen players as suggested by terence
electro's primary's explosion no longer explodes electro balls owned by other independent players
electro's primary's midair combo no longer explodes electro balls owned by other independent players
electro's comboexplosion no longer explodes electro balls owned by other independent players
terencehill [Sat, 21 May 2022 16:52:01 +0000 (18:52 +0200)]
Scoreboard team selection: improve messages
terencehill [Fri, 20 May 2022 23:36:02 +0000 (23:36 +0000)]
Merge branch 'drjaska/minefix2' into 'master'
fix #2690 by making sure mines aren't proximity exploded by independent players
Closes #2690
See merge request xonotic/xonotic-data.pk3dir!1023
terencehill [Fri, 20 May 2022 23:28:49 +0000 (01:28 +0200)]
Reduce scoreboard_team_selection spam when team selection is enabled by the server
terencehill [Fri, 20 May 2022 23:17:21 +0000 (01:17 +0200)]
Fix scoreboard UI input handling, implement team selection in the scoreboard (keyboard only), use it instead of the team selection dialog
terencehill [Thu, 19 May 2022 21:15:19 +0000 (23:15 +0200)]
Prioritize scoreboard UI over other things
drjaska [Thu, 19 May 2022 21:01:54 +0000 (00:01 +0300)]
fix #2690 by making sure mines aren't proximity exploded by independent players
terencehill [Wed, 18 May 2022 10:21:44 +0000 (12:21 +0200)]
Fix #2689 "Welcome dialog is not closed by voting screens or by disconnecting"
terencehill [Wed, 18 May 2022 00:42:24 +0000 (02:42 +0200)]
Playerstats: fix higher average ping for players who disconnect and reconnect
terencehill [Tue, 17 May 2022 17:52:36 +0000 (19:52 +0200)]
Merge branch 'master' into terencehill/scoreboard_ui
# Conflicts:
# qcsrc/client/main.qc
z411 [Tue, 17 May 2022 02:16:01 +0000 (22:16 -0400)]
Add join button to Welcome dialog and make it default
terencehill [Sun, 15 May 2022 23:20:24 +0000 (01:20 +0200)]
Make sure centerprint title gets cleared if game ends prematurely
terencehill [Sun, 15 May 2022 13:53:06 +0000 (15:53 +0200)]
Call centerprint countdown only in the first tic, it will continue automatically in the remaining tics. Hopefully it fixes ^COUNT occasionally shown in the last tic, probably due to lags
terencehill [Sun, 15 May 2022 12:51:58 +0000 (14:51 +0200)]
Apply panel alpha to centerprint title. It fixes title not fading out on menu display
terencehill [Fri, 13 May 2022 23:00:47 +0000 (01:00 +0200)]
Add a comment for the ghost spectator bot workaround
terencehill [Fri, 13 May 2022 22:42:03 +0000 (00:42 +0200)]
Fix comment and update hash
terencehill [Thu, 12 May 2022 14:01:13 +0000 (16:01 +0200)]
Add ReadyRestart support to Assault in campaign mode since it's a requirement now. It fixes broken Assault campaign level.
terencehill [Thu, 12 May 2022 00:53:59 +0000 (02:53 +0200)]
Check .bot_forced_team validity immediately
terencehill [Thu, 12 May 2022 00:48:56 +0000 (02:48 +0200)]
Make bots observers (for one frame) before joining the game and put them in a team in PutPlayerInServer so that everything gets initialized in the same way as for human players.
It fixes a bug where bots connecting in the middle of a CA round join a team (with a message announcing it) and immediately leave it because joining a team is not allowed.
bones_was_here [Wed, 11 May 2022 21:25:33 +0000 (07:25 +1000)]
Put GameLogInit() code in there instead of in spawnfunc(worldspawn)
terencehill [Wed, 11 May 2022 21:56:05 +0000 (23:56 +0200)]
Remove redundant .team initialization in MUTATOR_HOOKFUNCTION(ca, reset_map_players) for bots
terencehill [Wed, 11 May 2022 21:32:02 +0000 (23:32 +0200)]
Revert "Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs anyway", it fixes #2688 "Div by zero errors at menu"
This reverts commit
e7230c21f582fb61399daa4e8367ff4e24ee0f0e .
bones_was_here [Wed, 11 May 2022 21:17:15 +0000 (07:17 +1000)]
Always use a monotonic matchid to prevent random rejections by xonstat
terencehill [Thu, 5 May 2022 13:19:06 +0000 (15:19 +0200)]
Change g_cts_finish_kill_delay default value from 10 to 2 and improve its description
terencehill [Thu, 5 May 2022 11:32:28 +0000 (13:32 +0200)]
Apply player glow color instead of weapon charge color to dropped vortex and oknex
terencehill [Thu, 5 May 2022 09:54:18 +0000 (11:54 +0200)]
Bot AI: don't attack players who finished the race
terencehill [Thu, 5 May 2022 09:48:33 +0000 (11:48 +0200)]
Document r parameter in player stats specs
terencehill [Thu, 5 May 2022 09:46:41 +0000 (11:46 +0200)]
Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs anyway
Rudolf Polzer [Tue, 3 May 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Mon, 2 May 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 30 Apr 2022 17:56:17 +0000 (19:56 +0200)]
Fix player glow color not applied to dropped weapons
LegendaryGuard [Wed, 27 Apr 2022 20:47:12 +0000 (22:47 +0200)]
Fix electro shadow artifacts exported from Blender
terencehill [Tue, 26 Apr 2022 23:53:50 +0000 (01:53 +0200)]
Fix blaster shadow artifacts generated by IqeBrowser in commit
4d771bf78 . Fixed by re-exporting the pre
4d771bf78 model with Blender (re-applied the origin fix as well)
terencehill [Tue, 26 Apr 2022 21:47:06 +0000 (23:47 +0200)]
Fix Welcome message "popping up multiple times in the middle of a match"
terencehill [Tue, 26 Apr 2022 17:55:22 +0000 (19:55 +0200)]
Show compact times (1.34 instead of 0:01.34) in some places (messages, scoreboard and rankings panel)
terencehill [Tue, 26 Apr 2022 15:31:31 +0000 (17:31 +0200)]
Rename the seconds variable as it doesn't contain number of seconds
Rudolf Polzer [Tue, 26 Apr 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 25 Apr 2022 23:35:31 +0000 (01:35 +0200)]
Remove an uneeded strcpy
Rudolf Polzer [Mon, 25 Apr 2022 05:23:23 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 24 Apr 2022 23:17:18 +0000 (01:17 +0200)]
Fix "When using the Mine Layer, the game can crash because it tries to free a constant string.", reported in !1014
Rudolf Polzer [Sun, 24 Apr 2022 05:23:59 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sat, 23 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
LegendaryGuard [Wed, 20 Apr 2022 20:31:04 +0000 (20:31 +0000)]
Update hash
terencehill [Wed, 20 Apr 2022 14:00:25 +0000 (16:00 +0200)]
KeyHunt HUD: fix keys not fading out showing the menu
terencehill [Wed, 20 Apr 2022 13:53:46 +0000 (15:53 +0200)]
Give bots a weapon on map reset
Rudolf Polzer [Tue, 19 Apr 2022 05:23:22 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 18 Apr 2022 22:48:29 +0000 (00:48 +0200)]
Properly initialize ReplicateVars_time
terencehill [Mon, 18 Apr 2022 22:20:01 +0000 (00:20 +0200)]
Amend commit
222b94d2d , ReplicateVars_Start was meant to be executed only once
bones_was_here [Mon, 18 Apr 2022 13:51:26 +0000 (13:51 +0000)]
Merge branch 'bones_was_here/showspec' into 'master'
Implement sv_showspectators 2: Only spectators can see the spectators list
See merge request xonotic/xonotic-data.pk3dir!1010
bones_was_here [Sat, 16 Apr 2022 08:38:07 +0000 (18:38 +1000)]
Implement sv_showspectators 2: Only spectators can see the spectators list
Rudolf Polzer [Mon, 18 Apr 2022 05:23:32 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sun, 17 Apr 2022 09:53:31 +0000 (19:53 +1000)]
q3compat: allow damage to open a func_door with no health and no targetname
Fixes doors that should open when shot on some Q3* maps
Also fixed some indenting and a comment
Rudolf Polzer [Sun, 17 Apr 2022 05:24:04 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Sun, 17 Apr 2022 02:13:26 +0000 (04:13 +0200)]
Fix compilation units
terencehill [Sun, 17 Apr 2022 02:01:22 +0000 (04:01 +0200)]
On client connection, send client cvars only after client has been initialized on the server
It fixes issue https://gitlab.com/xonotic/xonstat-go/-/issues/44 that was due to .playerstats_id getting wrongly set to "Player#0" because .playerid was not initialized yet (0)
Rudolf Polzer [Sat, 16 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 15 Apr 2022 22:31:24 +0000 (00:31 +0200)]
Rename Leave match button to Stop demo while playing back a demo
Rudolf Polzer [Fri, 15 Apr 2022 05:23:20 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Thu, 14 Apr 2022 13:04:53 +0000 (15:04 +0200)]
Campaign: give bots a weapon on map start
terencehill [Thu, 14 Apr 2022 13:01:10 +0000 (15:01 +0200)]
Campaign: make sure there's no countdown on map start; also disable player stats recording
Rudolf Polzer [Thu, 14 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Wed, 13 Apr 2022 11:42:42 +0000 (13:42 +0200)]
Remove cvar default value from a tooltip. Add some comments to make clear what PlayerScore_Clear and SetPlayerTeam do
bones_was_here [Wed, 13 Apr 2022 06:30:38 +0000 (06:30 +0000)]
Merge branch 'terencehill/campaign_restart_level' into 'master'
Minor campaign improvements
See merge request xonotic/xonotic-data.pk3dir!1009
bones_was_here [Wed, 13 Apr 2022 06:29:51 +0000 (06:29 +0000)]
Merge branch 'drjaska/run-genmod' into 'master'
updated _mod. files with qcsrc\tools\genmod.sh shell script
See merge request xonotic/xonotic-data.pk3dir!1006
bones_was_here [Wed, 13 Apr 2022 06:29:17 +0000 (06:29 +0000)]
Merge branch 'z411/duel_center' into 'master'
Calculate centerprint title offset in real time in duel
See merge request xonotic/xonotic-data.pk3dir!1007
z411 [Wed, 13 Apr 2022 06:29:16 +0000 (06:29 +0000)]
Calculate centerprint title offset in real time in duel
Rudolf Polzer [Wed, 13 Apr 2022 05:23:21 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 12 Apr 2022 17:28:07 +0000 (17:28 +0000)]
Merge branch 'terencehill/welcome_dialog_translatable' into 'master'
Make the Welcome message translatable
Closes #2217
See merge request xonotic/xonotic-data.pk3dir!1000
terencehill [Tue, 12 Apr 2022 17:22:18 +0000 (19:22 +0200)]
Fix compilation units