99e494976d
Merge branch 'ccm7676/lang_bug_fix' into 'master'
...
fixed the Select a Language text on languages where it was broken
See merge request veloren/veloren!2089
2021-04-10 15:47:28 +00:00
e6683bb764
Merge branch 'juliancoffee/uk_UA-localizaion' into 'master'
...
Update localization files for Ukrainian
See merge request veloren/veloren!2090
2021-04-10 14:54:13 +00:00
4717ad25a8
Update localization files for Ukrainian
2021-04-10 14:54:12 +00:00
12c3ee440e
Merge branch 'MigraineX/update-es-ES' into 'master'
...
Updated the Spanish (ES) translation
See merge request veloren/veloren!2094
2021-04-10 14:20:40 +00:00
655a35d128
update deps
2021-04-10 15:53:00 +02:00
07fd6f16f8
Updated the Spanish (ES) translation
2021-04-10 14:31:57 +02:00
d66b165ffe
Merge branch 'sharp/remove-panics' into 'master'
...
Remove panics and unwraps, part 1.
See merge request veloren/veloren!2087
2021-04-10 10:10:01 +00:00
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
d2151ad76c
fixed the Select a Language text on languages where it was broken
2021-04-09 18:39:53 +02:00
4c5de60d0d
fix issue #1059 : Debug items should disappear when dropped
2021-04-09 13:46:43 +02:00
90aa671e42
Merge branch 'xMAC94x/logspam' into 'master'
...
remove spamming of the logs
See merge request veloren/veloren!2086
2021-04-09 01:06:23 +00:00
f40e1db384
Merge branch 'xMAC94x/network_atomic' into 'master'
...
change some Ordering::Relaxed to Ordering::SeqCst when we do not want to have...
See merge request veloren/veloren!2083
2021-04-08 22:39:19 +00:00
1a9425526b
remove spamming of the logs
2021-04-08 23:55:13 +02:00
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
d80db38bc9
Remove TRADE capability, use trade_site attribute instead
2021-04-08 19:06:57 +02:00
bc1797a240
Address comments
2021-04-08 18:33:00 +02:00
6656f1e4af
Merge branch 'desttinghim/rtsim-path-following' into 'master'
...
RtSim pathfinding improvements
See merge request veloren/veloren!2013
2021-04-08 13:39:06 +00:00
4c9eede9fd
Document Travel enum
2021-04-08 05:40:56 -06:00
85de7d130c
Use distance_squared to speed up calculations
2021-04-08 05:10:22 -06:00
5cbdf1850c
Fix travellers stuck in town
...
There was an off by one error in the code that negates the progress
along paths that are reversed.
2021-04-08 05:10:04 -06:00
126b7efa92
Tries to implement npcs only travelling by paths
...
Unfortunately, there's a degenerate case where npcs can get stuck in a
town. Not sure why
2021-04-08 04:19:02 -06:00
29a3fda7ef
Refine airship pathing
2021-04-08 04:19:02 -06:00
be67ba1e63
Add CustomPath to Travel enum
...
Defines a custom path to follow, instead of using one from the World.
Airships use this to slightly adjust their course to reduce collisions.
2021-04-08 04:19:02 -06:00
7f9ec9e19b
Convert rtsim pathfinding logic to a FSM
2021-04-08 04:19:02 -06:00
99c6e57c1f
Resolve comments
2021-04-08 04:19:02 -06:00
3c7898fe8e
Expect instead of unwrap
2021-04-08 04:19:02 -06:00
58274db3e3
Make rtsim entities ensure sanity of track
2021-04-08 04:19:02 -06:00
c281fb32cc
First pass at rtsim following paths
2021-04-08 04:19:02 -06:00
103a757d17
Merge branch 'holychowders/fix_issue_#1061_combat_rating_affected_by_buffs' into 'master'
...
Fix issue #1061 - Combat Rating is Affected by Buffs
Closes #1061
See merge request veloren/veloren!2084
2021-04-08 02:51:21 +00:00
54d0c0f098
Update the changelog
2021-04-07 17:38:09 -07:00
a4b00a3b97
Fix issue #1061 - Combat Rating is Affected by Buffs
...
Replaced `stats` with `None` into the calculation for damage reduction
2021-04-07 17:09:51 -07:00
ea5a02d7cd
change some Ordering::Relaxed to Ordering::SeqCst when we do not want to have it moved/or taken effects from other threads.
...
some id increases are kept Relaxed, SeqCst shouldn't be necessary there.
Not sure about the bool checks in api.rs
2021-04-07 23:17:09 +02:00
fd77966293
Merge branch 'hqurve/crafting-ui' into 'master'
...
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
See merge request veloren/veloren!2081
2021-04-07 20:24:23 +00:00
be42cc60c4
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
2021-04-07 20:24:22 +00:00
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
