Louis Pearson
3bcdd06c87
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
Louis Pearson
ee302607f0
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
Louis Pearson
1b3c52aecc
Refine airship pathing
2021-04-08 04:19:02 -06:00
Louis Pearson
275296b15e
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
Louis Pearson
3f488db523
Convert rtsim pathfinding logic to a FSM
2021-04-08 04:19:02 -06:00
Louis Pearson
3d000833a6
Resolve comments
2021-04-08 04:19:02 -06:00
Louis Pearson
dfad4f9a49
Expect instead of unwrap
2021-04-08 04:19:02 -06:00
Louis Pearson
91df480e4b
Make rtsim entities ensure sanity of track
2021-04-08 04:19:02 -06:00
Louis Pearson
642dcf08b8
First pass at rtsim following paths
2021-04-08 04:19:02 -06:00
Samuel Keiffer
52d86cca4a
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
holychowders
2854a05099
Update the changelog
2021-04-07 17:38:09 -07:00
holychowders
261802a0d1
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
Marcel Märtens
73adc22282
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
Ben Wallis
82423f30bd
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
hqurve
1b3536a5f5
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
Vincent Foulon
39bf6826f2
Move Behavior to Agent's Component
2021-04-07 22:11:29 +02:00
Vincent Foulon
8cb001e91b
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
e0da6aa572
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
d3045ddff9
address mutability comment
2021-04-07 17:39:12 +02:00
Vincent Foulon
c33e73bbed
use bitflags instead of HashSet
2021-04-07 17:37:21 +02:00
Vincent Foulon
738f074f89
fix tag removing
2021-04-07 17:26:54 +02:00
Vincent Foulon
4d10230f54
Use HashSet instead of Vec
2021-04-07 17:26:48 +02:00
Vincent Foulon
72d0067e5c
Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments
2021-04-07 17:26:42 +02:00
Vincent Foulon
6c65e213c4
cleanup old code
2021-04-07 17:26:27 +02:00
Vincent Foulon
1aebb5a0e7
Change check for trading NPC
2021-04-07 17:26:19 +02:00
Vincent Foulon
822db0895c
Use Behavior into Agent
2021-04-07 17:26:12 +02:00
Vincent Foulon
ccf89c4275
Create Behavior component
2021-04-07 17:21:53 +02:00
Marcel
4703a7e563
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
Vincent Foulon
024e366126
Add missing translations + Add "enemy_killed" text for villagers
2021-04-07 13:26:15 +02:00
Marcel
ea2db98598
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
Joshua Barretto
fff38441eb
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
James Melkonian
7bb62615df
Add topographic option to map
2021-04-06 09:16:17 -07:00
James Melkonian
9c7bfb72ea
Map icon scaling
2021-04-06 08:42:09 -07:00
James Melkonian
44715100c1
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
3578116eee
Added map layers
2021-04-06 08:42:07 -07:00
James Melkonian
5d3acb0c2e
Topographic map
2021-04-06 08:42:06 -07:00
Avi Weinstock
d2e2f30f47
Fix loadout_builder panic.
2021-04-06 10:34:13 -04:00
Marcel
269124a325
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
Kim André Moen Bjørkede
44f96000ba
Rename Norsk to Norsk bokmål
2021-04-06 11:37:51 +00:00
Marcel
51e62a8655
Merge branch 'tonyvu0605/VietTranslation' into 'master'
...
Started Vietnamese Translation
See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
Marcel
af2a9c0f45
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
Joshua Barretto
b419ed6905
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
Samuel Keiffer
d8b8fd1d97
Merge branch 'sam/consolidate-roll' into 'master'
...
Flattened roll progression.
See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Samuel Keiffer
8c3ea2eb13
Merge branch 'sam/sceptre-nerfs' into 'master'
...
Sam/sceptre nerfs
See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
Joshua Barretto
2decedc575
Merge branch 'autoglide' into 'master'
...
Change to auto walk/glide.
See merge request veloren/veloren!2070
2021-04-06 01:53:28 +00:00
Joshua Barretto
28fc121458
Added auto camera setting
2021-04-05 23:24:31 +01:00
Sam
31e9577182
Flattened roll progression.
2021-04-05 17:50:53 -04:00
Marcel
b767256d65
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
8c0c0b9d4e
Nerfs
2021-04-05 17:38:52 -04:00
theCow61
865c6002d2
Change to auto walk/glide.
2021-04-05 16:07:17 -05:00
