Marcel
e0af7d8d87
Merge branch 'UMR1352/fix#1059' into 'master'
...
fix issue #1059 : Debug items should disappear when dropped
Closes #1059
See merge request veloren/veloren!2088
2021-04-10 17:41:43 +00:00
Marcel
8594b4ea84
Merge branch 'mdx97/default-names' into 'master'
...
Use username as default character name in multiplayer character creation.
See merge request veloren/veloren!2085
2021-04-10 16:41:47 +00:00
mdx97
b360143b42
Use username as default character name in multiplayer character creation.
2021-04-10 16:41:46 +00:00
Marcel
4c2bf6673a
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
Marcel
aa63982e69
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
Illia Denysenko
f9d06f48d9
Update localization files for Ukrainian
2021-04-10 14:54:12 +00:00
Marcel
7c9ecca2c5
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
MigraineX
ccafd14390
Updated the Spanish (ES) translation
2021-04-10 14:31:57 +02:00
Joshua Yanovski
23af36999b
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
Joshua Yanovski
909f2c4680
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Carl Marino
5de52fc116
fixed the Select a Language text on languages where it was broken
2021-04-09 18:39:53 +02:00
Enrico Marconi
b9c01d990f
fix issue #1059 : Debug items should disappear when dropped
2021-04-09 13:46:43 +02:00
Marcel
589afd4db7
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
Marcel
f13246c373
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
Marcel Märtens
1b38cfbd2d
remove spamming of the logs
2021-04-08 23:55:13 +02:00
Imbris
fd30663156
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
5809116afa
Remove TRADE capability, use trade_site attribute instead
2021-04-08 19:06:57 +02:00
Vincent Foulon
7c4da6e501
Address comments
2021-04-08 18:33:00 +02:00
Joshua Barretto
f84bae482f
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
Louis Pearson
b80bc61eb8
Document Travel enum
2021-04-08 05:40:56 -06:00
Louis Pearson
a7c1a97dda
Use distance_squared to speed up calculations
2021-04-08 05:10:22 -06:00
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
