Avi Weinstock
33bed4a2ad
Allow using stack splitting into or out of a trade.
2021-03-03 18:19:10 -05:00
Samuel Keiffer
d57f2d7e32
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
eaa240fdc0
Fixed debug back armor. Removed leather_3 item.
2021-03-03 15:05:51 -05:00
Marcel
e9f2c024ec
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
Joshua Barretto
9e8576610f
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
d7a4bae537
fix #46 🥳
2021-03-03 12:37:09 +01:00
Marcel Märtens
0f591dfcdd
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
bf466bff87
Address comments
2021-03-02 19:55:28 -08:00
James Melkonian
84193ebbf5
Move agent data into structs
2021-03-02 15:51:43 -08:00
James Melkonian
17dd5a22aa
Fix fleeing and combat a little
2021-03-02 15:51:40 -08:00
James Melkonian
ba4cb9636d
Fix interaction and clean up, broken fleeing
2021-03-02 15:51:38 -08:00
James Melkonian
b234c45cf8
Behavior tree minus interacting
2021-03-02 15:51:32 -08:00
James Melkonian
b1aac8921f
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
Samuel Keiffer
aa552097d9
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
8b6688581a
Fixes light offset for objects
2021-03-02 19:28:33 +01:00
Snowram
fdf9fcc06f
Fixes leather sets
2021-03-02 19:28:29 +01:00
Joshua Barretto
d3d757b59f
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
a0d2fffc90
Reduced unsafe
2021-03-02 17:41:28 +01:00
ccgauche
b43afd4920
Added a Global State API in plugins
2021-03-02 17:15:19 +01:00
Justin Shipsey
258d2e27ad
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
1370bc4cf1
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
d97a65d3af
update cloth item tag to fix panic during crafting
2021-03-02 10:31:21 +00:00
ccgauche
384e731bd0
Update CHANGELOG.md
2021-03-02 09:46:08 +00:00
ccgauche
2bb54137a0
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
Samuel Keiffer
d6addc776c
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
e4cc802d6c
Migration for missed backpacks
2021-03-01 23:27:20 -05:00
Samuel Keiffer
35bdeebb58
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
8a2b87c71b
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
9c788e2e3f
Migration to fix sturdy red backpack
2021-03-01 21:37:14 -05:00
Sam
06ecf398db
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
Justin Shipsey
c9e8302cda
Merge branch 'armor-org' into 'master'
...
armor org
See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
Ben Wallis
026188f7e2
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
6b1ba22d1f
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
Samuel Keiffer
f80fef110f
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
8a82e1aa37
final asset corrections, fix glider anim
2021-03-01 17:37:47 -05:00
ccgauche
ad492d2343
Fixed clippy warning
2021-03-01 22:44:18 +01:00
ccgauche
43dfefe367
Separated the registration system into two files
2021-03-01 22:35:22 +01:00
ccgauche
32b16d71ce
Adressed all comments
2021-03-01 22:24:02 +01:00
heydabop
839f599c49
Fixes #974 - convert tool/weapon equip time to floating point seconds
2021-03-01 15:06:39 -06:00
ccgauche
cc06cbce83
Fixed comments
2021-03-01 21:29:18 +01:00
ccgauche
612a507bc6
Updated CI + Changelog
2021-03-01 19:28:27 +01:00
ccgauche
927b2868ec
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
2021-03-01 19:00:44 +01:00
Marcel
1623c0760a
Merge branch 'ccgauche/comments_on_plugins' into 'master'
...
Added doc to the plugin api
See merge request veloren/veloren!1833
2021-03-01 08:37:19 +00:00
Sam
803c7d81dc
Fix a few asset paths for armors.
2021-03-01 00:58:43 -05:00
Samuel Keiffer
c06e36fe6b
Merge branch 'sam/invulnerability-buff' into 'master'
...
Invulnerability Buff
Closes #965
See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Sam
0ec709bf17
Migration for armor re-organization.
2021-03-01 00:42:35 -05:00
jshipsey
f4a10912b0
more asset organization
2021-02-28 22:18:43 -05:00
Samuel Keiffer
a2c19cd047
Merge branch 'aweinstock/trade-requestitem' into 'master'
...
During a trade, allow requesting items from the counterparty's inventory...
See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
884e74cab8
Added command: '/safezone'
2021-02-28 18:14:59 -05:00
Sam
7837f480cd
Buff icon
2021-02-28 17:31:35 -05:00
