Avi Weinstock
61c9ff90e4
Increase MAX_CHASE_DIST from 20 to 250, so enemies don't ignore you if you're fireballing them from a hallway.
2021-03-06 10:50:04 -05:00
ccgauche
aa0373ba0e
Fixed tracy
2021-03-05 19:02:33 +01:00
Joshua Yanovski
e7cd5fedf4
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01: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
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
b1aac8921f
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
Snowram
fdf9fcc06f
Fixes leather sets
2021-03-02 19:28:29 +01:00
ccgauche
2bb54137a0
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +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
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
Jesus Bracho
6b1ba22d1f
Implement stacking and splitting
2021-03-02 00:08:46 +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
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
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
e582c2bdc6
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
2021-02-28 15:02:03 -05:00
Avi Weinstock
1831efd8e4
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
2021-02-28 10:13:49 -05:00
Sam
fbba22ac2f
Made changes to fix torvus
2021-02-27 22:42:11 -05:00
Sam
2aa332b5e2
Combo melee now checks combo
2021-02-27 18:24:28 -05:00
Sam
8003b5d570
Added combo component
2021-02-27 14:55:06 -05:00
jshipsey
8efc53fcef
feedback adjustments
2021-02-27 01:42:47 -05:00
jshipsey
8f463921f8
minotaur moves, added claygolem
2021-02-27 01:42:47 -05:00
jshipsey
7feb00f7e4
balance pass 2
2021-02-27 01:42:47 -05:00
jshipsey
9fdba83b03
initial balance
2021-02-27 01:42:47 -05:00
Snowram
ba18f1fab3
Adds 3 new npcs, tusk ram new design
2021-02-27 01:42:46 -05:00
Sam
56acb6a5f0
Ice particles for Wendigo
2021-02-27 01:42:46 -05:00
jshipsey
f8a6a48b41
BL improvements, various fixes
2021-02-27 01:42:45 -05:00
jshipsey
fbaaa60513
bow
2021-02-27 01:42:45 -05:00
Sam
714dc9106d
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
Samuel Keiffer
a1ff097987
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
Samuel Keiffer
d4e54217fc
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
Avi Weinstock
890aa6fbee
Add a coin item and make amounts visible on dropped items.
2021-02-25 21:31:30 -05:00
Sam
f4d25ff5c0
Bows
2021-02-24 20:37:43 -05:00
Sam
8dbdaa8759
Swords
2021-02-24 18:54:06 -05:00
Avi Weinstock
fa891ff74a
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
Snowram
af01c69456
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
