]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
6 years agoMerge branch 'master' into Mario/monsters
Mario [Mon, 22 Jan 2018 20:19:30 +0000 (06:19 +1000)]
Merge branch 'master' into Mario/monsters

6 years 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

6 years 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

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

6 years 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

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

6 years 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

6 years 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

6 years 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.

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

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

6 years 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

6 years 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

6 years agoBOT AI: Sometimes bot is pushed so hard (by a jumppad or a shot) that ends up touchin...
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

6 years 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

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

6 years agoMerge branch 'master' into Mario/monsters
Mario [Sat, 20 Jan 2018 13:31:17 +0000 (23:31 +1000)]
Merge branch 'master' into Mario/monsters

6 years 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

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

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

6 years 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

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

6 years agoDon't make monsters affected by player clips by default (separate option exists)
Mario [Wed, 17 Jan 2018 03:10:51 +0000 (13:10 +1000)]
Don't make monsters affected by player clips by default (separate option exists)

6 years agoMerge branch 'master' into Mario/monsters
Mario [Wed, 17 Jan 2018 03:09:26 +0000 (13:09 +1000)]
Merge branch 'master' into Mario/monsters

6 years 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

6 years 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

6 years 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)

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

6 years agoBot AI: workaround for untouchable race checkpoints that cause bot to get stuck ...
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)

6 years 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

6 years 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

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

6 years 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.

6 years 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.

6 years 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

6 years 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

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

6 years 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

6 years 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

6 years 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

6 years 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

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

6 years agoMerge branch 'master' into Mario/monsters
Mario [Mon, 1 Jan 2018 06:50:05 +0000 (16:50 +1000)]
Merge branch 'master' into Mario/monsters

6 years 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

6 years 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.

6 years 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

6 years 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

6 years 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

6 years 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)

6 years 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)

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

6 years 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.

6 years 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

6 years 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

6 years 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

6 years 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)

6 years agoMerge branch 'master' into Mario/monsters
Mario [Fri, 29 Dec 2017 10:16:19 +0000 (20:16 +1000)]
Merge branch 'master' into Mario/monsters

6 years 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

6 years 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

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

6 years 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

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

6 years 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

6 years 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

6 years 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)

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

6 years 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)

6 years 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

6 years 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

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

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

6 years 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

6 years 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

6 years 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

6 years 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

6 years agoBot AI: properly update goal when the item bot is moving to gets attached to a player...
terencehill [Mon, 11 Dec 2017 23:18:46 +0000 (00:18 +0100)]
Bot AI: properly update goal when the item bot is moving to gets attached to a player (e.g. CTF flag)

6 years agoRemove nearest waypoint of dynamic goals very close to them without further tests...
terencehill [Mon, 11 Dec 2017 23:16:34 +0000 (00:16 +0100)]
Remove nearest waypoint of dynamic goals very close to them without further tests (e.g. CTF flag on its own base)

6 years agoFix another minor bug in navigation_get_really_close_waypoint
terencehill [Mon, 11 Dec 2017 22:03:01 +0000 (23:03 +0100)]
Fix another minor bug in navigation_get_really_close_waypoint

6 years agoFix bug in navigation_get_really_close_waypoint
terencehill [Mon, 11 Dec 2017 17:40:04 +0000 (18:40 +0100)]
Fix bug in navigation_get_really_close_waypoint

6 years agoRemove unused return value from bot_aimdir
terencehill [Mon, 11 Dec 2017 14:50:22 +0000 (15:50 +0100)]
Remove unused return value from bot_aimdir

6 years agoBot AI: improve bot's ability to walk obstacles up: 1) check obstacles in the bot...
terencehill [Wed, 6 Dec 2017 18:49:16 +0000 (19:49 +0100)]
Bot AI: improve bot's ability to walk obstacles up: 1) check obstacles in the bot's desired direction rather than in the actual movement direction (velocity) which is not correct when bot turns or gets hit by an enemy; 2) don't check for obstacles further than bot's final goal or teleporter

6 years agoMerge branch 'DefaultUser/HUD_teamkill_position' into 'master'
Mario [Sun, 3 Dec 2017 06:43:42 +0000 (06:43 +0000)]
Merge branch 'DefaultUser/HUD_teamkill_position' into 'master'

