xonotic/xonotic-data.pk3dir.git
5 months agoMerge branch 'garymoon/show-server-name-in-info' into 'master'
Mario [Mon, 18 May 2020 09:47:06 +0000 (09:47 +0000)]
Merge branch 'garymoon/show-server-name-in-info' into 'master'

Display server hostname in welcome message and info

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

5 months agoDisplay server hostname in welcome message and info
Gary Moon [Mon, 18 May 2020 09:47:06 +0000 (09:47 +0000)]
Display server hostname in welcome message and info

5 months agoAllow deactivating trigger_relay_if, trigger_relay_teamcheck and trigger_disablerelay...
Mario [Mon, 18 May 2020 09:38:41 +0000 (19:38 +1000)]
Allow deactivating trigger_relay_if, trigger_relay_teamcheck and trigger_disablerelay, also fix trigger_disablerelay functionality

5 months agoMerge branch 'terencehill/trimmed_sounds' into 'master'
Mario [Sat, 16 May 2020 21:13:37 +0000 (21:13 +0000)]
Merge branch 'terencehill/trimmed_sounds' into 'master'

Shorten hagar and rocket fire sounds

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

5 months agoDon't schedule buff activation before round start
terencehill [Sat, 16 May 2020 21:07:12 +0000 (23:07 +0200)]
Don't schedule buff activation before round start

5 months agoFix code indentation issues in shownames.qc
terencehill [Sat, 16 May 2020 21:03:39 +0000 (23:03 +0200)]
Fix code indentation issues in shownames.qc

5 months agoFix names above players not following dead players while fading out
terencehill [Sat, 16 May 2020 21:00:28 +0000 (23:00 +0200)]
Fix names above players not following dead players while fading out

5 months agoSimplify a message
terencehill [Wed, 13 May 2020 20:04:11 +0000 (22:04 +0200)]
Simplify a message

