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 |
|
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 |
|
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 |
|
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 |
|
Sam
|
f24433c8cf
|
Added combo component
|
2021-02-27 14:55:06 -05: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 |
|
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 |
|
jshipsey
|
cb59c8017e
|
anim tweaks, more loadout setup
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
aa4237b019
|
BL improvements, various fixes
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
e4e25e20c9
|
rebase
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
ca3248cc93
|
new dungeon setups, new npcs, weapon specific loadouts, anims
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
ac16a8900d
|
bow
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
66664f3f89
|
the stabs
|
2021-02-27 01:42:45 -05:00 |
|
unknown
|
559ece5ede
|
More npcs work
|
2021-02-27 01:42:45 -05:00 |
|
unknown
|
6f18d16aa2
|
Add new quadmeds npcs with rough offsets
|
2021-02-27 01:42:44 -05:00 |
|
Snowram
|
f48fea57f4
|
Sahagin, Adlet npcs
|
2021-02-27 01:42:43 -05:00 |
|
jshipsey
|
7cf723bb9d
|
gnome
|
2021-02-27 01:42:43 -05:00 |
|
jshipsey
|
266986626d
|
biped_small setup
|
2021-02-27 01:42:43 -05:00 |
|
Samuel Keiffer
|
a99a78abdb
|
Merge branch 'sam/improve-aura-buffs' into 'master'
Auras now apply a buff only once, instead of applying a buff every second.
See merge request veloren/veloren!1824
|
2021-02-27 03:21:47 +00:00 |
|
Snowram
|
1172c2f2c3
|
Merge branch 'Sarrakitty/OceanFlora' into 'master'
added coral reefs, kelp forests, and seagrass
See merge request veloren/veloren!1819
|
2021-02-27 01:52:33 +00:00 |
|
Sam
|
64a809ee5b
|
Made comments more descriptive
|
2021-02-26 18:15:24 -05:00 |
|
Sam
|
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 |
|
Samuel Keiffer
|
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 |
|
Samuel Keiffer
|
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 |
|
Avi Weinstock
|
7d2e8f72eb
|
Add a coin item and make amounts visible on dropped items.
|
2021-02-25 21:31:30 -05:00 |
|
Samuel Keiffer
|
00937a4e8b
|
Merge branch 'aweinstock/modularforms' into 'master'
Support modular weapon components made from a tagged material using the material as a multiplier.
See merge request veloren/veloren!1815
|
2021-02-26 00:53:02 +00:00 |
|
Avi Weinstock
|
e1484c28c0
|
Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.
|
2021-02-25 15:26:49 -05:00 |
|
Sarra
|
f39f5ab5d3
|
added coral reefs, kelp forests, and seagrass
|
2021-02-25 05:33:18 -05:00 |
|
Sam
|
ee5c9d78ca
|
Swords
|
2021-02-24 18:54:06 -05:00 |
|
Marcel
|
553e8c2195
|
Merge branch 'sam/torvus-fix-test' into 'master'
Fix for torvus
See merge request veloren/veloren!1816
|
2021-02-23 20:51:14 +00:00 |
|
Avi Weinstock
|
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 |
|
Avi Weinstock
|
4e57678f34
|
Support modular weapon components made from a tagged material using the material as a multiplier.
|
2021-02-23 15:31:51 -05:00 |
|
Snowram
|
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 |
|