]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
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 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 '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 agoMerge branch 'Mario/target_teleporter_v2' into 'master'
Mario [Mon, 27 Nov 2017 01:29:57 +0000 (01:29 +0000)]
Merge branch 'Mario/target_teleporter_v2' into 'master'

Merge branch Mario/target_teleporter_v2 (S merge request)

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

6 years agoFix compilation unit test (hopefully)
Mario [Sun, 26 Nov 2017 13:34:19 +0000 (23:34 +1000)]
Fix compilation unit test (hopefully)

6 years agoFix the field 0 warning spam at the start of every match
Mario [Sun, 26 Nov 2017 12:45:13 +0000 (22:45 +1000)]
Fix the field 0 warning spam at the start of every match

6 years agoTake armor into consideration for the crosshair color by health
Mario [Sat, 25 Nov 2017 10:26:31 +0000 (20:26 +1000)]
Take armor into consideration for the crosshair color by health

6 years agoMerge branch 'DefaultUser/kick_teamkiller' into 'master'
Mario [Sat, 25 Nov 2017 06:51:10 +0000 (06:51 +0000)]
Merge branch 'DefaultUser/kick_teamkiller' into 'master'

Add a mutator to automatically kick teamkilling trolls after a certain amount of teamkills

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

6 years agoMerge branch 'master' into DefaultUser/kick_teamkiller
Mario [Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)]
Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
# mutators.cfg

6 years agoMerge branch 'Lyberta/RandomItems' into 'master'
Mario [Sat, 25 Nov 2017 03:35:58 +0000 (03:35 +0000)]
Merge branch 'Lyberta/RandomItems' into 'master'

Random items mutator and item system revamp

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

6 years agoMerge branch 'master' into Lyberta/RandomItems
Mario [Sat, 25 Nov 2017 03:24:47 +0000 (13:24 +1000)]
Merge branch 'master' into Lyberta/RandomItems

# Conflicts:
# mutators.cfg

6 years agoRandom items: Split most cvars into separate file.
Lyberta [Sat, 25 Nov 2017 03:17:26 +0000 (06:17 +0300)]
Random items: Split most cvars into separate file.

6 years agoUpdate hash
Mario [Sat, 25 Nov 2017 02:51:49 +0000 (12:51 +1000)]
Update hash

6 years agoRandom items: Use noalign value set by mapper.
Lyberta [Sat, 25 Nov 2017 02:49:54 +0000 (05:49 +0300)]
Random items: Use noalign value set by mapper.

6 years agoRandom items: Added checks for cvar existence.
Lyberta [Sat, 25 Nov 2017 02:44:09 +0000 (05:44 +0300)]
Random items: Added checks for cvar existence.

6 years agoMerge branch 'martin-t/aesinfo' into 'master'
Mario [Sat, 25 Nov 2017 02:36:33 +0000 (02:36 +0000)]
Merge branch 'martin-t/aesinfo' into 'master'

Show tooltip mentioning crypto_aeslevel on the join dialog (tiny MR)

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

6 years agoAdded no_align option to Item_Create.
Lyberta [Sat, 25 Nov 2017 02:06:45 +0000 (05:06 +0300)]
Added no_align option to Item_Create.

6 years agoMerge branch 'master' into DefaultUser/kick_teamkiller
Mario [Sat, 25 Nov 2017 01:29:58 +0000 (11:29 +1000)]
Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
# mutators.cfg

6 years agoSCO, not SC0
Mario [Sat, 25 Nov 2017 01:28:35 +0000 (11:28 +1000)]
SCO, not SC0

6 years agoMerge branch 'TimePath/stale_move_negation' into 'master'
Mario [Sat, 25 Nov 2017 01:27:25 +0000 (01:27 +0000)]
Merge branch 'TimePath/stale_move_negation' into 'master'

Mutator: Stale-move negation

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

6 years agoMerge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'
Mario [Sat, 25 Nov 2017 01:22:01 +0000 (01:22 +0000)]
Merge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'

Add spawnflag that enables buttons to not accumulate damage

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

6 years agoMerge branch 'martin-t/okc2' into 'master'
Mario [Sat, 25 Nov 2017 01:19:47 +0000 (01:19 +0000)]
Merge branch 'martin-t/okc2' into 'master'

Overkill Casual - step 2 - dodging

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

