xonotic/xonotic-data.pk3dir.git
3 years agoMerge branch 'master' into martin-t/maxshotdist 395/head
Mario [Sat, 31 Dec 2016 01:28:57 +0000 (11:28 +1000)]
Merge branch 'master' into martin-t/maxshotdist

3 years agoMerge branch 'martin-t/misc' into 'master'
Mario [Sat, 31 Dec 2016 01:25:48 +0000 (01:25 +0000)]
Merge branch 'martin-t/misc' into 'master'

martin-t/misc

See merge request !399

3 years agoUse their instead of his 399/head
Mario [Sat, 31 Dec 2016 00:50:16 +0000 (10:50 +1000)]
Use their instead of his

3 years agoMerge branch 'terencehill/bot_fix' into 'master'
Mario [Sat, 31 Dec 2016 00:44:53 +0000 (00:44 +0000)]
Merge branch 'terencehill/bot_fix' into 'master'

Bot fixes

See merge request !398

3 years agoRevert "Show to spectators all the waypoints that are shown to spectated players...
terencehill [Fri, 30 Dec 2016 16:48:05 +0000 (17:48 +0100)]
Revert "Show to spectators all the waypoints that are shown to spectated players. It fixes #1840"

This reverts commit 8802dc71a56bfe87db766c6dab331046575f7eb9.

3 years agoMutators dialog: fix "No start weapons" checkbox enabling all weapons and "Regular...
terencehill [Fri, 30 Dec 2016 16:36:54 +0000 (17:36 +0100)]
Mutators dialog: fix "No start weapons" checkbox enabling all weapons and "Regular (no arena)" checkbox disabling all weapons

3 years agoEnable buffs by default and don't report them as a mutator (support for maps that...
Mario [Fri, 30 Dec 2016 14:47:35 +0000 (00:47 +1000)]
Enable buffs by default and don't report them as a mutator (support for maps that add buff items, they don't replace powerups)

3 years agoUpdate hash 398/head
Mario [Fri, 30 Dec 2016 11:26:03 +0000 (21:26 +1000)]
Update hash

3 years agoPlayerDamage_Calculate -> Damage_Calculate
Martin Taibr [Fri, 30 Dec 2016 03:35:35 +0000 (04:35 +0100)]
PlayerDamage_Calculate -> Damage_Calculate

3 years agofix overkill blaster damaging turrets and vehicles, remove redundant health check
Martin Taibr [Fri, 30 Dec 2016 02:44:49 +0000 (03:44 +0100)]
fix overkill blaster damaging turrets and vehicles, remove redundant health check

3 years agominor optimization
Martin Taibr [Fri, 30 Dec 2016 02:06:49 +0000 (03:06 +0100)]
minor optimization

3 years agosimplify cl_handicap, update description
Martin Taibr [Fri, 30 Dec 2016 02:06:00 +0000 (03:06 +0100)]
simplify cl_handicap, update description

3 years agoOptimize trigger_hurt check
terencehill [Thu, 29 Dec 2016 18:27:58 +0000 (19:27 +0100)]
Optimize trigger_hurt check

3 years agoDon't allow bots to move towards a dropped weapon until it's on the ground
terencehill [Thu, 29 Dec 2016 15:29:21 +0000 (16:29 +0100)]
Don't allow bots to move towards a dropped weapon until it's on the ground

3 years agoFix wrong checks causing bots to ignore dropped weapons (and enemies in the air)...
terencehill [Thu, 29 Dec 2016 15:22:30 +0000 (16:22 +0100)]
Fix wrong checks causing bots to ignore dropped weapons (and enemies in the air) when they look for a goal

3 years agoMerge branch 'master' into terencehill/bot_fix
terencehill [Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)]
Merge branch 'master' into terencehill/bot_fix

3 years agoFix shotgun ammo field
terencehill [Thu, 29 Dec 2016 01:56:28 +0000 (02:56 +0100)]
Fix shotgun ammo field

3 years agoFix %W in chat messages
terencehill [Thu, 29 Dec 2016 01:55:00 +0000 (02:55 +0100)]
Fix %W in chat messages

3 years agoImprove weapon rating balance: bots now really take small health if low on health...
terencehill [Thu, 29 Dec 2016 01:19:31 +0000 (02:19 +0100)]
Improve weapon rating balance: bots now really take small health if low on health and ammo if low on ammo

