]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Sat, 31 Dec 2016 01:00:59 +0000 (11:00 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Sat, 31 Dec 2016 00:59:20 +0000 (10:59 +1000)]
Remove the if() check, all we're doing is setting it to null anyway
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
Mario [Sat, 31 Dec 2016 00:41:28 +0000 (10:41 +1000)]
Don't modify the old weapon entity when observing
terencehill [Fri, 30 Dec 2016 19:01:35 +0000 (20:01 +0100)]
Fix %W in chat messages again...
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 .
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
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)
Mario [Fri, 30 Dec 2016 11:26:03 +0000 (21:26 +1000)]
Update hash
terencehill [Thu, 29 Dec 2016 18:27:58 +0000 (19:27 +0100)]
Optimize trigger_hurt check
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
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
Mario [Thu, 29 Dec 2016 06:02:34 +0000 (16:02 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/common/weapons/weapon/shotgun.qc
terencehill [Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)]
Merge branch 'master' into terencehill/bot_fix
terencehill [Thu, 29 Dec 2016 01:56:28 +0000 (02:56 +0100)]
Fix shotgun ammo field
terencehill [Thu, 29 Dec 2016 01:55:00 +0000 (02:55 +0100)]
Fix %W in chat messages
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
terencehill [Wed, 28 Dec 2016 18:39:29 +0000 (19:39 +0100)]
Fix ammo rating, it was always rated 0
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)
terencehill [Wed, 28 Dec 2016 18:11:42 +0000 (19:11 +0100)]
Small cleanup
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
Mario [Tue, 27 Dec 2016 12:44:01 +0000 (22:44 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/server/weapons/weaponsystem.qc
Mario [Tue, 27 Dec 2016 08:20:35 +0000 (18:20 +1000)]
Remove IT_AMMO
Mario [Mon, 26 Dec 2016 13:38:51 +0000 (23:38 +1000)]
Hopefully fix compilation unit
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)
Mario [Mon, 26 Dec 2016 12:34:36 +0000 (22:34 +1000)]
If weapon entity is deleted, delete its hook too
Mario [Mon, 26 Dec 2016 12:30:09 +0000 (22:30 +1000)]
Add a debug option to weaponarena for all weapons (even mutator blocked ones)
Mario [Mon, 26 Dec 2016 06:17:49 +0000 (16:17 +1000)]
Fix crouch checking wrong hook entity
TimePath [Mon, 26 Dec 2016 03:42:43 +0000 (14:42 +1100)]
Merge branch 'TimePath/inventory_tweaks'
TimePath [Sun, 25 Dec 2016 06:14:07 +0000 (17:14 +1100)]
Inventory: expand capacity
Mario [Mon, 26 Dec 2016 01:36:20 +0000 (11:36 +1000)]
Directly use jetpack instead of quake 3 item (might fix compilation unit)
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)
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
Mirio [Sun, 25 Dec 2016 21:01:55 +0000 (22:01 +0100)]
Fix an error
Mirio [Sun, 25 Dec 2016 14:56:44 +0000 (15:56 +0100)]
Update credits
Mario [Sun, 25 Dec 2016 11:59:50 +0000 (21:59 +1000)]
Add rudimentary support for World of Padman map entities, by Gnom
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)
terencehill [Sun, 25 Dec 2016 11:17:25 +0000 (12:17 +0100)]
Line up AI_STATUS_* values
Mario [Sun, 25 Dec 2016 11:07:16 +0000 (21:07 +1000)]
Merge branch 'master' into Mario/wepent_experimental
terencehill [Sun, 25 Dec 2016 10:55:57 +0000 (11:55 +0100)]
Fix bots thinking too much after setting a high enough slowmo value
terencehill [Sun, 25 Dec 2016 09:51:14 +0000 (10:51 +0100)]
Move check for freed goals to navigation_poptouchedgoals
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)
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)
Mario [Sun, 25 Dec 2016 07:58:29 +0000 (17:58 +1000)]
Fix stat references on non-player entities
Mario [Sun, 25 Dec 2016 07:50:04 +0000 (17:50 +1000)]
Fix a reference to the unused global entity 'other'
Mario [Sat, 24 Dec 2016 21:26:47 +0000 (07:26 +1000)]
Merge branch 'master' into Mario/wepent_experimental
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)
Mario [Sat, 24 Dec 2016 20:40:59 +0000 (06:40 +1000)]
Merge branch 'master' into Mario/wepent_experimental
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)
Mario [Sat, 24 Dec 2016 10:42:03 +0000 (20:42 +1000)]
Fix typo in cvar description
Mario [Sat, 24 Dec 2016 10:30:37 +0000 (20:30 +1000)]
We need to keep checking the other weapon entities for zoom state, unfortunately
Mario [Sat, 24 Dec 2016 10:15:20 +0000 (20:15 +1000)]
Make sure weapon's reticle image is also not null
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
Mario [Sat, 24 Dec 2016 05:09:44 +0000 (15:09 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/common/monsters/sv_monsters.qc
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)
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
Mario [Fri, 23 Dec 2016 01:01:07 +0000 (11:01 +1000)]
Minor monster code cleanup
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)
Mario [Wed, 21 Dec 2016 07:43:38 +0000 (17:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Wed, 21 Dec 2016 07:43:27 +0000 (17:43 +1000)]
Don't continue the loop if a valid reticle image is chosen, hopefully fixes a bad string crash
Mario [Tue, 20 Dec 2016 01:10:53 +0000 (11:10 +1000)]
Predict jetpack effect and sound (yay for perfectly predicted jetpacks)
Mario [Tue, 20 Dec 2016 00:49:24 +0000 (10:49 +1000)]
Merge branch 'master' into Mario/wepent_experimental
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)
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!)
Mario [Mon, 19 Dec 2016 02:48:08 +0000 (12:48 +1000)]
Rename a lib function (overlaps with an old map entity field)
Mario [Sun, 18 Dec 2016 12:22:24 +0000 (22:22 +1000)]
Use registry to get monster list
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)
TimePath [Sat, 17 Dec 2016 04:22:36 +0000 (15:22 +1100)]
Bots: add navigation_clearroute and goalcurrent to public API
Mario [Sat, 17 Dec 2016 03:08:08 +0000 (13:08 +1000)]
Remove unused macro
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
Mario [Fri, 16 Dec 2016 18:42:12 +0000 (04:42 +1000)]
Improve code readability in W_DecreaseAmmo
terencehill [Fri, 16 Dec 2016 16:47:35 +0000 (17:47 +0100)]
Share some waypoint code in a dedicated function
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
Mario [Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental
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"
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
Mario [Wed, 14 Dec 2016 20:29:39 +0000 (06:29 +1000)]
Give it some arguments
Mario [Wed, 14 Dec 2016 20:26:53 +0000 (06:26 +1000)]
Add some mutator hooks to clear out another gamemode reference
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
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
Mario [Tue, 13 Dec 2016 18:07:09 +0000 (04:07 +1000)]
Remove the o
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)
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
terencehill [Tue, 13 Dec 2016 15:44:28 +0000 (16:44 +0100)]
CTF: rename an entity field; remove some redundant code
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
Mario [Mon, 12 Dec 2016 14:02:45 +0000 (00:02 +1000)]
Merge branch 'master' into Mario/wepent_experimental
terencehill [Sun, 11 Dec 2016 13:20:34 +0000 (14:20 +0100)]
Remove an useless placeholder waypoint
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)
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
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
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
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
Mario [Wed, 7 Dec 2016 14:18:04 +0000 (00:18 +1000)]
Merge branch 'master' into Mario/wepent_experimental
terencehill [Tue, 6 Dec 2016 17:43:54 +0000 (18:43 +0100)]
Clean Key Hunt code up
Mario [Tue, 6 Dec 2016 15:01:32 +0000 (01:01 +1000)]
Merge branch 'master' into Mario/wepent_experimental
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
terencehill [Mon, 5 Dec 2016 12:04:40 +0000 (13:04 +0100)]
Update hash
terencehill [Sun, 4 Dec 2016 20:28:48 +0000 (21:28 +0100)]
Increase powerups and megas size. It fixes #192
terencehill [Sun, 4 Dec 2016 20:15:08 +0000 (21:15 +0100)]
Apply correct buff bbox after it respawns