077659be9d
Fixed tracy
2021-03-05 19:02:33 +01:00
2dd7089e52
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
ae856edb31
Fixed debug back armor. Removed leather_3 item.
2021-03-03 15:05:51 -05:00
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
a55ec20c74
fix #46 🥳
2021-03-03 12:37:09 +01:00
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
f9fc015680
Address comments
2021-03-02 19:55:28 -08:00
8bdadc47b5
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
2b7b9f887b
Fixes leather sets
2021-03-02 19:28:29 +01:00
7f4411ba1f
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
55b980a57c
Migration for missed backpacks
2021-03-01 23:27:20 -05:00
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
3a88ab5bb3
Migration to fix sturdy red backpack
2021-03-01 21:37:14 -05:00
d02c61ad8a
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
9ad8804b60
Merge branch 'armor-org' into 'master'
...
armor org
See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
c0573cca44
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
308045cfc9
final asset corrections, fix glider anim
2021-03-01 17:37:47 -05:00
e327b18c4a
Fixed clippy warning
2021-03-01 22:44:18 +01:00
c28ac78e03
Separated the registration system into two files
2021-03-01 22:35:22 +01:00
db9991ce6d
Adressed all comments
2021-03-01 22:24:02 +01:00
9628dfaf99
Fixed comments
2021-03-01 21:29:18 +01:00
4cffd2cadd
Updated CI + Changelog
2021-03-01 19:28:27 +01:00
dbd4d70b79
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
2021-03-01 19:00:44 +01:00
0497a437a4
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
7e34f1225f
Migration for armor re-organization.
2021-03-01 00:42:35 -05:00
8944115f8e
more asset organization
2021-02-28 22:18:43 -05:00
537efdd47e
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
d09baadab2
Added command: '/safezone'
2021-02-28 18:14:59 -05:00
a88ad7b971
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
2021-02-28 15:02:03 -05:00
7e458ecd40
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
2021-02-28 10:13:49 -05:00
50c47ce84d
Made changes to fix torvus
2021-02-27 22:42:11 -05:00
404c7f0905
Combo melee now checks combo
2021-02-27 18:24:28 -05:00
f24433c8cf
Added combo component
2021-02-27 14:55:06 -05:00
8d316aac8c
feedback adjustments
2021-02-27 01:42:47 -05:00
16a44cd532
minotaur moves, added claygolem
2021-02-27 01:42:47 -05:00
417f4638ed
balance pass 2
2021-02-27 01:42:47 -05:00
e06ebf3507
initial balance
2021-02-27 01:42:47 -05:00
1b9815dc34
Adds 3 new npcs, tusk ram new design
2021-02-27 01:42:46 -05:00
53b0ba286a
Ice particles for Wendigo
2021-02-27 01:42:46 -05:00
aa4237b019
BL improvements, various fixes
2021-02-27 01:42:45 -05:00
ac16a8900d
bow
2021-02-27 01:42:45 -05:00
45dd36be07
Auras now apply a buff only once, instead of applying a buff every second.
...
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
2021-02-26 17:57:01 -05:00
8e07174c1d
Merge branch 'aweinstock/coin-item' into 'master'
...
Add a coin item and make amounts visible on dropped items.
See merge request veloren/veloren!1821
2021-02-26 04:17:12 +00:00
6af9e58965
Merge branch 'add-gemu-models' into 'master'
...
Add sword and bow models from backlog
See merge request veloren/veloren!1818
2021-02-26 02:59:51 +00:00
7d2e8f72eb
Add a coin item and make amounts visible on dropped items.
2021-02-25 21:31:30 -05:00
b0b4a07b9e
Bows
2021-02-24 20:37:43 -05:00
ee5c9d78ca
Swords
2021-02-24 18:54:06 -05:00
78014d7d3b
Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers.
2021-02-23 15:49:34 -05:00
14c252d8b2
Merge branch 'snowram/turret' into 'master'
...
Object animation, beam fixes, turret implementation
See merge request veloren/veloren!1805
2021-02-23 20:16:56 +00:00
06aa7ab70c
Retrieves added + New ECS memory layout for plugins
2021-02-22 23:59:32 +01:00
