Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,789 Commits 151 Branches 18 Tags 2.1 GiB
1af4a04231
Commit Graph

83 Commits

Author SHA1 Message Date
Imbris
1af4a04231 Revert "Merge branch 'revert-b10718c5' into 'master'" 
This reverts merge request !2172
 2021-04-21 17:10:13 +00:00
Imbris
fd672980c4 Revert "Merge branch 'imbris/agent-opt' into 'master'" 
This reverts merge request !2024
 2021-04-21 14:10:06 +00:00
Imbris
9e0fbd392d Remove some of the spans in the agent system 2021-04-20 15:25:05 -04:00
Imbris
110165de3a Add more profiling spans to the agent system and add timing notes 2021-04-20 15:25:04 -04:00
Imbris
e750c9d570 Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle 2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
James Melkonian
ef38d9778f Fix bow AI 2021-04-19 12:17:31 -07:00
Ben Wallis
95d7a3d761 Fixed cargo test-server. Removed -Z package-features from .cargo/config as it is no longer required 2021-04-15 19:07:46 +01:00
holychowders
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
Avi Weinstock
ddf6a26577 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
Marcel Märtens
1a9425526b remove spamming of the logs 2021-04-08 23:55:13 +02:00
Imbris
0eecc61ddf Merge branch 'vfoulon80/behavior-component' into 'master' 
New Component: Behavior

See merge request veloren/veloren!2033
 2021-04-08 19:16:28 +00:00
Vincent Foulon
d80db38bc9 Remove TRADE capability, use trade_site attribute instead 2021-04-08 19:06:57 +02:00
Louis Pearson
3c7898fe8e Expect instead of unwrap 2021-04-08 04:19:02 -06:00
Louis Pearson
58274db3e3 Make rtsim entities ensure sanity of track 2021-04-08 04:19:02 -06:00
Vincent Foulon
dbee13f9be Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly 2021-04-07 22:02:57 +02:00
Vincent Foulon
45fb9f3211 Address comments 
- make Behavior's capabilities and state private
 - Typo in a comment
 - add basic tests

Apply 1 suggestion(s) to 1 file(s)

Remove comments in agent.rs
 2021-04-07 22:02:42 +02:00
Vincent Foulon
993ae8fff7 address mutability comment 2021-04-07 17:39:12 +02:00
Vincent Foulon
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
a483817fc2 Change check for trading NPC 2021-04-07 17:26:19 +02:00
Vincent Foulon
18694b30ad Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
5e23c164e6 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
Vincent Foulon
dcde8df365 address review comments 2021-04-01 19:13:08 +02:00
Vincent Foulon
c2a8feada5 Add dialogue when the Merchant is busy and randomize some trading dialogues 2021-03-31 19:06:41 +02:00
Avi Weinstock
0122dca3c3 Allow fast stacking into and out of a trade with {ctrl,shift} click. 
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
 2021-03-30 18:39:10 -04:00
James Melkonian
8e522596a5 Fixed merchant wandering 2021-03-29 17:27:56 -07:00
Samuel Keiffer
12ec46c572 Merge branch 'sam/mindflayer-balancing' into 'master' 
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
 2021-03-29 21:05:49 +00:00
Vincent Foulon
a35fa19409 Implement a basic dialogue system 2021-03-29 14:47:42 +00:00
Sam
71ba9b6a54 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Sam
b0b114a7f8 Balance tweaks 2021-03-27 21:05:15 -04:00
Sam
6c611d632a Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00
Sam
f9835e78da Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
8e4aeff705 Improved mindflayer AI. Tweake some abilities. 2021-03-27 21:05:07 -04:00
Sam
720482d994 Gave mindflayer AI. 
Fixed particles and made them sync across network.
 2021-03-27 21:05:06 -04:00
Sam
30da614e89 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Avi Weinstock
8d90548331 Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
Marcel
28952f6d7b Merge branch 'aweinstock/agent-retargetting' into 'master' 
In `agent::Sys`, perform target selection periodically to avoid agents going...

See merge request veloren/veloren!1985
 2021-03-24 22:22:04 +00:00
Avi Weinstock
c4a6875133 Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs. 2021-03-24 15:42:37 -04:00
Avi Weinstock
ebc8e945d4 In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly. 2021-03-23 23:00:05 -04:00
Avi Weinstock
49f39fb752 Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky). 2021-03-23 10:44:32 +01:00
Avi Weinstock
833ab7f1a8 Make merchants not virtually spamclick accept. 2021-03-22 22:53:53 -04:00
Joshua Barretto
b45df7fe10 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0 Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Marcel
eabddd7263 Merge branch 'christof/trading_fix2' into 'master' 
fix merchant getting stuck in non-existant trade when declining after accepting

See merge request veloren/veloren!1941
 2021-03-19 09:29:45 +00:00
Christof Petig
fb40cd93a9 fix merchant getting stuck in non-existant trade when declining after accepting 2021-03-19 00:43:23 +01:00
Avi Weinstock
a770ef0f4a Fix agent flight by enabling flight mode at the start of each tick of the agent system. 2021-03-18 18:54:23 -04:00
Marcel
afa11d03e5 Merge branch 'james/fix-npc-chat-spam' into 'master' 
Correct npc chat spam

See merge request veloren/veloren!1921
 2021-03-16 23:22:48 +00:00
James Melkonian
ba196c4345 merchants no longer run away while trading 
(this time without refactoring)
 2021-03-16 23:22:48 +00:00
Sam
18173caefe NPCs no longer target players inside safezones (and consider them to be defeated) 
Warding aura no longer sometimes bypasses safezone invulnerability
 2021-03-16 15:17:08 -04:00