6 years agoInclude stale-move negation's cvars in mutators.cfg
Mario [Sat, 25 Nov 2017 01:05:38 +0000 (11:05 +1000)]
Include stale-move negation's cvars in mutators.cfg

6 years agoUse start_health instead of a cvar() call to the original cvar
Mario [Sat, 25 Nov 2017 01:03:18 +0000 (11:03 +1000)]
Use start_health instead of a cvar() call to the original cvar

6 years agoMerge branch 'DefaultUser/warmup_no_GR_events' into 'master'
Mario [Sat, 25 Nov 2017 00:58:42 +0000 (00:58 +0000)]
Merge branch 'DefaultUser/warmup_no_GR_events' into 'master'

Don't track PlayerStat events in warmup

Closes #1961

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

6 years agoMerge branch 'master' into Lyberta/RandomItems
Lyberta [Sat, 25 Nov 2017 00:34:52 +0000 (03:34 +0300)]
Merge branch 'master' into Lyberta/RandomItems

6 years agoMerge branch 'Lyberta/TeamChangeFix' into 'master'
Mario [Sat, 25 Nov 2017 00:21:41 +0000 (00:21 +0000)]
Merge branch 'Lyberta/TeamChangeFix' into 'master'

Disallow changing to invalid team. Fixes #1964.

Closes #1964

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

