xonotic/xonotic-data.pk3dir.git
6 months agoMerge branch 'Mario/monsters' into 'develop'
bones_was_here [Sat, 4 Jun 2022 12:43:50 +0000 (12:43 +0000)]
Merge branch 'Mario/monsters' into 'develop'

Merge branch Mario/monsters (L merge request)

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

6 months agoChange Invasion's primary scoring field from frags to kills 1017/head
Mario [Thu, 2 Jun 2022 10:51:55 +0000 (20:51 +1000)]
Change Invasion's primary scoring field from frags to kills

6 months agoUpdate pipeline hash
bones_was_here [Thu, 2 Jun 2022 02:42:32 +0000 (12:42 +1000)]
Update pipeline hash

6 months agoAdjust the way monsters test their target to make them less likely to drop them and...
Mario [Thu, 2 Jun 2022 02:28:39 +0000 (12:28 +1000)]
Adjust the way monsters test their target to make them less likely to drop them and find them again immediately, fixes some cases of spammy behaviour

6 months agoMerge branch 'master' into develop
bones_was_here [Thu, 2 Jun 2022 02:25:34 +0000 (12:25 +1000)]
Merge branch 'master' into develop

6 months agoAdjust frequency of mage's teleportation attack, update monster configuration to...
Mario [Thu, 2 Jun 2022 01:56:00 +0000 (11:56 +1000)]
Adjust frequency of mage's teleportation attack, update monster configuration to include missing cvars

6 months agoUpdate the golem's sounds - source is the unused carni-lycan playersounds
Mario [Thu, 2 Jun 2022 01:45:12 +0000 (11:45 +1000)]
Update the golem's sounds - source is the unused carni-lycan playersounds

6 months agoUpdate cl_modeldetailreduction description to note that it applies to any non-player...
Mario [Thu, 2 Jun 2022 01:37:14 +0000 (11:37 +1000)]
Update cl_modeldetailreduction description to note that it applies to any non-player and non-weapon models, remove old Invasion teamplay cvars from configuration

6 months agoPrevent monsters from attacking when the match is stopped, rename shambler sounds...
Mario [Thu, 2 Jun 2022 01:32:31 +0000 (11:32 +1000)]
Prevent monsters from attacking when the match is stopped, rename shambler sounds to golem, allow customising the maximum range a mage can teleport to players from

6 months agoMake monsters unable to pass through player clips by default
Mario [Thu, 2 Jun 2022 01:14:18 +0000 (11:14 +1000)]
Make monsters unable to pass through player clips by default

6 months agoFix whitespace inconsistency in the newly added teleportation rule
Mario [Thu, 2 Jun 2022 01:05:06 +0000 (11:05 +1000)]
Fix whitespace inconsistency in the newly added teleportation rule

6 months agoRemove commented out legacy keyframe information from monster codefiles and update...
Mario [Thu, 2 Jun 2022 01:03:13 +0000 (11:03 +1000)]
Remove commented out legacy keyframe information from monster codefiles and update the wyvern's model to match its name

6 months agoMerge branch 'bones_was_here/matchid_eventlog' into 'master'
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

6 months agoMake sure client has received gametype name before displaying it in the centerprint...
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

6 months agoSmall cleanup
terencehill [Sun, 29 May 2022 23:00:34 +0000 (01:00 +0200)]
Small cleanup

6 months agoTransifex autosync
Rudolf Polzer [Sat, 28 May 2022 05:23:24 +0000 (07:23 +0200)]
Transifex autosync