5 months agoRespawn frozen players in a safe spot as soon as they touch lava/slime (obbey g_froze...
terencehill [Wed, 13 May 2020 20:02:53 +0000 (22:02 +0200)]
Respawn frozen players in a safe spot as soon as they touch lava/slime (obbey g_frozen_damage_trigger cvar)

5 months agoTransifex autosync
Rudolf Polzer [Wed, 13 May 2020 05:23:59 +0000 (07:23 +0200)]
Transifex autosync

5 months agoDon't enable the oxygen bar when frozen or in lava/slime; also fix the oxygen bar...
terencehill [Tue, 12 May 2020 19:32:25 +0000 (21:32 +0200)]
Don't enable the oxygen bar when  frozen or in lava/slime; also fix the oxygen bar appearing when spectating a player in shallow water

5 months agoFixes the superweapons portion of #2422 "target_items issues"
terencehill [Tue, 12 May 2020 19:26:36 +0000 (21:26 +0200)]
Fixes the superweapons portion of #2422 "target_items issues"

5 months agoTrim initial quieter part of hagar and rocket fire sounds (without re-encoding them... 807/head
terencehill [Tue, 12 May 2020 13:07:08 +0000 (15:07 +0200)]
Trim initial quieter part of hagar and rocket fire sounds (without re-encoding them thanks to mp3splt-gtk)

5 months agoFixes the invincible portion of #2422 "target_items issues"
terencehill [Tue, 12 May 2020 12:16:34 +0000 (14:16 +0200)]
Fixes the invincible portion of #2422 "target_items issues"

5 months agoDon't show the JOIN_PREVENT message to CA players; also reduce the antispam delay...
terencehill [Tue, 12 May 2020 12:07:46 +0000 (14:07 +0200)]
Don't show the JOIN_PREVENT message to CA players; also reduce the antispam delay: since it's implemented with a global, it may not work at all if 2 or more player try to join in the same time frame

5 months agoTransifex autosync
Rudolf Polzer [Tue, 12 May 2020 05:24:03 +0000 (07:24 +0200)]
Transifex autosync

5 months agoFix compilation units, update hash
terencehill [Mon, 11 May 2020 16:37:22 +0000 (18:37 +0200)]
Fix compilation units, update hash

5 months agoDon't log frags and damage while round hasn't started yet (telefrags, lava, trigger_hurt)
terencehill [Mon, 11 May 2020 14:58:38 +0000 (16:58 +0200)]
Don't log frags and damage while round hasn't started yet (telefrags, lava, trigger_hurt)

5 months agoFreeze tag: force respawning dead players after 1 second delay
terencehill [Mon, 11 May 2020 14:56:15 +0000 (16:56 +0200)]
Freeze tag: force respawning dead players after 1 second delay

5 months agoGet rid of 2 useless functions
terencehill [Mon, 11 May 2020 14:48:01 +0000 (16:48 +0200)]
Get rid of 2 useless functions

5 months agoTransifex autosync
Rudolf Polzer [Mon, 11 May 2020 05:24:02 +0000 (07:24 +0200)]
Transifex autosync

5 months agoFix #2433 "Bold messages appearing twice"
terencehill [Sat, 9 May 2020 12:51:59 +0000 (14:51 +0200)]
Fix #2433 "Bold messages appearing twice"

5 months agoTransifex autosync
Rudolf Polzer [Sat, 9 May 2020 05:24:15 +0000 (07:24 +0200)]
Transifex autosync

5 months agoMerge branch 'Mario/strength_stat_field' into 'master'
terencehill [Wed, 6 May 2020 22:56:13 +0000 (22:56 +0000)]
Merge branch 'Mario/strength_stat_field' into 'master'

Merge branch Mario/strength_stat_field (S merge request)

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

5 months agoImprove reliability of giving buffs via triggers, fixes some odd cases involving...
Mario [Tue, 5 May 2020 20:34:03 +0000 (06:34 +1000)]
Improve reliability of giving buffs via triggers, fixes some odd cases involving the wrong buffs being given

5 months agoDon't allow giving buffs that are disabled, fixes #2437
Mario [Tue, 5 May 2020 19:56:01 +0000 (05:56 +1000)]
Don't allow giving buffs that are disabled, fixes #2437

5 months agoBot AI: fix bots standing still after a while on maps with jump waypoints; it fixes...
terencehill [Tue, 5 May 2020 14:08:52 +0000 (16:08 +0200)]
Bot AI: fix bots standing still after a while on maps with jump waypoints; it fixes #2436

5 months agoAdd a check
terencehill [Sat, 2 May 2020 09:13:29 +0000 (11:13 +0200)]
Add a check

5 months agoFix height of csqcplayer when dead, previously it was wrongly applied the ducked...
terencehill [Sat, 2 May 2020 09:07:14 +0000 (11:07 +0200)]
Fix height of csqcplayer when dead, previously it was wrongly applied the ducked height since the bloodloss code wrongly set do_crouch to true when dead

5 months agoFix being able to move your player's body while dead by moving the mouse
terencehill [Sat, 2 May 2020 08:53:00 +0000 (10:53 +0200)]
Fix being able to move your player's body while dead by moving the mouse

5 months agoMenu: If an item depending on a cvar which is also controlled by another item gets...
terencehill [Thu, 30 Apr 2020 22:04:41 +0000 (00:04 +0200)]
Menu: If an item depending on a cvar which is also controlled by another item gets re-enabled, reload its controlled cvar since it may have changed; it fixes wrong color in the color picker of the hud panel dialogues, now it's correctly reset to white.

5 months agoIf the bot has unlimited ammo, always prefer primary attack on the Vaporizer, fixes...
Mario [Wed, 29 Apr 2020 18:45:25 +0000 (04:45 +1000)]
If the bot has unlimited ammo, always prefer primary attack on the Vaporizer, fixes bots only firing blaster shots with g_use_ammunition 0 and g_instagib_ammo_start 0

5 months agoFix #2429 "precache_playermodel() does not account for :skin suffix which is allowed...
terencehill [Sun, 26 Apr 2020 13:02:39 +0000 (15:02 +0200)]
Fix #2429 "precache_playermodel() does not account for :skin suffix which is allowed in sv_defaultplayermodel" (patch by nico)

5 months agoOptimize DrawCircleClippedPic when drawing full image
terencehill [Sat, 25 Apr 2020 09:47:41 +0000 (11:47 +0200)]
Optimize DrawCircleClippedPic when drawing full image

6 months agoMerge branch 'martin-t/deglob-log' into 'master'
Martin Taibr [Mon, 20 Apr 2020 14:02:10 +0000 (14:02 +0000)]
Merge branch 'martin-t/deglob-log' into 'master'

Deglobalization: optional logging and clearing

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

6 months agoMerge branch 'Spike29/testing_settemp' into 'master'
Mario [Mon, 20 Apr 2020 13:20:42 +0000 (13:20 +0000)]
Merge branch 'Spike29/testing_settemp' into 'master'

Add a missing settemp in the test_blaster_switch vote

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

6 months agoAdd a missing settemp on the test_blaster_switch vote 796/head
Spike29 [Mon, 20 Apr 2020 13:09:10 +0000 (15:09 +0200)]
Add a missing settemp on the test_blaster_switch vote

6 months agoRemove now-closed merge request for proposed Crylink secondary changes
Mario [Sat, 18 Apr 2020 15:11:51 +0000 (01:11 +1000)]
Remove now-closed merge request for proposed Crylink secondary changes

6 months agoGive hud_panel_centerprint_fontscale_bold a default value matching current configs...
Mario [Sat, 18 Apr 2020 14:09:53 +0000 (00:09 +1000)]
Give hud_panel_centerprint_fontscale_bold a default value matching current configs, fixes backwards compatibility

6 months agoMove the new TE_TEI_G3_HIT effect to the bottom of effectinfo, possibly fixes issues...
Mario [Sat, 18 Apr 2020 14:02:59 +0000 (00:02 +1000)]
Move the new TE_TEI_G3_HIT effect to the bottom of effectinfo, possibly fixes issues with outdated clients

6 months agoMerge branch 'divVerent/simpler-clipped-rectangle' into 'master'
Rudolf Polzer [Sat, 18 Apr 2020 00:20:07 +0000 (00:20 +0000)]
Merge branch 'divVerent/simpler-clipped-rectangle' into 'master'

Simplify clipped circle pictures (e.g. crosshair ring).

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

6 months agoAdd a TODO note on the new flag line
Mario [Fri, 17 Apr 2020 12:49:37 +0000 (22:49 +1000)]
Add a TODO note on the new flag line

6 months agoMerge branch 'slava/pr-fix-lava-bug' into 'master'
Mario [Fri, 17 Apr 2020 12:46:55 +0000 (12:46 +0000)]
Merge branch 'slava/pr-fix-lava-bug' into 'master'

Fix bug with lava and flag

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

6 months agoCheck joinAllowed again before actually joining, fixes race conditions where players...
Mario [Fri, 17 Apr 2020 12:22:49 +0000 (22:22 +1000)]
Check joinAllowed again before actually joining, fixes race conditions where players can bypass the player limit

6 months agoMerge branch 'master' into Mario/strength_stat_field 795/head
Mario [Fri, 17 Apr 2020 11:01:34 +0000 (21:01 +1000)]
Merge branch 'master' into Mario/strength_stat_field

6 months agoMerge branch 'jwinnie/bold-frag-message' into 'master'
terencehill [Thu, 16 Apr 2020 12:11:26 +0000 (12:11 +0000)]
Merge branch 'jwinnie/bold-frag-message' into 'master'

Bolder frag messages

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

6 months ago* Makes frag messages ("you fragged XXX") bigger (1.8x the size of normal centerprint...
Jeremy Potter [Thu, 16 Apr 2020 12:11:26 +0000 (12:11 +0000)]
* Makes frag messages ("you fragged XXX") bigger (1.8x the size of normal centerprint messages) and makes them bold.
* Does this by implementing a new operator in `HUD_CenterPrint` - "`^BOLD`." Put `^BOLD` at the beginning of a centerprint notification to make it bold.

6 months agoMerge branch 'martin-t/keybinder' into 'master'
terencehill [Wed, 15 Apr 2020 13:33:26 +0000 (13:33 +0000)]
Merge branch 'martin-t/keybinder' into 'master'

Keybinder cleanup

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

6 months agoKeybinder cleanup
Martin Taibr [Wed, 15 Apr 2020 13:33:26 +0000 (13:33 +0000)]
Keybinder cleanup

- remove duplicate say_team
- new category for dev binds
- add spec bind
- hide JOY* binds when joystick is not detected

- some code cleanup

6 months agoCompact (and optimize) spawnfunc(target_items) code, part 2
terencehill [Tue, 14 Apr 2020 12:33:49 +0000 (14:33 +0200)]
Compact (and optimize) spawnfunc(target_items) code, part 2

6 months agoCompact (and optimize) spawnfunc(target_items) code
terencehill [Tue, 14 Apr 2020 12:15:17 +0000 (14:15 +0200)]
Compact (and optimize) spawnfunc(target_items) code

6 months agoMerge branch 'master' into Mario/strength_stat_field
Mario [Mon, 13 Apr 2020 13:45:11 +0000 (23:45 +1000)]
Merge branch 'master' into Mario/strength_stat_field

6 months agoRemove unlisted buffs before applying enabled buffs in GiveItems, fixes buffs being...
Mario [Mon, 13 Apr 2020 13:44:46 +0000 (23:44 +1000)]
Remove unlisted buffs before applying enabled buffs in GiveItems, fixes buffs being retained through item triggers

6 months agoAttempt to separate .strength_finished and STAT(STRENGTH_FINISHED) (the former acts...
Mario [Mon, 13 Apr 2020 12:54:50 +0000 (22:54 +1000)]
Attempt to separate .strength_finished and STAT(STRENGTH_FINISHED) (the former acts as a map editor key)

6 months agoFix some missing parenthesis in autospec code
Mario [Mon, 13 Apr 2020 12:30:51 +0000 (22:30 +1000)]
Fix some missing parenthesis in autospec code

6 months agocleanup
Martin Taibr [Sun, 12 Apr 2020 18:58:18 +0000 (20:58 +0200)]
cleanup

6 months agothese categories never even existed
Martin Taibr [Sun, 12 Apr 2020 18:52:43 +0000 (20:52 +0200)]
these categories never even existed

6 months agorename
Martin Taibr [Sun, 12 Apr 2020 18:44:43 +0000 (20:44 +0200)]
rename

6 months agoimprove btn text/tooltip
Martin Taibr [Sun, 12 Apr 2020 18:40:35 +0000 (20:40 +0200)]
improve btn text/tooltip

6 months agomore cleanup
Martin Taibr [Sun, 12 Apr 2020 18:37:14 +0000 (20:37 +0200)]
more cleanup

6 months agomore cleanup
Martin Taibr [Sun, 12 Apr 2020 18:30:58 +0000 (20:30 +0200)]
more cleanup

6 months agoMerge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
Martin Taibr [Sun, 12 Apr 2020 17:56:44 +0000 (19:56 +0200)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir

6 months agocleanup slist
Martin Taibr [Sun, 12 Apr 2020 17:56:02 +0000 (19:56 +0200)]
cleanup slist

6 months agoSave a GetResource call in GiveResourceValue
terencehill [Sun, 12 Apr 2020 16:06:49 +0000 (18:06 +0200)]
Save a GetResource call in GiveResourceValue

6 months agoDon't define g_stat_ACTIVEWEAPON and stat_ACTIVEWEAPON since we don't use STAT_ACTIVE...
terencehill [Sun, 12 Apr 2020 15:57:59 +0000 (17:57 +0200)]
Don't define g_stat_ACTIVEWEAPON and stat_ACTIVEWEAPON since we don't use STAT_ACTIVEWEAPON; g_stat_<AMMO> aren't directly referenced, in case they will define them with getstati as it's the way ammo stats are currently obtained ( getstati(GetAmmoStat(ammoType)) )

6 months agoGet all the bits from STAT_ARMOR otherwise negative values are read as very high...
terencehill [Sun, 12 Apr 2020 15:44:25 +0000 (17:44 +0200)]
Get all the bits from STAT_ARMOR otherwise negative values are read as very high values

6 months agoUse correct variable names in moveplayer
terencehill [Fri, 10 Apr 2020 16:07:14 +0000 (18:07 +0200)]
Use correct variable names in moveplayer

6 months agoCompact moveplayer code
terencehill [Fri, 10 Apr 2020 15:58:07 +0000 (17:58 +0200)]
Compact moveplayer code

6 months agoFix moveplayer command examples
terencehill [Fri, 10 Apr 2020 15:55:19 +0000 (17:55 +0200)]
Fix moveplayer command examples

6 months agoSet air_finished to 0 while player is out of water instead of updating it to time...
terencehill [Thu, 9 Apr 2020 15:49:47 +0000 (17:49 +0200)]
Set air_finished to 0 while player is out of water instead of updating it to time + autocvar_g_balance_contents_drowndelay every frame.

Remove the redundant field air_finished, rename the field pointer air_finished_stat to air_finished

6 months agoFix bug with lava and flag 792/head
Slava Bacherikov [Wed, 8 Apr 2020 19:38:33 +0000 (22:38 +0300)]
Fix bug with lava and flag

6 months agoTransifex autosync
Rudolf Polzer [Wed, 8 Apr 2020 05:24:41 +0000 (07:24 +0200)]
Transifex autosync

6 months agoMerge branch 'marin-t/bot-badcvar' into 'master'
Mario [Tue, 7 Apr 2020 19:29:06 +0000 (19:29 +0000)]
Merge branch 'marin-t/bot-badcvar' into 'master'

Allow changing bot_ai_*

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

6 months agoTransifex autosync
Rudolf Polzer [Tue, 7 Apr 2020 05:24:37 +0000 (07:24 +0200)]
Transifex autosync

6 months agoImprove a comment
terencehill [Mon, 6 Apr 2020 21:46:15 +0000 (23:46 +0200)]
Improve a comment

6 months agoRevert the addition of the message "Press SPACE to enter the game" to the MOTD
terencehill [Mon, 6 Apr 2020 21:44:57 +0000 (23:44 +0200)]
Revert the addition of the message "Press SPACE to enter the game" to the MOTD

6 months agoMerge branch 'martin-t/testing-balance' into 'master'
Mario [Sun, 5 Apr 2020 17:38:26 +0000 (17:38 +0000)]
Merge branch 'martin-t/testing-balance' into 'master'

Granular testing balance using votes

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

6 months agoMerge branch 'martin-t/limit'
terencehill [Sun, 5 Apr 2020 12:28:53 +0000 (14:28 +0200)]
Merge branch 'martin-t/limit'

6 months agoFix wrong delimiter when leadlimit_and_fraglimit is 1 and fraglimit is 0
terencehill [Sun, 5 Apr 2020 12:21:33 +0000 (14:21 +0200)]
Fix wrong delimiter when leadlimit_and_fraglimit is 1 and fraglimit is 0

6 months agoClear player waypoint sprites when resetting the flag while speedrunning
Mario [Thu, 2 Apr 2020 03:32:39 +0000 (13:32 +1000)]
Clear player waypoint sprites when resetting the flag while speedrunning

6 months agoAdd a placeholder effect for keyhunt captures until engine issue #123 can be resolved
Mario [Wed, 1 Apr 2020 17:04:17 +0000 (03:04 +1000)]
Add a placeholder effect for keyhunt captures until engine issue #123 can be resolved

6 months agoFix legacy vaporizer beam effect appearing invisible in free for all gamemodes
Mario [Wed, 1 Apr 2020 16:32:24 +0000 (02:32 +1000)]
Fix legacy vaporizer beam effect appearing invisible in free for all gamemodes

6 months agoRotRegen now takes care to get resource limit too
terencehill [Wed, 1 Apr 2020 13:39:50 +0000 (15:39 +0200)]
RotRegen now takes care to get resource limit too

6 months agoMake so that CalcRotRegen (renamed to RotRegen) applies the new amount of a certain...
terencehill [Wed, 1 Apr 2020 13:31:38 +0000 (15:31 +0200)]
Make so that CalcRotRegen (renamed to RotRegen) applies the new amount of a certain resource but only if different

6 months agoAdd an option to use a server default for clients as a fallback and make use of it...
Mario [Mon, 30 Mar 2020 15:24:47 +0000 (01:24 +1000)]
Add an option to use a server default for clients as a fallback and make use of it to allow optional multijump (multijump is enabled by default but configurable on the server)

6 months agoAdd an option for servers to enable opt-in mode for dodging using the cl_dodging...
Mario [Mon, 30 Mar 2020 15:13:31 +0000 (01:13 +1000)]
Add an option for servers to enable opt-in mode for dodging using the cl_dodging setting (off by default), allows servers to provide dodging optionally without forcing it on everyone

6 months agoDisable client prediction when in follow mode (impossible to predict)
Mario [Mon, 30 Mar 2020 13:43:59 +0000 (23:43 +1000)]
Disable client prediction when in follow mode (impossible to predict)

6 months agoTransifex autosync
Rudolf Polzer [Mon, 30 Mar 2020 05:25:19 +0000 (07:25 +0200)]
Transifex autosync

6 months agoUpdate hash
terencehill [Sun, 29 Mar 2020 18:38:42 +0000 (20:38 +0200)]
Update hash

6 months agoMerge branch 'master' into terencehill/bot_ai 776/head
terencehill [Sun, 29 Mar 2020 15:13:36 +0000 (17:13 +0200)]
Merge branch 'master' into terencehill/bot_ai

6 months agoMerge branch 'terencehill/cl_eventchase_death_2' into 'master'
Martin Taibr [Sun, 29 Mar 2020 06:16:11 +0000 (06:16 +0000)]
Merge branch 'terencehill/cl_eventchase_death_2' into 'master'

cl_eventchase_death 2 by default

* cl_eventchase_death 2 by default
* make the cl_eventchase_death checkbox toggle between 0 and 2

For a quick reference: seta cl_eventchase_death 2 "camera goes into 3rd person mode when the player is dead; set to 2 to active the effect only when the corpse doesn't move anymore"

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

6 months agoTransifex autosync
Rudolf Polzer [Sun, 29 Mar 2020 05:25:01 +0000 (07:25 +0200)]
Transifex autosync

6 months agocl_eventchase_death 2 by default; make the cl_eventchase_death checkbox toggle betwee... 787/head
terencehill [Fri, 27 Mar 2020 00:48:48 +0000 (01:48 +0100)]
cl_eventchase_death 2 by default; make the cl_eventchase_death checkbox toggle between 0 and 2

6 months agoMerge branch 'terencehill/ft_rounds' into 'master'
Martin Taibr [Sat, 28 Mar 2020 11:38:37 +0000 (11:38 +0000)]
Merge branch 'terencehill/ft_rounds' into 'master'

Freeze Tag rounds

* Announce remaining rounds (like CA)
* Base team score on rounds rather than points (like CA).
Basically it changes how scoreboard shows scoring limit (`X rounds` instead of `X points`)

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

6 months agoMerge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
Martin Taibr [Fri, 27 Mar 2020 09:12:51 +0000 (10:12 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir

6 months agoupdate information about NaN bug (fixed in DP by f96918f0280)
Martin Taibr [Fri, 27 Mar 2020 09:12:00 +0000 (10:12 +0100)]
update information about NaN bug (fixed in DP by f96918f0280)

6 months agoscoreboard: try "&" instead of "and" 786/head
Martin Taibr [Fri, 27 Mar 2020 05:45:17 +0000 (06:45 +0100)]
scoreboard: try "&" instead of "and"

6 months agooops, deleted the wrong delimiter
Martin Taibr [Fri, 27 Mar 2020 05:44:23 +0000 (06:44 +0100)]
oops, deleted the wrong delimiter

6 months agoconsistency
Martin Taibr [Thu, 26 Mar 2020 15:51:22 +0000 (16:51 +0100)]
consistency

6 months agoremove leftover comment
Martin Taibr [Thu, 26 Mar 2020 15:48:33 +0000 (16:48 +0100)]
remove leftover comment