Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,717 Commits 151 Branches 18 Tags
Commit Graph

6717 Commits

This Branch
This Branch
All Branches
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
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
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
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
jshipsey
c9b9d81003 dash, spin, jump changes 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
Sam
8721f053f9 Fixed particles. 2021-02-27 01:42:46 -05:00
jshipsey
7e2794c234 anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
jshipsey
fa1f2b0880 golem retrofit 2021-02-27 01:42:46 -05:00
Timo Kösters
ef2cc3082a Improve particles 2021-02-27 01:42:46 -05:00
jshipsey
d8eeffeacd speedier weapons initial testing 2021-02-27 01:42:45 -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
749fc13882 rendering 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