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 |
|
ccgauche
|
3f72de01f5
|
Update lib.rs
|
2021-02-28 22:39:53 +01:00 |
|
Sam
|
45c739da02
|
Factored formatting of buff text out to a single function.
|
2021-02-28 16:04:33 -05:00 |
|
Sam
|
e582c2bdc6
|
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
|
2021-02-28 15:02:03 -05:00 |
|
Imbris
|
0db3b6a74c
|
Merge branch 'Lerg/Issue_#976' into 'master'
Issue #976 Some inputs are missing the ability to be rebound
See merge request veloren/veloren!1832
|
2021-02-28 18:23:30 +00:00 |
|
Justin Shipsey
|
2c397f63cc
|
Merge branch 'heydabop/966-controller-y-invert' into 'master'
#966 - Setting to invert controller Y axis
See merge request veloren/veloren!1817
|
2021-02-28 18:02:04 +00:00 |
|
Samuel Keiffer
|
b935962c02
|
Merge branch 'sam/fix-roll-combo' into 'master'
Fixes being stuck in roll when interrupting combo melee.
See merge request veloren/veloren!1831
|
2021-02-28 18:02:01 +00:00 |
|
Marcel
|
f2763a04ce
|
Merge branch 'sam/torvus-fix' into 'master'
Made changes to fix torvus
See merge request veloren/veloren!1830
|
2021-02-28 16:11:35 +00:00 |
|
Lerg
|
56cae542ec
|
Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator
|
2021-02-28 19:02:32 +03: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
|
8a05ecb4aa
|
Fixes being stuck in roll when interrupting combo melee.
|
2021-02-28 08:50:33 -05:00 |
|
Sam
|
fbba22ac2f
|
Made changes to fix torvus
|
2021-02-27 22:42:11 -05:00 |
|
jshipsey
|
079f1e7dc0
|
re-org armor, common
|
2021-02-27 22:02:05 -05:00 |
|
Samuel Keiffer
|
c4f70416eb
|
Merge branch 'sam/combo-comp' into 'master'
Combo now persists as a compnent, rather than a field on a state
See merge request veloren/veloren!1828
|
2021-02-28 02:42:40 +00:00 |
|
Joshua Barretto
|
604f47d884
|
Merge branch 'zesterer-master-patch-28400' into 'master'
Fix jump routes not being pathed
See merge request veloren/veloren!1706
|
2021-02-28 00:41:38 +00:00 |
|
Justin Shipsey
|
010507a2fb
|
Merge branch 'snowram/f64-anim-cleanup' into 'master'
Reduces the instances of f64 in anims
See merge request veloren/veloren!1827
|
2021-02-28 00:40:51 +00:00 |
|
Sam
|
453c4b5d16
|
Re-allowed for what stage you were on to persist through a roll
|
2021-02-27 19:24:18 -05:00 |
|
Sam
|
2aa332b5e2
|
Combo melee now checks combo
|
2021-02-27 18:24:28 -05:00 |
|
Joshua Barretto
|
dc9e16e3be
|
fmt
|
2021-02-27 23:21:01 +00:00 |
|
Snowram
|
fe4f4a305e
|
Reduces the instances of f64 in anims
|
2021-02-27 23:21:03 +01:00 |
|
Justin Shipsey
|
a6a572f5ef
|
Merge branch 'slipped/animtweaks' into 'master'
look-anims, first experiments (bow, staff, wield)
See merge request veloren/veloren!1826
|
2021-02-27 21:20:36 +00:00 |
|
jshipsey
|
043b280b58
|
look-based anims
|
2021-02-27 16:19:33 -05:00 |
|
Sam
|
8003b5d570
|
Added combo component
|
2021-02-27 14:55:06 -05:00 |
|
Monty Marz
|
7056f5a637
|
Merge branch 'pfau/tutorial_mvp' into 'master'
Initial tutorial MVP
See merge request veloren/veloren!1825
|
2021-02-27 19:02:27 +00:00 |
|