Commit Graph

3109 Commits

Author SHA1 Message Date
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
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
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
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
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
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
7f2276324e Reduces the instances of f64 in anims 2021-02-27 23:21:03 +01:00
b4627dfe19 look-based anims 2021-02-27 16:19:33 -05:00
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
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
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
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
51bc74b2a5 visual weapon variation, adjust minotaur dash, keyframed golem quake 2021-02-27 01:42:47 -05:00
16a44cd532 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
417f4638ed balance pass 2 2021-02-27 01:42:47 -05:00
79ec9115f5 rebase, yeti in dungeon 2021-02-27 01:42:47 -05:00
e06ebf3507 initial balance 2021-02-27 01:42:47 -05:00
30af3a4493 dash, spin, jump changes 2021-02-27 01:42:46 -05:00
Sam
53b0ba286a Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
ce3b2141e1 theropod retrofit, some more moves 2021-02-27 01:42:46 -05:00
5792faa992 some new moves, combine biped weapons into one file 2021-02-27 01:42:46 -05:00
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
cb59c8017e anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
130d51786a golem retrofit 2021-02-27 01:42:46 -05:00
a4513fe09d Improve particles 2021-02-27 01:42:46 -05:00
aa4237b019 BL improvements, various fixes 2021-02-27 01:42:45 -05:00
e4e25e20c9 rebase 2021-02-27 01:42:45 -05:00
0dc8b2e482 rendering 2021-02-27 01:42:45 -05:00
ca3248cc93 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
ac16a8900d bow 2021-02-27 01:42:45 -05:00
66664f3f89 the stabs 2021-02-27 01:42:45 -05:00
6a57dd25d0 wielding 2021-02-27 01:42:45 -05:00
559ece5ede More npcs work 2021-02-27 01:42:45 -05:00
ebfb59f041 Trims skeletal attributes 2021-02-27 01:42:44 -05:00
7cf723bb9d gnome 2021-02-27 01:42:43 -05:00
266986626d biped_small setup 2021-02-27 01:42:43 -05:00
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
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
7d2e8f72eb Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
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
Sam
b0b4a07b9e Bows 2021-02-24 20:37:43 -05:00
Sam
ee5c9d78ca Swords 2021-02-24 18:54:06 -05:00
d4e3a3f29f #966 - Add setting to invert controller camera Y axis 2021-02-24 10:39:44 -06:00
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
4e57678f34 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -05:00
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
e1be8dbcd9 Merge branch 'aweinstock/quickfix-sword-spin-speed' into 'master'
Fix description for the sword spin speed skill tree upgrade (previously it was...

See merge request veloren/veloren!1814
2021-02-23 03:14:44 +00:00