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
5,269 Commits 151 Branches 18 Tags 2.1 GiB
b1db5ef488
Commit Graph

5269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Snowram
fa2dd28587 Fixed various issues from better-things branch 2020-09-21 23:57:10 -04:00
Joshua Barretto
2f2e766ebb Merge branch 'zesterer/better-block-format' into 'master' 
Stopped all blocks being explodable

See merge request veloren/veloren!1402
 2020-09-22 00:26:06 +00:00
Samuel Keiffer
18b912ea6f Merge branch 'sam/sword-overhaul' into 'master' 
Sword overhaul

Closes #763 and #761

See merge request veloren/veloren!1365
 2020-09-21 23:55:49 +00:00
Sam
2ff59c9f60 Addressed comments 2020-09-21 17:55:29 -05:00
Joshua Barretto
becb58e305 Stopped all blocks being explodable 2020-09-21 23:47:33 +01:00
Sam
8ab0d5e5e0 Added icon for skillbar ability of sword. 2020-09-21 17:40:20 -05:00
jshipsey
0796337a8c resolve minor anim hiccup 2020-09-21 17:40:19 -05:00
Sam
1fbcf2be80 Fixed pipeline errors. 2020-09-21 17:40:19 -05:00
Sam
b4018e7d42 Made 3rd ability interruptible. Final balance tweaks. 2020-09-21 17:40:16 -05:00
jshipsey
8070a38a89 spin anim 2020-09-21 17:38:57 -05:00
Sam
133e79ffd5 Modified how spin melee functions. 2020-09-21 17:38:56 -05:00
jshipsey
e79cef4824 dash animation 2020-09-21 17:38:55 -05:00
Sam
a8e834e754 Initial implementation of spin attack for sword. 2020-09-21 17:38:54 -05:00
jshipsey
b0d359e29f slightly quicker alpha, improved anims 2020-09-21 17:38:54 -05:00
Sam
fe70b7fbce Addressed second round of feedback. 2020-09-21 17:38:53 -05:00
Sam
b06ab250cc Addressed first round of feedback on sword overhaul. 2020-09-21 17:38:52 -05:00
Sam
c99e4c3c18 Added swing duration to dash melee. Added framework for animation to be added. 2020-09-21 17:38:51 -05:00
Sam
6dede05a0e Combo now only increases when landing a hit. 2020-09-21 17:38:51 -05:00
Sam
2aac008b90 Attack speed now scales with combo in combo melee. 2020-09-21 17:38:50 -05:00
Sam
e54483d789 Shifted hit attempt to before swing duration, instead of after. 2020-09-21 17:38:49 -05:00
Sam
b79235b890 Dash melee now works as desired. 2020-09-21 17:38:49 -05:00
Sam
744843d03f Dash now stops when colliding with entity 2020-09-21 17:38:48 -05:00
Sam
04af75bf8d Initial implementation of new dash melee. 2020-09-21 17:38:48 -05:00
Sam
abcd0af1e3 Removed combo duration of combo melee (combo now activated from recover duration). Allowed for forced forward movement in combo melee, and added it to stages 1 and 3). 2020-09-21 17:38:47 -05:00
jshipsey
a18c23025e stage 2 and 3 anim 2020-09-21 17:38:46 -05:00
Sam
847bddbd89 Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states. 2020-09-21 17:38:46 -05:00
Sam
2ba9d1e54f Added support for different swings in the combo melee having differnt fractions of time buildup duration is split. 2020-09-21 17:38:45 -05:00
jshipsey
2451a64b97 stage 2 animation 2020-09-21 17:38:44 -05:00
Sam
0ba5740265 Added enum for stage section instead of using 4 bools. 2020-09-21 17:38:43 -05:00
Sam
440e45f2bc Did stuff to support addition of keyframes for combo melee animation. 2020-09-21 17:38:43 -05:00
Sam
aab56ea636 Animation time for combo melee now resets between stages. 2020-09-21 17:38:42 -05:00
Sam
cf573a42bd Initial implementation of combo melee attack. 2020-09-21 17:38:41 -05:00
Joshua Barretto
b3117feea6 Merge branch 'zesterer/better-block-format' into 'master' 
Improved representation of Block for better performance, more...

See merge request veloren/veloren!1395
 2020-09-21 21:49:43 +00:00
Joshua Barretto
0ca42857fa Addressed review issues 2020-09-21 21:10:32 +01:00
Joshua Barretto
aa8d9d5998 Merge branch 'henild/golem-println-fix' into 'master' 
Delete the extra println statement

See merge request veloren/veloren!1401
 2020-09-21 15:53:56 +00:00
henild
84239906f7 Delete the extra println 2020-09-21 21:13:00 +05:30
Joshua Barretto
388a899a7f Added make_sprite command 2020-09-21 16:39:20 +01:00
Joshua Barretto
1e900e8c6a Removed unused sprite manifests 2020-09-21 16:07:38 +01:00
Joshua Barretto
112b11c951 Fixed broken arrow physics 2020-09-20 11:56:57 +01:00
Joshua Barretto
49d1b3df6d Improved docs 2020-09-20 11:46:12 +01:00
Joshua Barretto
ee3781d168 Updated lockfile 2020-09-20 11:46:12 +01:00
Joshua Barretto
ee26ad662e Updated changelog 2020-09-20 11:46:12 +01:00
Joshua Barretto
ece4a01867 Improved representation of Block for better performance, more features, and better backwards-compatibility 2020-09-20 11:46:12 +01:00
Samuel Keiffer
b2f42a117c Merge branch 'sam/boss' into 'master' 
Boss

Closes #769

See merge request veloren/veloren!1364
 2020-09-19 20:47:07 +00:00
Joshua Yanovski
7b43752785 Merge branch 'droogmic/scene_terrain_refator' into 'master' 
Voxygen scene terrain - minor refactor

See merge request veloren/veloren!1392
 2020-09-19 20:29:02 +00:00
Sam
6deeb7fcfe Addressed another comment. 2020-09-19 14:40:22 -05:00
Sam
45fef87f32 Addressed comments 2020-09-19 14:40:21 -05:00
Sam
e39770d1d9 Golem now spawns in dungeon. 2020-09-19 14:40:20 -05:00
Sam
99aba78422 Added healing healthsource logic to shockwave system. 2020-09-19 14:40:19 -05:00
Sam
6a1acd47a1 Added maximum vertical angle for shockwave. 2020-09-19 14:40:19 -05:00