Commit Graph

7825 Commits

Author SHA1 Message Date
a30cbaf735 Move Behavior to Agent's Component 2021-04-07 22:11:29 +02:00
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
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
993ae8fff7 address mutability comment 2021-04-07 17:39:12 +02:00
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
114715908a fix tag removing 2021-04-07 17:26:54 +02:00
b1718cf578 Use HashSet instead of Vec 2021-04-07 17:26:48 +02:00
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
51ef3547a1 cleanup old code 2021-04-07 17:26:27 +02:00
a483817fc2 Change check for trading NPC 2021-04-07 17:26:19 +02:00
18694b30ad Use Behavior into Agent 2021-04-07 17:26:12 +02:00
41314e9098 Create Behavior component 2021-04-07 17:21:53 +02:00
60efd682e2 Merge branch 'vfoulon80/l18n-fr-missing' into 'master'
Add missing translations + Add "enemy_killed" text for villagers

See merge request veloren/veloren!2079
2021-04-07 14:42:32 +00:00
5e23c164e6 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
45b4349bc7 Merge branch 'james/topo-map' into 'master'
Adds topographic map option and allows for map layers

See merge request veloren/veloren!2074
2021-04-07 09:34:13 +00:00
7d75eaedd1 Merge branch 'aweinstock/small-fix-20210406' into 'master'
Fix loadout_builder panic.

See merge request veloren/veloren!2075
2021-04-06 16:37:19 +00:00
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
f2ebbb7f7f Map icon scaling 2021-04-06 08:42:09 -07:00
8ee1fc4a0f Add layers to minimap 2021-04-06 08:42:08 -07:00
bacda06dba Added map layers 2021-04-06 08:42:07 -07:00
70ede7f34d Topographic map 2021-04-06 08:42:06 -07:00
2c4612bff1 Fix loadout_builder panic. 2021-04-06 10:34:13 -04:00
187a85e056 Merge branch 'renamenorsk_norskbokmål' into 'master'
Rename Norsk to Norsk bokmål

See merge request veloren/veloren!2064
2021-04-06 11:37:54 +00:00
2380f9e8c2 Rename Norsk to Norsk bokmål 2021-04-06 11:37:51 +00:00
2ed85a2dc0 Merge branch 'tonyvu0605/VietTranslation' into 'master'
Started Vietnamese Translation

See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
f0cabf1add Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.

See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
3c50321a80 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master'
Sam/sceptre nerfs

See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
1648d6f7e9 Merge branch 'autoglide' into 'master'
Change to auto walk/glide.

See merge request veloren/veloren!2070
2021-04-06 01:53:28 +00:00
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Sam
ba0b6c309b Flattened roll progression. 2021-04-05 17:50:53 -04:00
4dde9f84b0 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
b99c02401d Change to auto walk/glide. 2021-04-05 16:07:17 -05:00
07017da19b Merge branch 'desttinghim/depot-improvements' into 'master'
Depot fix and default world AABB

See merge request veloren/veloren!2067
2021-04-05 19:11:14 +00:00
25f18229d3 Merge branch '1b15-master-patch-98134' into 'master'
fixed auth server URL

See merge request veloren/veloren!2068
2021-04-05 16:36:10 +00:00
d008f9a0ad Merge branch 'pfau/lactose-intolerance' into 'master'
More cheese is less cheese

See merge request veloren/veloren!2066
2021-04-05 15:47:12 +00:00
56137aff92 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
6af9662b03 Change cursor lock location to be center of screen
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
7df0413be4 Fixes #520 and #840 - locks cursor to screen when menu is not open
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
f8009e5d1c fixed auth server URL 2021-04-05 14:15:57 +00:00
f5bc6b43c9 Add default world build AABB 2021-04-05 07:39:09 -06:00
88079cfd30 Merge branch 'japanese' into 'master'
Add Japanese message translation

See merge request veloren/veloren!2049
2021-04-05 13:38:30 +00:00
91a647e35f Return none from depot get if stale id used 2021-04-05 06:16:23 -06:00
b8c474057c More cheese is less cheese
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
69891f0b70 Merge branch 'login-trim-username' into 'master'
login trim username, improve validation, social ordering #1040

Closes #1040

See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
b433938e0a Merge branch 'christof/economy_graph' into 'master'
create economy tree graph

See merge request veloren/veloren!2052
2021-04-04 20:21:19 +00:00
c222fa7fda Merge branch 'aweinstock/cheese-counter' into 'master'
Add a cheese counter in the bag display.

See merge request veloren/veloren!2061
2021-04-04 19:24:35 +00:00
958c75642c Merge branch 'christof/stats_per_price' into 'master'
output stats per value for all categories in the trade pricing test

See merge request veloren/veloren!2057
2021-04-04 18:35:39 +00:00