2111 Commits

Author SHA1 Message Date
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
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
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
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
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
Sam
8003b5d570 Added combo component 2021-02-27 14:55:06 -05: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
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
befa6b3a21 theropod retrofit, some more moves 2021-02-27 01:42:46 -05:00
jshipsey
0ffcd62d12 some new moves, combine biped weapons into one file 2021-02-27 01:42:46 -05:00
jshipsey
ce8b4d27a2 full bipedsmall armor swaps 2021-02-27 01:42:46 -05:00
jshipsey
7e2794c234 anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
jshipsey
f8a6a48b41 BL improvements, various fixes 2021-02-27 01:42:45 -05:00
jshipsey
6f49e0b94e rebase 2021-02-27 01:42:45 -05:00
jshipsey
fc80fff924 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
jshipsey
fbaaa60513 bow 2021-02-27 01:42:45 -05:00
jshipsey
4e3bf62732 the stabs 2021-02-27 01:42:45 -05:00
unknown
aa4f68d72b More npcs work 2021-02-27 01:42:45 -05:00
unknown
917afb3f0d Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
Snowram
39b76036b1 Sahagin, Adlet npcs 2021-02-27 01:42:43 -05:00
jshipsey
37a4bb4bef gnome 2021-02-27 01:42:43 -05:00
jshipsey
fd96357775 biped_small setup 2021-02-27 01:42:43 -05:00
Samuel Keiffer
b88bf6bd21 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
79d4ca6fae 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
4cb61a2e8d Made comments more descriptive 2021-02-26 18:15:24 -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
Samuel Keiffer
f608ff9806 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
e58768bc37 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
07f34e11f9 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
Sam
8dbdaa8759 Swords 2021-02-24 18:54:06 -05:00
Marcel
b305a3f5e0 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
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
Avi Weinstock
77aeb43247 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -05:00