Samuel Keiffer
|
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 |
|
Sam
|
d09baadab2
|
Added command: '/safezone'
|
2021-02-28 18:14:59 -05:00 |
|
Sam
|
6ab4e2264e
|
Buff icon
|
2021-02-28 17:31:35 -05:00 |
|
ccgauche
|
099a180a33
|
Update lib.rs
|
2021-02-28 22:39:53 +01:00 |
|
Sam
|
531c38c3ad
|
Factored formatting of buff text out to a single function.
|
2021-02-28 16:04:33 -05:00 |
|
Sam
|
a88ad7b971
|
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
|
2021-02-28 15:02:03 -05:00 |
|
Imbris
|
b7bd0306e6
|
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
|
13df691f69
|
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
|
7a62cbbafc
|
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
|
9ce61ae814
|
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
|
94bd1f2605
|
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
|
7e458ecd40
|
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
|
2021-02-28 10:13:49 -05:00 |
|
Sam
|
d818ea2f1d
|
Fixes being stuck in roll when interrupting combo melee.
|
2021-02-28 08:50:33 -05:00 |
|
Sam
|
50c47ce84d
|
Made changes to fix torvus
|
2021-02-27 22:42:11 -05:00 |
|
jshipsey
|
1a1020342e
|
re-org armor, common
|
2021-02-27 22:02:05 -05:00 |
|
Samuel Keiffer
|
cb267ac3ee
|
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
|
b9b36e0bf5
|
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
|
8b3aabfe7a
|
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
|
b25a376995
|
Re-allowed for what stage you were on to persist through a roll
|
2021-02-27 19:24:18 -05:00 |
|
Sam
|
404c7f0905
|
Combo melee now checks combo
|
2021-02-27 18:24:28 -05:00 |
|
Joshua Barretto
|
6051c06462
|
fmt
|
2021-02-27 23:21:01 +00:00 |
|
Snowram
|
7f2276324e
|
Reduces the instances of f64 in anims
|
2021-02-27 23:21:03 +01:00 |
|
Justin Shipsey
|
04c698be5e
|
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
|
b4627dfe19
|
look-based anims
|
2021-02-27 16:19:33 -05:00 |
|
Sam
|
f24433c8cf
|
Added combo component
|
2021-02-27 14:55:06 -05:00 |
|
Monty Marz
|
5589a7b714
|
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
|
e5273e3a8e
|
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
|
d2fffa1a92
|
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
|
fa809fc292
|
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
|
16720a6826
|
weapon/manifest tweaks
|
2021-02-27 10:44:55 -05:00 |
|
Lerg
|
3fe5f4484e
|
Issue #836 - Declutter the scrolling combat text
|
2021-02-27 15:10:47 +03:00 |
|
Sam
|
238fcaf5f1
|
Particle rebase fixes
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
8d316aac8c
|
feedback adjustments
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
0a353576dc
|
address comments
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
17112926e7
|
Adds harvester npc
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
51bc74b2a5
|
visual weapon variation, adjust minotaur dash, keyframed golem quake
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
16a44cd532
|
minotaur moves, added claygolem
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
417f4638ed
|
balance pass 2
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
79ec9115f5
|
rebase, yeti in dungeon
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
e06ebf3507
|
initial balance
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
858fbe1a6c
|
Adds yeti npc
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
30af3a4493
|
dash, spin, jump changes
|
2021-02-27 01:42:46 -05:00 |
|
Snowram
|
1b9815dc34
|
Adds 3 new npcs, tusk ram new design
|
2021-02-27 01:42:46 -05:00 |
|
Sam
|
53b0ba286a
|
Ice particles for Wendigo
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
ce3b2141e1
|
theropod retrofit, some more moves
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
5792faa992
|
some new moves, combine biped weapons into one file
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
57d5e90ddd
|
full bipedsmall armor swaps
|
2021-02-27 01:42:46 -05:00 |
|
Sam
|
df70976ff5
|
Fixed particles.
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
cb59c8017e
|
anim tweaks, more loadout setup
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
130d51786a
|
golem retrofit
|
2021-02-27 01:42:46 -05:00 |
|