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 |
|
Monty Marz
|
7d366aa09a
|
reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button
|
2021-02-27 19:02:26 +00:00 |
|
Justin Shipsey
|
ab49c56072
|
Merge branch 'slipped/gremlins' into 'master'
dungeon enemy overhaul part 1
See merge request veloren/veloren!1697
|
2021-02-27 17:00:52 +00:00 |
|
Samuel Keiffer
|
c7f7ba46cd
|
Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master'
Issue #836 - Declutter the scrolling combat text
See merge request veloren/veloren!1823
|
2021-02-27 16:18:18 +00:00 |
|
jshipsey
|
77c89d732b
|
weapon/manifest tweaks
|
2021-02-27 10:44:55 -05:00 |
|
Lerg
|
9974129e7d
|
Issue #836 - Declutter the scrolling combat text
|
2021-02-27 15:10:47 +03:00 |
|
Sam
|
8db54e9b53
|
Particle rebase fixes
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
8efc53fcef
|
feedback adjustments
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
4aaef35d1d
|
address comments
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
cf228c7642
|
Adds harvester npc
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
b32aab5a26
|
visual weapon variation, adjust minotaur dash, keyframed golem quake
|
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
|
c44a542fab
|
rebase, yeti in dungeon
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
9fdba83b03
|
initial balance
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
7d9d66709c
|
Adds yeti npc
|
2021-02-27 01:42:46 -05:00 |
|