Marcel
a1405f7ec6
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/SavannaGrassUpdate
See merge request veloren/veloren!1725
2021-03-04 10:32:58 +00:00
Joshua Yanovski
2dd7089e52
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
Avi Weinstock
0472956b5c
Allow using stack splitting into or out of a trade.
2021-03-03 18:19:10 -05:00
Sam
39a580b5ee
Added test that all items are properly formatted and valid. Fixed items that were broken.
2021-03-03 16:45:36 -05:00
Lippy13
d9d3c1f55b
Make the BuffKind match expression exhaustive
2021-03-03 21:10:41 +00:00
Lippy13
59594a8b60
Check if duration exists instead of defaulting to zero and clean up code
2021-03-03 20:39:14 +00:00
Samuel Keiffer
dd2097ac75
Merge branch 'armor-org-fix-3' into 'master'
...
Fixed debug back armor. Removed leather_3 item.
See merge request veloren/veloren!1847
2021-03-03 20:13:39 +00:00
Sam
ae856edb31
Fixed debug back armor. Removed leather_3 item.
2021-03-03 15:05:51 -05:00
Marcel
ef1ee4c4fa
Merge branch 'xMAC94x/mpsc' into 'master'
...
Change the way Network is dropped.
Closes #46
See merge request veloren/veloren!1846
2021-03-03 15:19:44 +00:00
Marcel Märtens
c681992367
Changelog:
...
-Savanna grasses now only spawn in the savanna and no longer bleed into desert and temperate biomes
-Cacti now only spawn in the desert and density of large cacti has decreased
-Dead bushes are largely unchanged and still spawn in both the savanna and desert with some bleed into temperate biomes
2021-03-03 15:06:34 +01:00
Joshua Barretto
eb4ce49937
Merge branch 'james/behavior-tree' into 'master'
...
Transitions agent system from a FSM to a behavior tree
See merge request veloren/veloren!1801
2021-03-03 13:48:25 +00:00
Marcel Märtens
a55ec20c74
fix #46 🥳
2021-03-03 12:37:09 +01:00
Marcel Märtens
9028578bc8
Change the way Network is dropped.
...
Instead of keeping Runtime and manually spawn a task on `drop` this task is spawned at start and will wait to be triggered.
The `drop` methods then wait for completion, UNLESS they are in a async context, then they MUST NOT BLOCK (deadlock potential), so they defer it to the Runtime and HOPE for the runtime to exist long enough.
This get rid of the weird `block_in_place` which is only accessable with `rt-multi-threaded` and has some disadvantages.
We also wont requiere the runtime to be active all the time. Though its needed for a clean shutdown
2021-03-03 11:28:40 +01:00
James Melkonian
f9fc015680
Address comments
2021-03-02 19:55:28 -08:00
Lippy13
48f974bf01
Address comments on passing effects
2021-03-03 00:25:15 +00:00
Lippy13
a7c30b6721
Account for no duration being possible
2021-03-03 00:25:14 +00:00
Lippy13
ffd0c01bbd
Fix Clippy errors
...
Fix code formatting
Add descriptions for other potential buffs for consumables
2021-03-03 00:25:13 +00:00
Lippy13
43c35f957f
Remove buff information from item description text
2021-03-03 00:25:12 +00:00
Lippy13
5e3a1b203f
Add buff information to item tooltips
2021-03-03 00:25:11 +00:00
James Melkonian
018d51b1a0
Move agent data into structs
2021-03-02 15:51:43 -08:00
James Melkonian
0c25896b2c
Fix fleeing and combat a little
2021-03-02 15:51:40 -08:00
James Melkonian
29c5ae5af9
Fix interaction and clean up, broken fleeing
2021-03-02 15:51:38 -08:00
James Melkonian
045ec011c9
Behavior tree minus interacting
2021-03-02 15:51:32 -08:00
James Melkonian
8bdadc47b5
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
Samuel Keiffer
c9a656908d
Merge branch 'snowram/fix-leatherset-objectlights' into 'master'
...
Snowram/fix leatherset objectlights
See merge request veloren/veloren!1844
2021-03-02 20:25:18 +00:00
Snowram
f4278840c6
Fixes light offset for objects
2021-03-02 19:28:33 +01:00
Snowram
2b7b9f887b
Fixes leather sets
2021-03-02 19:28:29 +01:00
Joshua Barretto
a96ae2b2e1
Merge branch 'ccgauche/plugin-states' into 'master'
...
Added a Global State API in plugins
See merge request veloren/veloren!1843
2021-03-02 18:26:13 +00:00
ccgauche
bece2cfc76
Reduced unsafe
2021-03-02 17:41:28 +01:00
ccgauche
6dffd1a9e2
Added a Global State API in plugins
2021-03-02 17:15:19 +01:00
Justin Shipsey
c74cdaeb65
Merge branch 'tadabito/fix-crafting-panic' into 'master'
...
update cloth item tag to fix panic during crafting
See merge request veloren/veloren!1842
2021-03-02 14:41:17 +00:00
Joshua Barretto
0f969f6e59
Merge branch 'ccgauche/plugin-player-join-event' into 'master'
...
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
See merge request veloren/veloren!1837
2021-03-02 12:47:52 +00:00
Tadabito
f75f36a2c5
update cloth item tag to fix panic during crafting
2021-03-02 10:31:21 +00:00
ccgauche
356f09d780
Update CHANGELOG.md
2021-03-02 09:46:08 +00:00
ccgauche
7f4411ba1f
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
Samuel Keiffer
23dd98bf42
Merge branch 'armor-org-fix-2' into 'master'
...
Migration for missed backpacks
See merge request veloren/veloren!1841
2021-03-02 04:27:44 +00:00
Sam
55b980a57c
Migration for missed backpacks
2021-03-01 23:27:20 -05:00
Samuel Keiffer
f16c137635
Merge branch 'sam/item-use-as-action' into 'master'
...
Item use is now goes through a control action rather than a control event.
Closes #979
See merge request veloren/veloren!1839
2021-03-02 03:25:55 +00:00
Samuel Keiffer
1f48e9833f
Merge branch 'armor-org-fix-1' into 'master'
...
Migration to fix sturdy red backpack
See merge request veloren/veloren!1840
2021-03-02 02:48:34 +00:00
Sam
3a88ab5bb3
Migration to fix sturdy red backpack
2021-03-01 21:37:14 -05:00
Sam
d02c61ad8a
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
Justin Shipsey
9ad8804b60
Merge branch 'armor-org' into 'master'
...
armor org
See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
Ben Wallis
0f7ff21c20
Merge branch 'item-stacking-and-splitting' into 'master'
...
Implement stacking and splitting
Closes #904
See merge request veloren/veloren!1802
2021-03-02 00:08:47 +00:00
Jesus Bracho
c0573cca44
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
Samuel Keiffer
4da91f7f4e
Merge branch 'heydabop/974-equip-time-float' into 'master'
...
Fixes #974 - convert tool/weapon equip time to floating point seconds
Closes #974
See merge request veloren/veloren!1838
2021-03-01 23:24:48 +00:00
jshipsey
308045cfc9
final asset corrections, fix glider anim
2021-03-01 17:37:47 -05:00
ccgauche
e327b18c4a
Fixed clippy warning
2021-03-01 22:44:18 +01:00
ccgauche
c28ac78e03
Separated the registration system into two files
2021-03-01 22:35:22 +01:00
ccgauche
db9991ce6d
Adressed all comments
2021-03-01 22:24:02 +01:00
heydabop
bfc82f7236
Fixes #974 - convert tool/weapon equip time to floating point seconds
2021-03-01 15:06:39 -06:00
