xonotic/xonotic-data.pk3dir.git
2 months agoAllow campaigns to include configuration files in their mutator list string
Mario [Sat, 23 May 2020 10:17:40 +0000 (20:17 +1000)]
Allow campaigns to include configuration files in their mutator list string

2 months agoMerge branch 'terencehill/cl_deathglow_min' into 'master'
Mario [Sat, 23 May 2020 09:04:59 +0000 (09:04 +0000)]
Merge branch 'terencehill/cl_deathglow_min' into 'master'

Min deathglow

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

2 months agoRemove the old_glowmod field which is no longer needed now 811/head
terencehill [Fri, 22 May 2020 13:16:05 +0000 (15:16 +0200)]
Remove the old_glowmod field which is no longer needed now

2 months agoApply a workaround to ensure the player limit is returned as 2 when duel is selected...
Mario [Fri, 22 May 2020 11:15:14 +0000 (21:15 +1000)]
Apply a workaround to ensure the player limit is returned as 2 when duel is selected from the gametype vote screen

2 months agoCheck the player limit when getting player count to ensure forced spectators don...
Mario [Fri, 22 May 2020 11:00:49 +0000 (21:00 +1000)]
Check the player limit when getting player count to ensure forced spectators don't influence size restrictions (optional, enabled by default)

2 months agoMake sure cl_dodging exists on the client, fixes issues with outdated clients being...
Mario [Fri, 22 May 2020 06:53:29 +0000 (16:53 +1000)]
Make sure cl_dodging exists on the client, fixes issues with outdated clients being unable to enable dodging when it is set to opt-in

2 months agohud_panel_weapons_orderbyimpulse shouldn't be saved to hud skin files
terencehill [Thu, 21 May 2020 20:26:05 +0000 (22:26 +0200)]
hud_panel_weapons_orderbyimpulse shouldn't be saved to hud skin files

2 months agoMenu: tie Favorite and Join buttons (and pressing enter in the address input box...
terencehill [Wed, 20 May 2020 13:51:53 +0000 (15:51 +0200)]
Menu: tie Favorite and Join buttons (and pressing enter in the address input box) exclusively to the content of the address input box (if the address has been manually cleared it's no longer possible to connect to the currently selected server). It fixes #2442

2 months agoSpawn the monster at the location of the nade (don't drop to floor), fixes oddness...
Mario [Wed, 20 May 2020 11:26:42 +0000 (21:26 +1000)]
Spawn the monster at the location of the nade (don't drop to floor), fixes oddness with pokenades

2 months agoAdd a missing include for the overkill shotgun, fixes compile
Mario [Wed, 20 May 2020 10:57:54 +0000 (20:57 +1000)]
Add a missing include for the overkill shotgun, fixes compile

2 months agoFix nades not interacting properly with the overkill shotgun
Mario [Wed, 20 May 2020 10:55:15 +0000 (20:55 +1000)]
Fix nades not interacting properly with the overkill shotgun

2 months agoUpdate spawnpoints on the client side when their team is changed via reset and activation
Mario [Wed, 20 May 2020 08:55:16 +0000 (18:55 +1000)]
Update spawnpoints on the client side when their team is changed via reset and activation

2 months agoTweak the cl_deathglow effect to end with a min glow color factor (default value...
terencehill [Tue, 19 May 2020 21:38:46 +0000 (23:38 +0200)]
Tweak the cl_deathglow effect to end with a min glow color factor (default value 0.5) instead of 0. Besides black bodies weren't good looking at all for fullbright models, now players can distinguish the bodies of teammates from the bodies of enemies if the models are the same.

2 months agoFix some cases of missing parenthesis in bitflag checks
Mario [Tue, 19 May 2020 16:55:30 +0000 (02:55 +1000)]
Fix some cases of missing parenthesis in bitflag checks

2 months agoApply a workaround to avoid empty sprintf calls in the notification system, also...
Mario [Tue, 19 May 2020 15:19:33 +0000 (01:19 +1000)]
Apply a workaround to avoid empty sprintf calls in the notification system, also fix another bug in the Matrix found by FTEQCC

2 months agoFix some warnings found by FTEQCC
Mario [Tue, 19 May 2020 14:00:57 +0000 (00:00 +1000)]
Fix some warnings found by FTEQCC

2 months agoImplement support for spawnflags 32 on target_init entities, also add compatibility...
Mario [Tue, 19 May 2020 05:39:32 +0000 (15:39 +1000)]
Implement support for spawnflags 32 on target_init entities, also add compatibility for the shotgun in target_give

2 months agoFix names above players not centered if viewed from a distance greater than 1000qu
terencehill [Mon, 18 May 2020 22:05:27 +0000 (00:05 +0200)]
Fix names above players not centered if viewed from a distance greater than 1000qu

2 months agoFix name above dead players not starting to fade out from the current player's alpha...
terencehill [Mon, 18 May 2020 21:55:13 +0000 (23:55 +0200)]
Fix name above dead players not starting to fade out from the current player's alpha (what the FIXME comment I removed was stating is no longer true)

2 months agoImprove support for per-player counters by spawning an entity to store the player...
Mario [Mon, 18 May 2020 13:57:45 +0000 (23:57 +1000)]
Improve support for per-player counters by spawning an entity to store the player's counter for that trigger

2 months agoRewrite trigger_swamp to not require spawning new entities per player, implementation...
Mario [Mon, 18 May 2020 12:10:24 +0000 (22:10 +1000)]
Rewrite trigger_swamp to not require spawning new entities per player, implementation based on conveyor code. Removes need to network the swamp to the client, improving prediction and reducing network usage, also solves the swamp effect staying attached to the player for a second after they leave the swamp

2 months agoFix trigger_swamp timer using the wrong field
Mario [Mon, 18 May 2020 10:30:39 +0000 (20:30 +1000)]
Fix trigger_swamp timer using the wrong field

2 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

2 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

2 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

2 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

2 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

2 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

2 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

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

2 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)

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

2 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

2 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"

2 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)

2 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"

2 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

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

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

2 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)

2 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

2 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

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

2 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"

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

3 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

3 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

3 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

3 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

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

3 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

3 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

3 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.

3 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

3 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)

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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.

3 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

3 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

3 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

3 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

3 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

3 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

3 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)

3 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

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

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

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

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

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

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

3 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

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

3 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

3 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)) )

3 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

3 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

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

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

3 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

3 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

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

4 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

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

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

4 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

4 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

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