3 years agoFix ammo rating, it was always rated 0
terencehill [Wed, 28 Dec 2016 18:39:29 +0000 (19:39 +0100)]
Fix ammo rating, it was always rated 0

3 years agoHigh rating for 50 armor is more than enough (justified by its long respawn time)
terencehill [Wed, 28 Dec 2016 18:38:17 +0000 (19:38 +0100)]
High rating for 50 armor is more than enough (justified by its long respawn time)

3 years agoSmall cleanup
terencehill [Wed, 28 Dec 2016 18:11:42 +0000 (19:11 +0100)]
Small cleanup

3 years agoCustom weapon priorities for bots: improve rating distribution by rating only weapons...
terencehill [Tue, 27 Dec 2016 16:28:12 +0000 (17:28 +0100)]
Custom weapon priorities for bots: improve rating distribution by rating only weapons available on the map

3 years agoRemove IT_AMMO
Mario [Tue, 27 Dec 2016 08:20:35 +0000 (18:20 +1000)]
Remove IT_AMMO

3 years agoHopefully fix compilation unit
Mario [Mon, 26 Dec 2016 13:38:51 +0000 (23:38 +1000)]
Hopefully fix compilation unit

3 years agoHunter-Killer: Only loop through entities that can be damaged by contents (not perfec...
Mario [Mon, 26 Dec 2016 13:25:41 +0000 (23:25 +1000)]
Hunter-Killer: Only loop through entities that can be damaged by contents (not perfect coverage, but avoids checking EVERY entity within a 5000 qu radius)

3 years agoMerge branch 'TimePath/inventory_tweaks'
TimePath [Mon, 26 Dec 2016 03:42:43 +0000 (14:42 +1100)]
Merge branch 'TimePath/inventory_tweaks'

3 years agoInventory: expand capacity
TimePath [Sun, 25 Dec 2016 06:14:07 +0000 (17:14 +1100)]
Inventory: expand capacity

3 years agoDirectly use jetpack instead of quake 3 item (might fix compilation unit)
Mario [Mon, 26 Dec 2016 01:36:20 +0000 (11:36 +1000)]
Directly use jetpack instead of quake 3 item (might fix compilation unit)

3 years agoCustom weapon priorities for bots: improve rating scale calculation by excluding...
terencehill [Mon, 26 Dec 2016 00:17:32 +0000 (01:17 +0100)]
Custom weapon priorities for bots: improve rating scale calculation by excluding not usable weapons (weapons are still overrated but not as much as before)

3 years agoFix wrong check causing bots to seek more already owned weapons and less not owned...
terencehill [Sun, 25 Dec 2016 22:28:59 +0000 (23:28 +0100)]
Fix wrong check causing bots to seek more already owned weapons and less not owned weapons

3 years agoFix an error
Mirio [Sun, 25 Dec 2016 21:01:55 +0000 (22:01 +0100)]
Fix an error

3 years agoUpdate credits
Mirio [Sun, 25 Dec 2016 14:56:44 +0000 (15:56 +0100)]
Update credits

3 years agoAdd rudimentary support for World of Padman map entities, by Gnom
Mario [Sun, 25 Dec 2016 11:59:50 +0000 (21:59 +1000)]
Add rudimentary support for World of Padman map entities, by Gnom

3 years agoMove quake, halflife and q3 files into a compat subdirectory (wop support coming...
Mario [Sun, 25 Dec 2016 11:42:20 +0000 (21:42 +1000)]
Move quake, halflife and q3 files into a compat subdirectory (wop support coming soon)

3 years agoLine up AI_STATUS_* values
terencehill [Sun, 25 Dec 2016 11:17:25 +0000 (12:17 +0100)]
Line up AI_STATUS_* values

3 years agoFix bots thinking too much after setting a high enough slowmo value
terencehill [Sun, 25 Dec 2016 10:55:57 +0000 (11:55 +0100)]
Fix bots thinking too much after setting a high enough slowmo value

3 years agoMove check for freed goals to navigation_poptouchedgoals
terencehill [Sun, 25 Dec 2016 09:51:14 +0000 (10:51 +0100)]
Move check for freed goals to navigation_poptouchedgoals

3 years agoBot logic: improve jumppad touch detection (e.g. on Xoylent occasionally bots skipped...
terencehill [Sun, 25 Dec 2016 09:41:36 +0000 (10:41 +0100)]
Bot logic: improve jumppad touch detection (e.g. on Xoylent occasionally bots skipped the jumppad and tried to leap into the void)

3 years agoRemove path to unreachable goals that lead to falling off the map (example case:...
terencehill [Sun, 25 Dec 2016 09:06:49 +0000 (10:06 +0100)]
Remove path to unreachable goals that lead to falling off the map (example case: on Xoylent from the upper Mega Armor down to the hole to the lowest level when the mortar is picked up)

3 years agoFix stat references on non-player entities
Mario [Sun, 25 Dec 2016 07:58:29 +0000 (17:58 +1000)]
Fix stat references on non-player entities

3 years agoFix a reference to the unused global entity 'other'
Mario [Sun, 25 Dec 2016 07:50:04 +0000 (17:50 +1000)]
Fix a reference to the unused global entity 'other'

3 years agoUse the constants for player hitbox size when applicable (should fix observer hitbox)
Mario [Sat, 24 Dec 2016 21:26:14 +0000 (07:26 +1000)]
Use the constants for player hitbox size when applicable (should fix observer hitbox)

3 years agoWe need to send location as coords, can't 'short'cut this (big maps)
Mario [Sat, 24 Dec 2016 20:40:11 +0000 (06:40 +1000)]
We need to send location as coords, can't 'short'cut this (big maps)

3 years agoClean up map vote mask writing to use the BIT macro instead of multiplying a local...
Mario [Sat, 24 Dec 2016 06:59:20 +0000 (16:59 +1000)]
Clean up map vote mask writing to use the BIT macro instead of multiplying a local number

3 years agolimit max_shot_distance to 230000
Martin Taibr [Sat, 24 Dec 2016 03:11:30 +0000 (04:11 +0100)]
limit max_shot_distance to 230000

3 years agowarning in case something is wrong with max_shot_distance
Martin Taibr [Sat, 24 Dec 2016 02:43:54 +0000 (03:43 +0100)]
warning in case something is wrong with max_shot_distance

3 years agoadjust max shot distance according to map size
Martin Taibr [Sat, 24 Dec 2016 02:29:55 +0000 (03:29 +0100)]
adjust max shot distance according to map size

3 years agoDon't use global options for the player hitbox and view offset stats (we already...
Mario [Sat, 24 Dec 2016 02:18:04 +0000 (12:18 +1000)]
Don't use global options for the player hitbox and view offset stats (we already set them in player physics per-client)

3 years agoDon't return if player doesn't have the default powerups (HUD panel isn't drawn if...
Mario [Sat, 24 Dec 2016 01:55:12 +0000 (11:55 +1000)]
Don't return if player doesn't have the default powerups (HUD panel isn't drawn if they don't have them anyway), fixes custom powerups

3 years agoMinor monster code cleanup
Mario [Fri, 23 Dec 2016 01:01:07 +0000 (11:01 +1000)]
Minor monster code cleanup

3 years agoBot logic: tweak bunnyhop stop distance, improve trigger_hurt detection and bot react...
terencehill [Mon, 19 Dec 2016 17:43:42 +0000 (18:43 +0100)]
Bot logic: tweak bunnyhop stop distance, improve trigger_hurt detection and bot reaction if one is found in front of it. Now there's little chance of falling off the map getting the Mortar on Dance, furthermore bots can now bunnyhop on paths with harmless holes (see lower level of Implosion)

3 years agoPredict jetpack effect and sound (yay for perfectly predicted jetpacks)
Mario [Tue, 20 Dec 2016 01:10:53 +0000 (11:10 +1000)]
Predict jetpack effect and sound (yay for perfectly predicted jetpacks)

3 years agoAdd some randomness to the goal selection when a bot is stuck on a jump pad, increasi...
terencehill [Mon, 19 Dec 2016 17:32:02 +0000 (18:32 +0100)]
Add some randomness to the goal selection when a bot is stuck on a jump pad, increasing chances to unstuck bots (e.g. on the jump pad near the ctf team base on Implosion)

3 years agoFix ambiguous check causing bots to avoid jumppads and teleporters (and to always...
terencehill [Sat, 17 Dec 2016 20:44:10 +0000 (21:44 +0100)]
Fix ambiguous check causing bots to avoid jumppads and teleporters (and to always fall off the map near the jumppad on Xoylent!)

3 years agoRename a lib function (overlaps with an old map entity field)
Mario [Mon, 19 Dec 2016 02:48:08 +0000 (12:48 +1000)]
Rename a lib function (overlaps with an old map entity field)

3 years agoUse registry to get monster list
Mario [Sun, 18 Dec 2016 12:22:24 +0000 (22:22 +1000)]
Use registry to get monster list

3 years agoLimit the number of maps lsmaps can show to 250 (better than either increasing tempst...
Mario [Sun, 18 Dec 2016 12:07:44 +0000 (22:07 +1000)]
Limit the number of maps lsmaps can show to 250 (better than either increasing tempstring size and crashing or showing an empty list)

3 years agoBots: add navigation_clearroute and goalcurrent to public API
TimePath [Sat, 17 Dec 2016 04:22:36 +0000 (15:22 +1100)]
Bots: add navigation_clearroute and goalcurrent to public API

3 years agoFix bots always returning to own base after that the stolen flag has been returned
terencehill [Fri, 16 Dec 2016 19:29:33 +0000 (20:29 +0100)]
Fix bots always returning to own base after that the stolen flag has been returned

3 years agoShare some waypoint code in a dedicated function
terencehill [Fri, 16 Dec 2016 16:47:35 +0000 (17:47 +0100)]
Share some waypoint code in a dedicated function

3 years agoAdd possibility to send a command to all the bots; improve bot_cmd help description
terencehill [Fri, 16 Dec 2016 16:35:06 +0000 (17:35 +0100)]
Add possibility to send a command to all the bots; improve bot_cmd help description

3 years agog_ctf_reverse description
Martin Taibr [Thu, 15 Dec 2016 01:14:44 +0000 (02:14 +0100)]
g_ctf_reverse description

3 years agoPart 2 of edc2958143 "Make sure bots don't move to removed goals such as a key when...
terencehill [Thu, 15 Dec 2016 00:11:37 +0000 (01:11 +0100)]
Part 2 of edc2958143 "Make sure bots don't move to removed goals such as a key when a Key Hunt round ends. It fixes #1101"

3 years agoKeyHunt panel: if there is no key to show return early (avoiding a division by 0...
terencehill [Thu, 15 Dec 2016 00:04:36 +0000 (01:04 +0100)]
KeyHunt panel: if there is no key to show return early (avoiding a division by 0 too); also do a small cleanup

3 years agoGive it some arguments
Mario [Wed, 14 Dec 2016 20:29:39 +0000 (06:29 +1000)]
Give it some arguments

3 years agoAdd some mutator hooks to clear out another gamemode reference
Mario [Wed, 14 Dec 2016 20:26:53 +0000 (06:26 +1000)]
Add some mutator hooks to clear out another gamemode reference

3 years agoUse new item name in Quake compat, may fix weird issues with mega armor on old maps
Mario [Wed, 14 Dec 2016 13:00:03 +0000 (23:00 +1000)]
Use new item name in Quake compat, may fix weird issues with mega armor on old maps

3 years agoAdd a wrapper for item sounds, so they can be easily replaced like weapon sounds...
Mario [Wed, 14 Dec 2016 10:22:58 +0000 (20:22 +1000)]
Add a wrapper for item sounds, so they can be easily replaced like weapon sounds by mods

3 years agoRemove the o
Mario [Tue, 13 Dec 2016 18:07:09 +0000 (04:07 +1000)]
Remove the o

3 years agoDon't count target_ entity checkpoints as a touchable trigger if it's targeted by...
Mario [Tue, 13 Dec 2016 17:50:27 +0000 (03:50 +1000)]
Don't count target_ entity checkpoints as a touchable trigger if it's targeted by something (usually a real trigger)

3 years agoWhile passing the flag to a team mate, don't return it immediately if an enemy interc...
terencehill [Tue, 13 Dec 2016 15:59:08 +0000 (16:59 +0100)]
While passing the flag to a team mate, don't return it immediately if an enemy intercepts it and if manual return mode is on

3 years agoCTF: rename an entity field; remove some redundant code
terencehill [Tue, 13 Dec 2016 15:44:28 +0000 (16:44 +0100)]
CTF: rename an entity field; remove some redundant code

3 years agoIf a weapon doesn't have a team, show it even if it's taken, so players know where...
Mario [Tue, 13 Dec 2016 14:50:12 +0000 (00:50 +1000)]
If a weapon doesn't have a team, show it even if it's taken, so players know where its spawn point is

3 years agoincrease MAX_SHOT_DISTANCE again
Martin Taibr [Tue, 13 Dec 2016 12:44:12 +0000 (13:44 +0100)]
increase MAX_SHOT_DISTANCE again

3 years agoRemove an useless placeholder waypoint
terencehill [Sun, 11 Dec 2016 13:20:34 +0000 (14:20 +0100)]
Remove an useless placeholder waypoint

3 years agoAllow target_push to be used as a pusher itself (Quake 3 compatibility)
Mario [Sat, 10 Dec 2016 16:29:29 +0000 (02:29 +1000)]
Allow target_push to be used as a pusher itself (Quake 3 compatibility)

3 years agoMerge branch 'DefaultUser/armormega' into 'master'
Mario [Sat, 10 Dec 2016 06:24:31 +0000 (06:24 +0000)]
Merge branch 'DefaultUser/armormega' into 'master'

Armor and Health name inconsistency

Fixes item name inconsistency (see Issue #1490) of Armor and Health by renaming HealthLarge to HealthBig and ArmorLarge to ArmorMega as well as all associated cvars

See https://gitlab.com/xonotic/xonotic-maps.pk3dir/tree/DefaultUser/entity_def for updated entity definitions for radiant

See merge request !387

3 years agoMerge branch 'terencehill/ca_bots_fix' into 'master'
Mario [Sat, 10 Dec 2016 06:20:22 +0000 (06:20 +0000)]
Merge branch 'terencehill/ca_bots_fix' into 'master'

CA and LMS: fix for bots getting stuck

* CA: fix bots getting stuck right after one of them dies
* LMS: fix bots getting stuck right after one of them is out of lives
* Fix "bot_cmd X pause" command not always working

See merge request !389

3 years agoMerge branch 'terencehill/gameover_stuff' into 'master'
Mario [Sat, 10 Dec 2016 06:13:34 +0000 (06:13 +0000)]
Merge branch 'terencehill/gameover_stuff' into 'master'

gameover stuff

* Assault: when the first round ends show the message "Objective destroyed in X minutes" and block the game for 5 seconds before starting the other round in order to show objective destruction
* When a round ends block players and switch to 3rd person view (affected game types: Clan Arena, Domination, Freeze Tag, Invasion, Onslaught)

Implementation details:
* intermission_running and gameover are now 2 different conditions
* if set gameover has the effect of blocking players and triggering 3rd person view (eventchase); server must reset (respawn) players and vehicles (round_handler takes care of it) when resetting gameover to false.

See merge request !368

3 years agoMerge branch 'master' into DefaultUser/armormega 387/head
Mario [Sat, 10 Dec 2016 06:09:41 +0000 (16:09 +1000)]
Merge branch 'master' into DefaultUser/armormega

# Conflicts:
# mutators.cfg
# qcsrc/common/mutators/mutator/nix/sv_nix.qc

3 years agoClean Key Hunt code up
terencehill [Tue, 6 Dec 2016 17:43:54 +0000 (18:43 +0100)]
Clean Key Hunt code up

3 years agoMerge branch 'terencehill/item_models' into 'master'
Mario [Mon, 5 Dec 2016 12:58:27 +0000 (12:58 +0000)]
Merge branch 'terencehill/item_models' into 'master'

item models

* Apply correct buff bbox after it respawns
* Make taller powerup, mega and buff bboxes so the real item is always inside it. It fixes #192

See merge request !396

3 years agoUpdate hash 396/head
terencehill [Mon, 5 Dec 2016 12:04:40 +0000 (13:04 +0100)]
Update hash

3 years agoIncrease powerups and megas size. It fixes #192
terencehill [Sun, 4 Dec 2016 20:28:48 +0000 (21:28 +0100)]
Increase powerups and megas size. It fixes #192

3 years agoApply correct buff bbox after it respawns
terencehill [Sun, 4 Dec 2016 20:15:08 +0000 (21:15 +0100)]
Apply correct buff bbox after it respawns

3 years agoFix typos in few cvar descriptions; remove a wrong comment (copy-paste leftover)
terencehill [Sun, 4 Dec 2016 20:08:08 +0000 (21:08 +0100)]
Fix typos in few cvar descriptions; remove a wrong comment (copy-paste leftover)

3 years agoOnly show weapon spawns if they're available
Mario [Sun, 4 Dec 2016 04:48:06 +0000 (14:48 +1000)]
Only show weapon spawns if they're available

3 years agoFor consistency, still handle the private messages
Mario [Sun, 4 Dec 2016 02:15:29 +0000 (12:15 +1000)]
For consistency, still handle the private messages

3 years agoAdd mutator hooks to control who chat messages are sent to
Mario [Sun, 4 Dec 2016 02:14:22 +0000 (12:14 +1000)]
Add mutator hooks to control who chat messages are sent to

3 years agoThis code was meant to run when a bot is NOT dead
terencehill [Sun, 4 Dec 2016 02:09:32 +0000 (03:09 +0100)]
This code was meant to run when a bot is NOT dead

3 years agoAvoid an additional map list reload on menu start
terencehill [Sun, 4 Dec 2016 02:01:24 +0000 (03:01 +0100)]
Avoid an additional map list reload on menu start

3 years agoBlock latent bot movement when it's dead or spectating
terencehill [Sun, 4 Dec 2016 01:47:38 +0000 (02:47 +0100)]
Block latent bot movement when it's dead or spectating

3 years agoFix fireBullet(), increase MAX_SHOT_DISTANCE
Martin Taibr [Fri, 2 Dec 2016 18:43:11 +0000 (19:43 +0100)]
Fix fireBullet(), increase MAX_SHOT_DISTANCE

Previously, when the nearest target was beyond MAX_SHOT_DISTANCE, the trace ended and the code assumed a wall was hit. It then proceeded to penetrate the non-existent wall up to g_ballistics_mindistance, dropping out of said wall and penetrating the next non-existent wall, repeatedly, until the weapon's solidpenetration was exhausted after going through 50 such walls with overkill's MG, resulting in massive FPS drops and lag spikes on large maps.

Now, if nothing is hit, we just bail out immediately.

Additionally, I increased MAX_SHOT_DISTANCE to make sure hitscan weapons like MG and vortex don't stop mid air even on large maps.

3 years agoIf the hud_shownames_crosshairdistance code says a name must be hidden or displayed...
terencehill [Fri, 2 Dec 2016 17:46:47 +0000 (18:46 +0100)]
If the hud_shownames_crosshairdistance code says a name must be hidden or displayed don't bother checking whether it overlaps or not

3 years agoSimplify an assignment
terencehill [Fri, 2 Dec 2016 17:02:25 +0000 (18:02 +0100)]
Simplify an assignment

3 years agoFix hud_shownames_antioverlap not ignoring spectators
terencehill [Fri, 2 Dec 2016 15:55:48 +0000 (16:55 +0100)]
Fix hud_shownames_antioverlap not ignoring spectators

3 years agoInstead of hiding waypoints for eliminated players in CA clientside make so that...
terencehill [Thu, 1 Dec 2016 18:41:53 +0000 (19:41 +0100)]
Instead of hiding waypoints for eliminated players in CA clientside make so that server never sends private entcs informations of spectators as they're pointless. This way names above eliminated player (CA) and quitters (LMS) don't appear as well as their icons in the radar (CA and LMS); it also reduces bandwith usage

This commit reverts 8923c4865 "CA: fix name tags getting displayed above eliminated players (when they are spectating or observing). It fixes #1813"

3 years agoSpeed up bot goal tracing by using vlen2 (the result is never used outside of compari...
Mario [Thu, 1 Dec 2016 13:30:45 +0000 (23:30 +1000)]
Speed up bot goal tracing by using vlen2 (the result is never used outside of comparisons with itself)

3 years agoMerge branch 'master' into terencehill/ca_bots_fix 389/head
terencehill [Tue, 29 Nov 2016 18:22:07 +0000 (19:22 +0100)]
Merge branch 'master' into terencehill/ca_bots_fix

Conflicts:
qcsrc/server/mutators/mutator/gamemode_lms.qc