xonotic/xonotic-data.pk3dir.git
22 months agoMerge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Mon, 5 Feb 2018 17:08:43 +0000 (20:08 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

22 months agoCall w_ready on weapon entity if its state isn't clear and switchweapon is null,...
Mario [Mon, 5 Feb 2018 12:43:08 +0000 (22:43 +1000)]
Call w_ready on weapon entity if its state isn't clear and switchweapon is null, fixes offhand hook getting player stuck in firing animation

22 months agoAdd a note to the nextmap vote parser
Mario [Sun, 4 Feb 2018 16:28:07 +0000 (02:28 +1000)]
Add a note to the nextmap vote parser

22 months agoParse and autocomplete nextmap vote
Mario [Sun, 4 Feb 2018 14:14:47 +0000 (00:14 +1000)]
Parse and autocomplete nextmap vote

22 months agoWhitelist antiwall_flag
Mario [Sun, 4 Feb 2018 06:31:39 +0000 (16:31 +1000)]
Whitelist antiwall_flag

22 months agoTransifex autosync
Rudolf Polzer [Sun, 4 Feb 2018 06:24:54 +0000 (07:24 +0100)]
Transifex autosync

22 months agoAllow trigger_relay to be disabled (time to get logical up in here)
Mario [Sat, 3 Feb 2018 12:37:42 +0000 (22:37 +1000)]
Allow trigger_relay to be disabled (time to get logical up in here)

22 months agoTransifex autosync
Rudolf Polzer [Sat, 3 Feb 2018 06:24:55 +0000 (07:24 +0100)]
Transifex autosync

22 months agoAdd a batch mode for transifex sync (don't call out to vim but just ignore anything...
Rudolf Polzer [Fri, 2 Feb 2018 23:00:10 +0000 (00:00 +0100)]
Add a batch mode for transifex sync (don't call out to vim but just ignore anything that can't be merged).

22 months agoSomething beautiful sounding (pitch-shift monster sounds based on their scale) 522/head
Mario [Fri, 2 Feb 2018 03:22:41 +0000 (13:22 +1000)]
Something beautiful sounding (pitch-shift monster sounds based on their scale)

22 months agoUpdate hash
Mario [Fri, 2 Feb 2018 01:51:30 +0000 (11:51 +1000)]
Update hash

22 months agoWhitelist a few spawnfunc fields for func_breakable
Mario [Thu, 1 Feb 2018 18:24:34 +0000 (04:24 +1000)]
Whitelist a few spawnfunc fields for func_breakable

22 months agoAllow setting no delay on trigger_heal
Mario [Thu, 1 Feb 2018 17:38:01 +0000 (03:38 +1000)]
Allow setting no delay on trigger_heal

22 months agoFix trigger_delay not saving the activator and trigger, add a spawnflag to trigger_co...
Mario [Thu, 1 Feb 2018 17:31:34 +0000 (03:31 +1000)]
Fix trigger_delay not saving the activator and trigger, add a spawnflag to trigger_counter to make it activate at every step, not just when the sequence is completed, add a delay field to trigger_heal to control how quickly the player is healed

22 months agoGive trigger_heal a spawnflag to always play the healing sound when activated, regard...
Mario [Thu, 1 Feb 2018 17:00:29 +0000 (03:00 +1000)]
Give trigger_heal a spawnflag to always play the healing sound when activated, regardless of whether player actually gained health from it

22 months agoFix debris changing the func_breakable's velocity instead of its own when multiplying...
Mario [Thu, 1 Feb 2018 16:34:08 +0000 (02:34 +1000)]
Fix debris changing the func_breakable's velocity instead of its own when multiplying by force

22 months agoAlso bound the speed reduction
Mario [Thu, 1 Feb 2018 13:58:32 +0000 (23:58 +1000)]
Also bound the speed reduction

22 months agoAdd cvars to control the minimum and maximum speed multiplier while spectating
Mario [Thu, 1 Feb 2018 13:50:24 +0000 (23:50 +1000)]
Add cvars to control the minimum and maximum speed multiplier while spectating

22 months agoCampaign, LMS level: end game as soon as player loses; it fixes #1857
terencehill [Wed, 31 Jan 2018 15:15:58 +0000 (16:15 +0100)]
Campaign, LMS level: end game as soon as player loses; it fixes #1857

22 months agoSimplify / clean up WinningCondition_LMS
terencehill [Wed, 31 Jan 2018 15:10:15 +0000 (16:10 +0100)]
Simplify / clean up WinningCondition_LMS

22 months agoClean up trigger_counter's code so it doesn't abuse trigger_multiple's functions...
Mario [Wed, 31 Jan 2018 11:56:03 +0000 (21:56 +1000)]
Clean up trigger_counter's code so it doesn't abuse trigger_multiple's functions (probably fixes some weird bugs), also give it a respawntime key for reactivating the counter

22 months agoRewrite a code block so that it doesn't look like it depends on the above if condition
terencehill [Mon, 29 Jan 2018 16:27:29 +0000 (17:27 +0100)]
Rewrite a code block so that it doesn't look like it depends on the above if condition

22 months agoDon't allow free movement while on ladders
Mario [Sat, 27 Jan 2018 15:31:23 +0000 (01:31 +1000)]
Don't allow free movement while on ladders

22 months agoAdd a free movement spawnflag to viewlocation to allow forward and backward travel...
Mario [Sat, 27 Jan 2018 11:21:21 +0000 (21:21 +1000)]
Add a free movement spawnflag to viewlocation to allow forward and backward travel in side-scrolling mode (like brawlers)

22 months agoWhen game is frozen and player is drowning or inside lava don't damage them (don...
terencehill [Thu, 25 Jan 2018 19:17:54 +0000 (20:17 +0100)]
When game is frozen and player is drowning or inside lava don't damage them (don't play effect sounds as well)

22 months agoMake sure water state is reset when player respawns; it fixes#1959 "Player gets damag...
terencehill [Thu, 25 Jan 2018 19:09:03 +0000 (20:09 +0100)]
Make sure water state is reset when player respawns; it fixes#1959 "Player gets damage at match start when he ends warmup in lava" if sv _ready_restart_after_countdown 1 &&  g_spawnshieldtime 0

22 months agoAfter the end of the match all bots stay unless all human players disconnect; it...
terencehill [Tue, 23 Jan 2018 15:27:41 +0000 (16:27 +0100)]
After the end of the match all bots stay unless all human players disconnect; it fixes #1967

22 months agoSlightly better workaround for the permanent bot spectator issue
terencehill [Tue, 23 Jan 2018 15:21:21 +0000 (16:21 +0100)]
Slightly better workaround for the permanent bot spectator issue

22 months agoAdd an option to use the viewlocation first position's angles for the viewing angle...
Mario [Mon, 22 Jan 2018 20:17:33 +0000 (06:17 +1000)]
Add an option to use the viewlocation first position's angles for the viewing angle, and enable it by default

22 months agoGet rid of a useless variable, there's the autocvar
terencehill [Mon, 22 Jan 2018 15:41:40 +0000 (16:41 +0100)]
Get rid of a useless variable, there's the autocvar

22 months agoAnticipate bot_wander_enable check
terencehill [Mon, 22 Jan 2018 15:38:33 +0000 (16:38 +0100)]
Anticipate bot_wander_enable check

22 months agoDon't even try to unstuck bots if there are no user generated waypoints; it fixes...
terencehill [Mon, 22 Jan 2018 15:15:12 +0000 (16:15 +0100)]
Don't even try to unstuck bots if there are no user generated waypoints; it fixes #953

22 months agoUpdate hash
terencehill [Mon, 22 Jan 2018 13:19:30 +0000 (14:19 +0100)]
Update hash

22 months agoMerge branch 'terencehill/bot_ai' into 'master'
Mario [Mon, 22 Jan 2018 11:28:22 +0000 (11:28 +0000)]
Merge branch 'terencehill/bot_ai' into 'master'

Bot AI improvements

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

22 months agoMerge branch 'Lyberta/RSWFix' into 'master'
Mario [Sun, 21 Jan 2018 07:23:19 +0000 (07:23 +0000)]
Merge branch 'Lyberta/RSWFix' into 'master'

Disabled giving random start weapons in incompatible mutators

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

22 months agoDisabled random start weapons in Melee only and NIX. 519/head
Lyberta [Sun, 21 Jan 2018 07:05:42 +0000 (10:05 +0300)]
Disabled random start weapons in Melee only and NIX.

22 months agoMerge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Sun, 21 Jan 2018 03:10:28 +0000 (06:10 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

22 months agoRenamed ShouldGiveRandomStartWeapons to ForbidRandomStartWeapons.
Lyberta [Sun, 21 Jan 2018 03:00:22 +0000 (06:00 +0300)]
Renamed ShouldGiveRandomStartWeapons to ForbidRandomStartWeapons.

22 months agoMerge branch 'master' into Lyberta/RSWFix
Lyberta [Sun, 21 Jan 2018 02:51:40 +0000 (05:51 +0300)]
Merge branch 'master' into Lyberta/RSWFix

22 months agoMerge branch 'Lyberta/OKRPCSpawnFix' into 'master'
Mario [Sun, 21 Jan 2018 00:42:31 +0000 (00:42 +0000)]
Merge branch 'Lyberta/OKRPCSpawnFix' into 'master'

Fixed RPC not spawning in Overkill.

Closes #1972

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

22 months agoMerge branch 'Lyberta/InstagibNoalignFix' into 'master'
Mario [Sun, 21 Jan 2018 00:37:25 +0000 (00:37 +0000)]
Merge branch 'Lyberta/InstagibNoalignFix' into 'master'

Fixed noalign handling in Instagib.

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

22 months agoBOT AI: Sometimes bot is pushed so hard (by a jumppad or a shot) that ends up touchin... 513/head
terencehill [Sat, 20 Jan 2018 19:20:55 +0000 (20:20 +0100)]
BOT AI: Sometimes bot is pushed so hard (by a jumppad or a shot) that ends up touching the next teleport / jumppad / warpzone present in its path skipping check of one or more goals: if so immediately fix bot path by removing skipped goals

22 months agoBot AI: as for jumppad waypoint, remove ambiguity from touch check of teleport /...
terencehill [Sat, 20 Jan 2018 18:26:42 +0000 (19:26 +0100)]
Bot AI: as for jumppad waypoint, remove ambiguity from touch check of teleport / warpzone waypoints too

22 months agoFixed noalign handling in Instagib. 520/head
Lyberta [Sat, 20 Jan 2018 16:11:26 +0000 (19:11 +0300)]
Fixed noalign handling in Instagib.

22 months agoMake side-scrolling aiming much more accurate and use regular crosshairs instead...
Mario [Sat, 20 Jan 2018 05:57:30 +0000 (15:57 +1000)]
Make side-scrolling aiming much more accurate and use regular crosshairs instead of a cursor

22 months agoDouble check g_physics_clientselect_default
Mario [Thu, 18 Jan 2018 13:12:30 +0000 (23:12 +1000)]
Double check g_physics_clientselect_default

22 months agoUndo last attempt
Mario [Thu, 18 Jan 2018 13:10:23 +0000 (23:10 +1000)]
Undo last attempt

22 months agoAttempt to optimise physics valid checking by using a custom word checker
Mario [Thu, 18 Jan 2018 12:50:10 +0000 (22:50 +1000)]
Attempt to optimise physics valid checking by using a custom word checker

22 months agoOptimise nade code slightly
Mario [Thu, 18 Jan 2018 12:13:03 +0000 (22:13 +1000)]
Optimise nade code slightly

22 months agoFix compilation broken by the previous merge commit
terencehill [Mon, 15 Jan 2018 17:25:42 +0000 (18:25 +0100)]
Fix compilation broken by the previous merge commit

22 months agoMerge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
terencehill [Mon, 15 Jan 2018 16:57:12 +0000 (17:57 +0100)]
Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/server/mutators/mutator/gamemode_race.qc

22 months agoAllow dual wielding crylink (not as broken as it seemed)
Mario [Mon, 15 Jan 2018 09:03:19 +0000 (19:03 +1000)]
Allow dual wielding crylink (not as broken as it seemed)

22 months agoMake simple items bob
Mario [Sun, 14 Jan 2018 23:31:00 +0000 (09:31 +1000)]
Make simple items bob

22 months agoBot AI: workaround for untouchable race checkpoints that cause bot to get stuck ... 442/head
terencehill [Sun, 14 Jan 2018 17:01:32 +0000 (18:01 +0100)]
Bot AI: workaround for untouchable race checkpoints that cause bot to get stuck (e.g. in front of Stormkeep's warpzone)

22 months agoRemove wrong waypoint_spawn description -- automatic linking feature was removed...
terencehill [Sun, 14 Jan 2018 14:47:55 +0000 (15:47 +0100)]
Remove wrong waypoint_spawn description -- automatic linking feature was removed long time ago but who did it forgot to update the function description

22 months agoBot waypoints: on map start relink autogenerated waypoints for items if they are...
terencehill [Sat, 13 Jan 2018 21:18:32 +0000 (22:18 +0100)]
Bot waypoints: on map start relink autogenerated waypoints for items if they are unlinked and save waypoint links. It automatically fixes waypoints previously automatically updated (or manually saved by the user) without ctf flag links if the map is started in DM mode

22 months agoFix very minor issues
terencehill [Sat, 13 Jan 2018 21:02:16 +0000 (22:02 +0100)]
Fix very minor issues

22 months agoDisabled giving random start weapons in Instagib and Overkill.
Lyberta [Sat, 13 Jan 2018 06:15:53 +0000 (09:15 +0300)]
Disabled giving random start weapons in Instagib and Overkill.

22 months agoMerge branch 'Lyberta/OKRPCSpawnFix' into Lyberta/StandaloneOverkillWeapons
Lyberta [Sat, 13 Jan 2018 03:44:05 +0000 (06:44 +0300)]
Merge branch 'Lyberta/OKRPCSpawnFix' into Lyberta/StandaloneOverkillWeapons

22 months agoFixed RPC not spawning in Overkill. 518/head
Lyberta [Sat, 13 Jan 2018 03:38:37 +0000 (06:38 +0300)]
Fixed RPC not spawning in Overkill.

23 months agoDon't automatically update outdated Assault waypoint links since all objectives but...
terencehill [Thu, 11 Jan 2018 15:02:58 +0000 (16:02 +0100)]
Don't automatically update outdated Assault waypoint links since all objectives but last one need to be destroyed before saving them

23 months agoSince maps supporting race can be different when this gametype is active (2 of 3...
terencehill [Wed, 10 Jan 2018 21:25:28 +0000 (22:25 +0100)]
Since maps supporting race can be different when this gametype is active (2 of 3 official maps: stormkeep and courtfun) save race bot waypoints / links to different files. When mapname.race.waypoints.* are not present waypoints are loaded from default files to ensure compatibility with existing race-only maps waypoints

23 months agoMerge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Mon, 8 Jan 2018 16:07:28 +0000 (19:07 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

23 months agoImprove default scoreboard columns
Mirio [Thu, 4 Jan 2018 16:14:14 +0000 (17:14 +0100)]
Improve default scoreboard columns

23 months agoProperly support team field on trigger_multiple
Mario [Thu, 4 Jan 2018 02:17:27 +0000 (12:17 +1000)]
Properly support team field on trigger_multiple

23 months agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Wed, 3 Jan 2018 15:25:39 +0000 (16:25 +0100)]
Merge branch 'master' into terencehill/bot_waypoints

23 months agoBot AI: fix ambiguous jumppad touch detection
terencehill [Tue, 2 Jan 2018 19:23:20 +0000 (20:23 +0100)]
Bot AI: fix ambiguous jumppad touch detection

23 months agoDon't draw viewlocation cursor or force angles as a spectator
Mario [Mon, 1 Jan 2018 14:17:00 +0000 (00:17 +1000)]
Don't draw viewlocation cursor or force angles as a spectator

23 months agoHopefully fix compilation unit
Mario [Mon, 1 Jan 2018 09:17:08 +0000 (19:17 +1000)]
Hopefully fix compilation unit

23 months agoMerge branch 'Player_2/ScrollingCamera' into 'master'
Mario [Mon, 1 Jan 2018 05:58:56 +0000 (05:58 +0000)]
Merge branch 'Player_2/ScrollingCamera' into 'master'

Cleaned up viewloc.qc and added free-aiming cursor support.

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

23 months agoCleaned up viewloc.qc and added free-aiming cursor support. 516/head
Micah Talkiewicz [Mon, 1 Jan 2018 05:42:22 +0000 (00:42 -0500)]
Cleaned up viewloc.qc and added free-aiming cursor support.

23 months agoImprove destination waypoint generation of jumppads with a high horizontal push....
terencehill [Sun, 31 Dec 2017 17:06:55 +0000 (18:06 +0100)]
Improve destination waypoint generation of jumppads with a high horizontal push. It fixes jumppad to jumppad to strength and jumppad to vortex in the map The Yard

23 months agoMerge branch 'Lyberta/BlockInstagibPowerups' into 'master'
Mirio [Sun, 31 Dec 2017 14:54:53 +0000 (14:54 +0000)]
Merge branch 'Lyberta/BlockInstagibPowerups' into 'master'

Made Invisibility and Speed to be instagib only for now.

Closes #1970

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

23 months agoMerge branch 'typo' into 'master'
Mirio [Sun, 31 Dec 2017 12:37:10 +0000 (12:37 +0000)]
Merge branch 'typo' into 'master'

Fix typo

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

23 months agoFix powerups abusing the count field for respawn counters (breaks compatibility with...
Mario [Sun, 31 Dec 2017 01:41:26 +0000 (11:41 +1000)]
Fix powerups abusing the count field for respawn counters (breaks compatibility with Quake 3 entities)

23 months agoFix broken automatic waypoint generation for jumppads really close to other jumppads...
terencehill [Sat, 30 Dec 2017 18:55:45 +0000 (19:55 +0100)]
Fix broken automatic waypoint generation for jumppads really close to other jumppads (e.g. the row of 3 jumppads in Runningman)

23 months agoFix typo 515/head
packer- [Sat, 30 Dec 2017 18:11:43 +0000 (18:11 +0000)]
Fix typo

23 months agoMade Invisibility and Speed to be instagib only for now. 514/head
Lyberta [Sat, 30 Dec 2017 18:06:59 +0000 (21:06 +0300)]
Made Invisibility and Speed to be instagib only for now.

23 months agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Sat, 30 Dec 2017 17:54:49 +0000 (18:54 +0100)]
Merge branch 'master' into terencehill/bot_waypoints

23 months agoOffset 3rd person grappling hook by player's view offset
Mario [Sat, 30 Dec 2017 06:27:06 +0000 (16:27 +1000)]
Offset 3rd person grappling hook by player's view offset

23 months agoFix stuck reticle in side-scrolling mode, and partially fix aiming in free-aim side...
Mario [Sat, 30 Dec 2017 06:24:20 +0000 (16:24 +1000)]
Fix stuck reticle in side-scrolling mode, and partially fix aiming in free-aim side-scrolling mode

23 months agoExclude mortar from dual wielding (bouncing grenades don't collide well)
Mario [Sat, 30 Dec 2017 01:59:03 +0000 (11:59 +1000)]
Exclude mortar from dual wielding (bouncing grenades don't collide well)

23 months agoBot AI: grouped small health/armor: avoid multiple costly calls of path finding code...
terencehill [Thu, 28 Dec 2017 18:09:31 +0000 (19:09 +0100)]
Bot AI: grouped small health/armor: avoid multiple costly calls of path finding code that selects one of the closest item of the group by telling the bot to head directly to the farthest item as soon as bot picks the first item up

23 months agoSince viewlocation only applies to players, use a much cheaper loop through clients
Mario [Wed, 27 Dec 2017 14:41:56 +0000 (00:41 +1000)]
Since viewlocation only applies to players, use a much cheaper loop through clients

23 months agoHopefully fix compilation unit
Mario [Wed, 27 Dec 2017 08:13:00 +0000 (18:13 +1000)]
Hopefully fix compilation unit

23 months agoAdd a spawnflag to allow free aiming in side-scrolling mode
Mario [Wed, 27 Dec 2017 06:25:39 +0000 (16:25 +1000)]
Add a spawnflag to allow free aiming in side-scrolling mode

23 months agoCompilation units test fix + comment
terencehill [Tue, 26 Dec 2017 23:06:19 +0000 (00:06 +0100)]
Compilation units test fix + comment

23 months agoWhen chase_active is enabled either way, force player position for hook origin
Mario [Wed, 27 Dec 2017 00:28:59 +0000 (10:28 +1000)]
When chase_active is enabled either way, force player position for hook origin

23 months agoReload all weapon slots regardless of g_weaponswitch_debug setting
Mario [Tue, 26 Dec 2017 14:09:06 +0000 (00:09 +1000)]
Reload all weapon slots regardless of g_weaponswitch_debug setting

23 months agoReduce potential lag by only looping through a limited number of items (may increase...
Mario [Tue, 26 Dec 2017 13:40:12 +0000 (23:40 +1000)]
Reduce potential lag by only looping through a limited number of items (may increase the number of tries later if needed)

23 months agoFix compile
Mario [Tue, 26 Dec 2017 11:34:39 +0000 (21:34 +1000)]
Fix compile

23 months agoMuffle weapon sounds slightly while dual wielding (ugly hax)
Mario [Tue, 26 Dec 2017 11:17:33 +0000 (21:17 +1000)]
Muffle weapon sounds slightly while dual wielding (ugly hax)

23 months agoTo be extra safe, also make sure it isn't an electro orb from another player
Mario [Tue, 26 Dec 2017 10:18:18 +0000 (20:18 +1000)]
To be extra safe, also make sure it isn't an electro orb from another player

23 months agoFix electro orbs sticking to eachother in some cases
Mario [Tue, 26 Dec 2017 10:16:10 +0000 (20:16 +1000)]
Fix electro orbs sticking to eachother in some cases

23 months agoExclude rifle from dual wielding
Mario [Tue, 26 Dec 2017 00:18:29 +0000 (10:18 +1000)]
Exclude rifle from dual wielding

23 months agoTest correct destination point
terencehill [Sun, 24 Dec 2017 17:49:28 +0000 (18:49 +0100)]
Test correct destination point

23 months agoMerge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill...
terencehill [Sun, 24 Dec 2017 17:47:43 +0000 (18:47 +0100)]
Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/common/triggers/trigger/jumppads.qc

23 months agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Sat, 23 Dec 2017 17:51:09 +0000 (18:51 +0100)]
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# qcsrc/common/triggers/trigger/jumppads.qc
# qcsrc/common/triggers/trigger/jumppads.qh

23 months agoFix selected maps in the menu not being saved
Mario [Sat, 23 Dec 2017 13:47:12 +0000 (23:47 +1000)]
Fix selected maps in the menu not being saved

23 months agoFix wrong jumppad push when entity that is to be pushed has a gravity factor differen...
terencehill [Fri, 22 Dec 2017 23:16:47 +0000 (00:16 +0100)]
Fix wrong jumppad push when entity that is to be pushed has a gravity factor different from 1