6 years agoMove killindicator_teamchange out of clientstate (potentially called before clientsta...
Mario [Sat, 25 Nov 2017 00:21:17 +0000 (10:21 +1000)]
Move killindicator_teamchange out of clientstate (potentially called before clientstate is initialised, possible cause of a team change crash)

6 years agoDisallow changing to invalid team. Fixes #1964. 505/head
Lyberta [Fri, 24 Nov 2017 21:53:13 +0000 (00:53 +0300)]
Disallow changing to invalid team. Fixes #1964.

6 years agoRestore the fabs
Mario [Wed, 22 Nov 2017 04:50:25 +0000 (14:50 +1000)]
Restore the fabs

6 years agoTemporarily remove a fabs that didn't exist before (potential fix for some jumppad...
Mario [Wed, 22 Nov 2017 04:37:23 +0000 (14:37 +1000)]
Temporarily remove a fabs that didn't exist before (potential fix for some jumppad inaccuracies)

6 years agoFix another case of 'other'
Mario [Wed, 22 Nov 2017 04:35:44 +0000 (14:35 +1000)]
Fix another case of 'other'

6 years agoBot AI: if the nearest waypoint of a dynamic goal is inside the goal itself or bot...
terencehill [Tue, 21 Nov 2017 14:21:33 +0000 (15:21 +0100)]
Bot AI: if the nearest waypoint of a dynamic goal is inside the goal itself or bot won't reach it in time don't remove it from the path

6 years agoClan Arena: prevent unwanted sudden rejoin as spectator and move of spectator camera...
terencehill [Mon, 20 Nov 2017 15:59:29 +0000 (16:59 +0100)]
Clan Arena: prevent unwanted sudden rejoin as spectator and move of spectator camera when a player gets killed

6 years agoDon't display a negative 0 as acceleration value in the physics panel, make it positi...
terencehill [Mon, 20 Nov 2017 15:50:46 +0000 (16:50 +0100)]
Don't display a negative 0 as acceleration value in the physics panel, make it positive (existing workaround was broken)

6 years agoBot AI: Optimize path finding CPU cost when bot switches to certain CTF/Keepaway...
terencehill [Mon, 20 Nov 2017 15:33:51 +0000 (16:33 +0100)]
Bot AI: Optimize path finding CPU cost when bot switches to certain CTF/Keepaway roles. Also fix compilation unit test

6 years agoBot AI: if a goal is unreachable, make it not selectable as new goal for a few seconds
terencehill [Mon, 20 Nov 2017 15:10:06 +0000 (16:10 +0100)]
Bot AI: if a goal is unreachable, make it not selectable as new goal for a few seconds

6 years agoAdd an option to change jump height while crouching
Mario [Mon, 20 Nov 2017 08:04:17 +0000 (18:04 +1000)]
Add an option to change jump height while crouching

6 years agoBot AI: improve conditions for deciding whether bot can directly chase a player or...
terencehill [Sat, 18 Nov 2017 17:37:03 +0000 (18:37 +0100)]
Bot AI: improve conditions for deciding whether bot can directly chase a player or not. While chasing a player try to to keep waypoint route as long as possible, as it is safer and faster (bot can bunnyhop)

6 years agoCheck distance of the goal from the previous waypoint but 2 before removing nearest...
terencehill [Wed, 15 Nov 2017 23:44:13 +0000 (00:44 +0100)]
Check distance of the goal from the previous waypoint but 2 before removing nearest waypoint of a dynamic goal from the route

6 years agoAdd a new target_heal entity (duplicate of trigger_health, but for being targeted...
Mario [Wed, 15 Nov 2017 00:52:42 +0000 (10:52 +1000)]
Add a new target_heal entity (duplicate of trigger_health, but for being targeted instead of serving as an area of effect healing block)

6 years agoFix bug in nearest waypoint search I introduced in 01376c61cd
terencehill [Mon, 13 Nov 2017 19:15:35 +0000 (20:15 +0100)]
Fix bug in nearest waypoint search I introduced in 01376c61cd

6 years agoBot AI: check if path is walkable while chasing a player
terencehill [Fri, 10 Nov 2017 14:47:36 +0000 (15:47 +0100)]
Bot AI: check if path is walkable while chasing a player

6 years agoBot AI: if bot is closer to player than next waypoint clear route and directly chase...
terencehill [Fri, 10 Nov 2017 12:48:03 +0000 (13:48 +0100)]
Bot AI: if bot is closer to player than next waypoint clear route and directly chase the player

6 years agoAdded ITEM_FLAG_NORMAL.
Lyberta [Fri, 10 Nov 2017 11:28:11 +0000 (14:28 +0300)]
Added ITEM_FLAG_NORMAL.

6 years agoAdded ITEM_FLAG_OVERKILL.
Lyberta [Fri, 10 Nov 2017 11:09:29 +0000 (14:09 +0300)]
Added ITEM_FLAG_OVERKILL.

6 years agoAdded ITEM_FLAG_INSTAGIB.
Lyberta [Fri, 10 Nov 2017 10:24:19 +0000 (13:24 +0300)]
Added ITEM_FLAG_INSTAGIB.

6 years agoRandom items: Major refactoring.
Lyberta [Fri, 10 Nov 2017 09:56:19 +0000 (12:56 +0300)]
Random items: Major refactoring.

6 years agoBot AI: allow to find nearest waypoint of players in the air so that they can be...
terencehill [Fri, 10 Nov 2017 09:51:51 +0000 (10:51 +0100)]
Bot AI: allow to find nearest waypoint of players in the air so that they can be found when bot starts a goal search

6 years agoMake work chasing of players in the air when bot ends up under the chased player
terencehill [Fri, 10 Nov 2017 09:34:55 +0000 (10:34 +0100)]
Make work chasing of players in the air when bot ends up under the chased player

6 years agoBot AI: allow bots to chase players in the air by adjusting tracewalk destination...
terencehill [Thu, 9 Nov 2017 08:32:57 +0000 (09:32 +0100)]
Bot AI: allow bots to chase players in the air by adjusting tracewalk destination point; while at it turn 3 long macros into functions

6 years agoRandom items: Removing more useless macros.
Lyberta [Fri, 10 Nov 2017 06:07:57 +0000 (09:07 +0300)]
Random items: Removing more useless macros.

6 years agoRandom items: Removing some useless macros.
Lyberta [Thu, 9 Nov 2017 18:28:50 +0000 (21:28 +0300)]
Random items: Removing some useless macros.

6 years agoMerge branch 'master' into Lyberta/RandomItems
Lyberta [Thu, 9 Nov 2017 16:32:18 +0000 (19:32 +0300)]
Merge branch 'master' into Lyberta/RandomItems

6 years agoAdd support for target_relay and weapon_railgun in target_give
Mario [Sun, 5 Nov 2017 15:28:02 +0000 (01:28 +1000)]
Add support for target_relay and weapon_railgun in target_give

6 years agoBot AI: fix bots using waypoints to reach a player when they could go straight to...
terencehill [Sun, 5 Nov 2017 10:39:06 +0000 (11:39 +0100)]
Bot AI: fix bots using waypoints to reach a player when they could go straight to him by adjusting tracewalk destination point. Revert workaround introduced in 7d9d2113 as it's no longer needed

6 years agoWhen setting a goal as dynamic, delay nearest waypoint finding if it already exists
terencehill [Fri, 3 Nov 2017 14:50:32 +0000 (15:50 +0100)]
When setting a goal as dynamic, delay nearest waypoint finding if it already exists

6 years agoImplement goal removal when bot returns the flag in a cleaner way
terencehill [Fri, 3 Nov 2017 14:41:02 +0000 (15:41 +0100)]
Implement goal removal when bot returns the flag in a cleaner way

6 years agoBot AI: when assigning a bot frame to find a new goal prioritize bots that have just...
terencehill [Thu, 2 Nov 2017 22:17:38 +0000 (23:17 +0100)]
Bot AI: when assigning a bot frame to find a new goal prioritize bots that have just reached a goal, so that they are more responsive especially when there are many bots and they get an item in a dangerous place (e.g. mortar in Dance). Delay goal removal for bots that see an item already taken by someone else so they have a lower priority; it also helps to find a new goal more efficiently in case they touch a waypoint

6 years agoDon't assign needlessly a frame to find a new goal to dead or frozen bots as they...
terencehill [Thu, 2 Nov 2017 17:10:08 +0000 (18:10 +0100)]
Don't assign needlessly a frame to find a new goal to dead or frozen bots as they won't make use of it anyway, making the other bots a bit more responsive

6 years agoClear current bot route as soon as bot dies or gets frozen
terencehill [Thu, 2 Nov 2017 16:58:58 +0000 (17:58 +0100)]
Clear current bot route as soon as bot dies or gets frozen

6 years agoBot AI: fix bots sometimes going back and forth between a waypoint and a frozen teamm...
terencehill [Thu, 2 Nov 2017 16:56:31 +0000 (17:56 +0100)]
Bot AI: fix bots sometimes going back and forth between a waypoint and a frozen teammate instead of sticking to him to revive him

6 years agoBot AI: implement goal locking for goals that require bot to stand on the goal's...
terencehill [Tue, 31 Oct 2017 18:09:24 +0000 (19:09 +0100)]
Bot AI: implement goal locking for goals that require bot to stand on the goal's position, currently used in CTF when bot heads to his own base trying to capture flag; it fixes bot wasting a lot of CPU cycles trying to find a new goal every frame if it reaches his own base and his own flag is stolen

6 years agoBot AI: don't rate again items already rated with a higher ratingscale (currently...
terencehill [Sun, 29 Oct 2017 17:30:00 +0000 (18:30 +0100)]
Bot AI: don't rate again items already rated with a higher ratingscale (currently bots playing certain CTF roles rate items twice with different rating scale and range)

6 years agoMerge branch 'master' into martin-t/okc2
Martin Taibr [Sun, 29 Oct 2017 00:36:16 +0000 (02:36 +0200)]
Merge branch 'master' into martin-t/okc2

6 years agoAssume nearest waypoint of a bot is its current goal waypoint (good as feature but...
terencehill [Sat, 28 Oct 2017 22:47:34 +0000 (00:47 +0200)]
Assume nearest waypoint of a bot is its current goal waypoint (good as feature but also as optimization)

6 years agoBot AI: don't rate enemies running too fast for chasing them
terencehill [Sat, 28 Oct 2017 17:06:16 +0000 (19:06 +0200)]
Bot AI: don't rate enemies running too fast for chasing them

6 years agoFix cost of travel from jumppad to item
terencehill [Fri, 27 Oct 2017 19:10:57 +0000 (21:10 +0200)]
Fix cost of travel from jumppad to item

6 years agoMake bot head to the jumppad destination once it reaches the goal item
terencehill [Fri, 27 Oct 2017 18:04:26 +0000 (20:04 +0200)]
Make bot head to the jumppad destination once it reaches the goal item

6 years agoBot AI: make bots aware of items that can be reached by a standard jumppad trajectory...
terencehill [Mon, 23 Oct 2017 12:58:51 +0000 (14:58 +0200)]
Bot AI: make bots aware of items that can be reached by a standard jumppad trajectory (e.g. Boil's mega armor)

6 years agoDisable new toys weapon replacement when random items are enabled.
Lyberta [Tue, 24 Oct 2017 21:27:32 +0000 (00:27 +0300)]
Disable new toys weapon replacement when random items are enabled.

6 years agoBetter item creation code.
Lyberta [Tue, 24 Oct 2017 21:08:04 +0000 (00:08 +0300)]
Better item creation code.

6 years agoMerge branch 'master' into Lyberta/RandomItems
Lyberta [Tue, 24 Oct 2017 20:02:44 +0000 (23:02 +0300)]
Merge branch 'master' into Lyberta/RandomItems

6 years agoDon't check for firstblood if in warmup
Freddy [Tue, 24 Oct 2017 13:47:12 +0000 (15:47 +0200)]
Don't check for firstblood if in warmup

6 years agoDon't track kills-i and achievement PlayerStats events in warmup
Freddy [Tue, 24 Oct 2017 13:40:56 +0000 (15:40 +0200)]
Don't track kills-i and achievement PlayerStats events in warmup

6 years agoReduce some duplicated code
terencehill [Tue, 24 Oct 2017 08:30:12 +0000 (10:30 +0200)]
Reduce some duplicated code

6 years agoReduce indentation level of 2 functions thanks to 2 early returns
terencehill [Tue, 24 Oct 2017 07:59:55 +0000 (09:59 +0200)]
Reduce indentation level of 2 functions thanks to 2 early returns

6 years agoRename 2 macros
terencehill [Mon, 23 Oct 2017 16:41:48 +0000 (18:41 +0200)]
Rename 2 macros

6 years agoMerge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
terencehill [Tue, 17 Oct 2017 23:24:18 +0000 (01:24 +0200)]
Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai

6 years agoIncrease tracewalk destination height to include player's height; it fixes bots not...
terencehill [Tue, 17 Oct 2017 00:22:11 +0000 (02:22 +0200)]
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

6 years agoMerge branch 'master' into terencehill/bot_waypoints
terencehill [Tue, 17 Oct 2017 00:05:53 +0000 (02:05 +0200)]
Merge branch 'master' into terencehill/bot_waypoints

6 years agoRandom items: Better weapon handling.
Lyberta [Mon, 16 Oct 2017 14:11:30 +0000 (17:11 +0300)]
Random items: Better weapon handling.

6 years agoMerge branch 'master' into Lyberta/RandomItems
Lyberta [Mon, 16 Oct 2017 14:04:26 +0000 (17:04 +0300)]
Merge branch 'master' into Lyberta/RandomItems

6 years agoRandom items: Removed more macros.
Lyberta [Mon, 16 Oct 2017 12:05:09 +0000 (15:05 +0300)]
Random items: Removed more macros.

6 years agoRenamed item_invincible to item_shield.
Lyberta [Mon, 16 Oct 2017 11:00:29 +0000 (14:00 +0300)]
Renamed item_invincible to item_shield.

6 years agoRemoved some unneeded macros.
Lyberta [Mon, 16 Oct 2017 10:48:25 +0000 (13:48 +0300)]
Removed some unneeded macros.

6 years agoRandom items: Better weapon replacement code.
Lyberta [Mon, 16 Oct 2017 10:05:40 +0000 (13:05 +0300)]
Random items: Better weapon replacement code.

6 years agoRemoved replacedweapon.
Lyberta [Mon, 16 Oct 2017 09:37:26 +0000 (12:37 +0300)]
Removed replacedweapon.

6 years agoCompletely removed droppedweapon.
Lyberta [Mon, 16 Oct 2017 08:07:23 +0000 (11:07 +0300)]
Completely removed droppedweapon.

6 years agoRemoved references to droppedweapon.
Lyberta [Mon, 16 Oct 2017 05:20:14 +0000 (08:20 +0300)]
Removed references to droppedweapon.

6 years agoFix event log reporting a name change event on connect
terencehill [Sun, 15 Oct 2017 11:11:20 +0000 (13:11 +0200)]
Fix event log reporting a name change event on connect

6 years agoRevert previous "fix" (didn't work)
Mario [Sun, 15 Oct 2017 07:24:15 +0000 (17:24 +1000)]
Revert previous "fix" (didn't work)

6 years agoRemove useless label
terencehill [Fri, 13 Oct 2017 21:10:31 +0000 (23:10 +0200)]
Remove useless label

6 years agoAdd missing indentation
terencehill [Fri, 13 Oct 2017 21:09:27 +0000 (23:09 +0200)]
Add missing indentation

6 years agoOops, fix rocketjump damage check
terencehill [Fri, 13 Oct 2017 20:59:58 +0000 (22:59 +0200)]
Oops, fix rocketjump damage check