6 months agoTransifex autosync
Rudolf Polzer [Fri, 27 May 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync

6 months agoTransifex autosync
Rudolf Polzer [Tue, 24 May 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync

6 months agoMerge branch 'drjaska/minefix2' into 'master'
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

6 months agofix #2690 by making sure mines aren't proximity exploded by independent players 1023/head
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

6 months agoFix #2689 "Welcome dialog is not closed by voting screens or by disconnecting"
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"

6 months agoPlayerstats: fix higher average ping for players who disconnect and reconnect
terencehill [Wed, 18 May 2022 00:42:24 +0000 (02:42 +0200)]
Playerstats: fix higher average ping for players who disconnect and reconnect

6 months agoFix a remaining tabbed whitespace in the renamed monster code
Mario [Tue, 17 May 2022 00:55:24 +0000 (10:55 +1000)]
Fix a remaining tabbed whitespace in the renamed monster code

6 months agoFix tabbed whitespace in the renamed monster deathtypes
Mario [Mon, 16 May 2022 13:12:40 +0000 (23:12 +1000)]
Fix tabbed whitespace in the renamed monster deathtypes

6 months agoMake sure centerprint title gets cleared if game ends prematurely
terencehill [Sun, 15 May 2022 23:20:24 +0000 (01:20 +0200)]
Make sure centerprint title gets cleared if game ends prematurely

6 months agoCall centerprint countdown only in the first tic, it will continue automatically...
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

6 months agoApply panel alpha to centerprint title. It fixes title not fading out on menu display
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

6 months agoAdd a comment for the ghost spectator bot workaround
terencehill [Fri, 13 May 2022 23:00:47 +0000 (01:00 +0200)]
Add a comment for the ghost spectator bot workaround

6 months agoFix comment and update hash
terencehill [Fri, 13 May 2022 22:42:03 +0000 (00:42 +0200)]
Fix comment and update hash

6 months agoAdd ReadyRestart support to Assault in campaign mode since it's a requirement now...
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.

6 months agoCheck .bot_forced_team validity immediately
terencehill [Thu, 12 May 2022 00:53:59 +0000 (02:53 +0200)]
Check .bot_forced_team validity immediately

6 months agoMake bots observers (for one frame) before joining the game and put them in a team...
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.

6 months agoPut GameLogInit() code in there instead of in spawnfunc(worldspawn) 1019/head
bones_was_here [Wed, 11 May 2022 21:25:33 +0000 (07:25 +1000)]
Put GameLogInit() code in there instead of in spawnfunc(worldspawn)

6 months agoRemove redundant .team initialization in MUTATOR_HOOKFUNCTION(ca, reset_map_players...
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

6 months agoRevert "Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs...
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.

6 months agoAlways use a monotonic matchid to prevent random rejections by xonstat
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

7 months agoChange g_cts_finish_kill_delay default value from 10 to 2 and improve its description
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

7 months agoApply player glow color instead of weapon charge color to dropped vortex and oknex
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

7 months agoBot AI: don't attack players who finished the race
terencehill [Thu, 5 May 2022 09:54:18 +0000 (11:54 +0200)]
Bot AI: don't attack players who finished the race

7 months agoDocument r parameter in player stats specs
terencehill [Thu, 5 May 2022 09:48:33 +0000 (11:48 +0200)]
Document r parameter in player stats specs

7 months agoMenu: don't set intendedWidth for tabs, they get overridden by parent dialogs anyway
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

7 months agoTransifex autosync
Rudolf Polzer [Tue, 3 May 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

7 months agoTransifex autosync
Rudolf Polzer [Mon, 2 May 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync

7 months agoFix player glow color not applied to dropped weapons
terencehill [Sat, 30 Apr 2022 17:56:17 +0000 (19:56 +0200)]
Fix player glow color not applied to dropped weapons

7 months agoMerge branch 'terencehill/player_models_improvements' into 'develop'
LegendaryGuard [Fri, 29 Apr 2022 22:15:29 +0000 (22:15 +0000)]
Merge branch 'terencehill/player_models_improvements' into 'develop'

Player models improvements

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

7 months agoAdd the new death type notifications to notifications.cfg
Mario [Fri, 29 Apr 2022 13:45:07 +0000 (23:45 +1000)]
Add the new death type notifications to notifications.cfg

7 months agoRemove team setup from Invasion definition
Mario [Fri, 29 Apr 2022 12:44:55 +0000 (22:44 +1000)]
Remove team setup from Invasion definition

7 months agoMerge branch 'master' into Mario/monsters
Mario [Fri, 29 Apr 2022 12:43:46 +0000 (22:43 +1000)]
Merge branch 'master' into Mario/monsters

7 months agoMerge branch 'develop' into terencehill/player_models_improvements 1013/head
terencehill [Thu, 28 Apr 2022 14:19:23 +0000 (16:19 +0200)]
Merge branch 'develop' into terencehill/player_models_improvements

7 months agoMake all gak models a bit glowier
terencehill [Thu, 28 Apr 2022 14:19:04 +0000 (16:19 +0200)]
Make all gak models a bit glowier

7 months agoFix glow color mixed with shirt color in erebus, megaerebus and nyx head models
terencehill [Thu, 28 Apr 2022 14:18:37 +0000 (16:18 +0200)]
Fix glow color mixed with shirt color in erebus, megaerebus and nyx head models

7 months agoMake shirt color dominant on fullbright erebus and nyx models, restore original megae...
terencehill [Sun, 24 Apr 2022 18:08:55 +0000 (20:08 +0200)]
Make shirt color dominant on fullbright erebus and nyx models, restore original megaerebus colors (except shirt color on the head that now is brighter) by using dedicated textures

7 months agoMerge branch 'master' into develop
terencehill [Thu, 28 Apr 2022 13:45:26 +0000 (15:45 +0200)]
Merge branch 'master' into develop

7 months agoFix Welcome message "popping up multiple times in the middle of a match"
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"

7 months agoTransifex autosync
Rudolf Polzer [Tue, 26 Apr 2022 05:23:27 +0000 (07:23 +0200)]
Transifex autosync

7 months agoRemove an uneeded strcpy
terencehill [Mon, 25 Apr 2022 23:35:31 +0000 (01:35 +0200)]
Remove an uneeded strcpy

7 months agoTransifex autosync
Rudolf Polzer [Mon, 25 Apr 2022 05:23:23 +0000 (07:23 +0200)]
Transifex autosync

7 months agoFix "When using the Mine Layer, the game can crash because it tries to free a constan...
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

7 months agoTransifex autosync
Rudolf Polzer [Sun, 24 Apr 2022 05:23:59 +0000 (07:23 +0200)]
Transifex autosync

7 months agoTransifex autosync
Rudolf Polzer [Sat, 23 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync

7 months agoUpdate hash
terencehill [Fri, 22 Apr 2022 20:36:06 +0000 (22:36 +0200)]
Update hash

7 months agoMerge branch 'master' into develop
terencehill [Fri, 22 Apr 2022 20:19:39 +0000 (22:19 +0200)]
Merge branch 'master' into develop

7 months agoFix less saturated glow colors of ignis and seraphina (normal and fullbright) due...
terencehill [Fri, 22 Apr 2022 17:43:24 +0000 (19:43 +0200)]
Fix less saturated glow colors of ignis and seraphina (normal and fullbright) due to overlapped base and glow textures

7 months agoProperly fix mixed shirt and glow colors on the ankle for pyria and umbra (normal...
terencehill [Fri, 22 Apr 2022 17:24:33 +0000 (19:24 +0200)]
Properly fix mixed shirt and glow colors on the ankle for pyria and umbra (normal and  fullbright) models and on the shoulder blades for umbra (normal and  fullbright)

7 months agoMerge branch 'develop' into terencehill/player_models_improvements
terencehill [Fri, 22 Apr 2022 10:06:16 +0000 (12:06 +0200)]
Merge branch 'develop' into terencehill/player_models_improvements

7 months agoMerge branch 'master' into develop
terencehill [Fri, 22 Apr 2022 00:41:18 +0000 (02:41 +0200)]
Merge branch 'master' into develop

7 months agoAdd fullbright versions of shadowhead and ignishead (used by 6 player models)
terencehill [Thu, 21 Apr 2022 22:30:29 +0000 (00:30 +0200)]
Add fullbright versions of shadowhead and ignishead (used by 6 player models)

7 months agopyria and pyria fullbright models: fix mixed shirt and glow colors on the ankle
terencehill [Thu, 21 Apr 2022 20:26:57 +0000 (22:26 +0200)]
pyria and pyria fullbright models: fix mixed shirt and glow colors on the ankle

7 months agoBring back shirt color in fullbright player models
terencehill [Thu, 21 Apr 2022 20:14:44 +0000 (22:14 +0200)]
Bring back shirt color in fullbright player models

7 months agoUpdate hash
LegendaryGuard [Wed, 20 Apr 2022 20:31:04 +0000 (20:31 +0000)]
Update hash

7 months agoKeyHunt HUD: fix keys not fading out showing the menu
terencehill [Wed, 20 Apr 2022 14:00:25 +0000 (16:00 +0200)]
KeyHunt HUD: fix keys not fading out showing the menu

7 months agoGive bots a weapon on map reset
terencehill [Wed, 20 Apr 2022 13:53:46 +0000 (15:53 +0200)]
Give bots a weapon on map reset

7 months agoTransifex autosync
Rudolf Polzer [Tue, 19 Apr 2022 05:23:22 +0000 (07:23 +0200)]
Transifex autosync

7 months agoProperly initialize ReplicateVars_time
terencehill [Mon, 18 Apr 2022 22:48:29 +0000 (00:48 +0200)]
Properly initialize ReplicateVars_time

7 months agoAmend commit 222b94d2d, ReplicateVars_Start was meant to be executed only once
terencehill [Mon, 18 Apr 2022 22:20:01 +0000 (00:20 +0200)]
Amend commit 222b94d2d, ReplicateVars_Start was meant to be executed only once

7 months agoMerge branch 'bones_was_here/showspec' into 'master'
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

7 months agoImplement sv_showspectators 2: Only spectators can see the spectators list 1010/head
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

7 months agoTransifex autosync
Rudolf Polzer [Mon, 18 Apr 2022 05:23:32 +0000 (07:23 +0200)]
Transifex autosync

7 months agoq3compat: allow damage to open a func_door with no health and no targetname
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

7 months agoTransifex autosync
Rudolf Polzer [Sun, 17 Apr 2022 05:24:04 +0000 (07:24 +0200)]
Transifex autosync

7 months agoFix compilation units
terencehill [Sun, 17 Apr 2022 02:13:26 +0000 (04:13 +0200)]
Fix compilation units

7 months agoOn client connection, send client cvars only after client has been initialized on...
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)

7 months agoTransifex autosync
Rudolf Polzer [Sat, 16 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync

7 months agoRename Leave match button to Stop demo while playing back a demo
terencehill [Fri, 15 Apr 2022 22:31:24 +0000 (00:31 +0200)]
Rename Leave match button to Stop demo while playing back a demo

7 months agoTransifex autosync
Rudolf Polzer [Fri, 15 Apr 2022 05:23:20 +0000 (07:23 +0200)]
Transifex autosync

7 months agoCampaign: give bots a weapon on map start
terencehill [Thu, 14 Apr 2022 13:04:53 +0000 (15:04 +0200)]
Campaign: give bots a weapon on map start

7 months agoCampaign: make sure there's no countdown on map start; also disable player stats...
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

7 months agoTransifex autosync
Rudolf Polzer [Thu, 14 Apr 2022 05:23:25 +0000 (07:23 +0200)]
Transifex autosync

7 months agoRemove cvar default value from a tooltip. Add some comments to make clear what Playe...
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

7 months agoMerge branch 'terencehill/campaign_restart_level' into 'master'
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

7 months agoMerge branch 'drjaska/run-genmod' into 'master'
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

7 months agoMerge branch 'z411/duel_center' into 'master'
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

7 months agoCalculate centerprint title offset in real time in duel
z411 [Wed, 13 Apr 2022 06:29:16 +0000 (06:29 +0000)]
Calculate centerprint title offset in real time in duel

7 months agoTransifex autosync
Rudolf Polzer [Wed, 13 Apr 2022 05:23:21 +0000 (07:23 +0200)]
Transifex autosync

7 months agoMerge branch 'terencehill/welcome_dialog_translatable' into 'master'
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

7 months agoFix compilation units 1009/head
terencehill [Tue, 12 Apr 2022 17:22:18 +0000 (19:22 +0200)]
Fix compilation units

7 months agoMerge branch 'master' into terencehill/welcome_dialog_translatable 1000/head
terencehill [Tue, 12 Apr 2022 17:11:20 +0000 (19:11 +0200)]
Merge branch 'master' into terencehill/welcome_dialog_translatable

7 months agoCampaign: replace the "Join!" button with a "Restart level" button in the game menu...
terencehill [Tue, 12 Apr 2022 16:40:39 +0000 (18:40 +0200)]
Campaign: replace the "Join!" button with a "Restart level" button in the game menu to allow a quick level restart

7 months agoCampaign: reset the match on join so that timer is cleared and a nice 3 second countd...
terencehill [Tue, 12 Apr 2022 16:36:18 +0000 (18:36 +0200)]
Campaign: reset the match on join so that timer is cleared and a nice 3 second countdown show up

7 months agoCampaign: make work resetmatch without entering warmup (if enabled in the server)
terencehill [Tue, 12 Apr 2022 16:32:11 +0000 (18:32 +0200)]
Campaign: make work resetmatch without entering warmup (if enabled in the server)