Scoreboard: Fix position of "teamkills" field

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

6 years agoRemove some unused cvar from config
Mario [Sun, 3 Dec 2017 06:43:17 +0000 (16:43 +1000)]
Remove some unused cvar from config

6 years agoMerge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill...
terencehill [Sat, 2 Dec 2017 21:36:00 +0000 (22:36 +0100)]
Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/server/bot/default/navigation.qh

6 years agoMerge branch 'Lyberta/TeamplayFixes2' into 'master'
Mario [Sat, 2 Dec 2017 16:22:13 +0000 (16:22 +0000)]
Merge branch 'Lyberta/TeamplayFixes2' into 'master'

Hardening of several teamplay functions.

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

6 years agoScoreboard: Fix position of "teamkills" field 510/head
Freddy [Sat, 2 Dec 2017 16:12:04 +0000 (17:12 +0100)]
Scoreboard: Fix position of "teamkills" field

6 years agoMerge branch 'master' into Lyberta/TeamplayFixes2 507/head
Lyberta [Sat, 2 Dec 2017 15:51:57 +0000 (18:51 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes2

6 years agoRevert "Increase tracewalk destination height to include player's height; it fixes...
terencehill [Sat, 2 Dec 2017 13:47:59 +0000 (14:47 +0100)]
Revert "Increase tracewalk destination height to include player's height; it fixes bots not being able to reach items and jumppads too high above their head" because it's wrong (it fixed some Space Eleveator's jumppads but led bots to think they could reach unreachable jumppads, e.g. Atelier's jumppad next to Strength)

This reverts commit 6b3f7d6fc917129765479348a8b3957c50af09d9.

6 years agoMerge branch 'Lyberta/NoalignFix' into 'master'
Mario [Sat, 2 Dec 2017 02:01:45 +0000 (02:01 +0000)]
Merge branch 'Lyberta/NoalignFix' into 'master'

Fixed noalign handling in random items and overkill.

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

6 years agoFixed AutoBalanceBots fully this time.
Lyberta [Fri, 1 Dec 2017 20:11:48 +0000 (23:11 +0300)]
Fixed AutoBalanceBots fully this time.

6 years agoFixed noalign handling in random items and overkill. 509/head
Lyberta [Fri, 1 Dec 2017 18:40:33 +0000 (21:40 +0300)]
Fixed noalign handling in random items and overkill.

6 years agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Fri, 1 Dec 2017 14:39:56 +0000 (15:39 +0100)]
Merge branch 'master' into terencehill/bot_waypoints

6 years agoAlways link edict for clients (matches engine physics)
Mario [Fri, 1 Dec 2017 14:09:17 +0000 (00:09 +1000)]
Always link edict for clients (matches engine physics)

6 years agoMerge branch 'Lyberta/target_giveFix' into 'master'
Mario [Fri, 1 Dec 2017 06:43:36 +0000 (06:43 +0000)]
Merge branch 'Lyberta/target_giveFix' into 'master'

target_give now uses new classnames.

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

6 years agotarget_give now uses new classnames. 508/head
Lyberta [Fri, 1 Dec 2017 06:23:45 +0000 (09:23 +0300)]
target_give now uses new classnames.

6 years agoDon't update the weapon's classname on spawn (we still need the old name for compatib...
Mario [Fri, 1 Dec 2017 01:50:49 +0000 (11:50 +1000)]
Don't update the weapon's classname on spawn (we still need the old name for compatibility)

6 years agoAntilag nades so they can be shot at high ping
Mario [Wed, 29 Nov 2017 07:18:39 +0000 (17:18 +1000)]
Antilag nades so they can be shot at high ping

6 years agoGrammar fix.
Lyberta [Tue, 28 Nov 2017 10:10:13 +0000 (13:10 +0300)]
Grammar fix.

6 years agoMerge branch 'master' into Lyberta/TeamplayFixes2
Lyberta [Tue, 28 Nov 2017 09:45:24 +0000 (12:45 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes2

6 years agoHardening of several teamplay functions.
Lyberta [Tue, 28 Nov 2017 09:20:05 +0000 (12:20 +0300)]
Hardening of several teamplay functions.