Sam
29f27bfdec
Addressed comments.
2020-09-29 19:48:06 -05:00
Sam
a3459b309c
Added beam system. Added collision code for spherical wedge/cylinder detection.
2020-09-29 19:48:04 -05:00
Sam
7a58f0c425
Placeholder animation for beam attack.
2020-09-29 19:48:03 -05:00
Sam
aaf08bde16
Fixed explosion color of sceptre M2.
2020-09-29 19:47:59 -05:00
Sam
e92116cd1d
Tweaked particles. Added skill icons.
2020-09-29 19:47:58 -05:00
Sam
2dad6cf9af
New sceptre M2 is functional.
2020-09-29 19:47:57 -05:00
Sam
e62c0cd1bd
Lifesteal now works. Added particles to healing beam.
2020-09-29 19:47:57 -05:00
Forest Anderson
11578b5173
Merge branch 'xvar/add-clone-on-ref-ptr-clippy-lint' into 'master'
...
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors
See merge request veloren/veloren!1411
2020-09-28 19:32:03 +00:00
Joshua Yanovski
2399f8b8c2
Merge branch 'sharp/remove-spurious-vox' into 'master'
...
Remove spurious uses of Vox.
See merge request veloren/veloren!1406
2020-09-27 16:41:29 +00:00
Ben Wallis
06b4d3a489
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors
2020-09-27 17:25:33 +01:00
Ben Wallis
306cd4312d
Refactored crafting to use ItemDef instead of Item
2020-09-27 14:55:31 +01:00
Joshua Yanovski
27929bf9ae
Remove spurious uses of Vox.
...
In the process, also try to address a few edge cases related to block
detection, such as adding back previously solid sprites and removing
filters that may be vestiges of earlier logic.
2020-09-26 16:30:40 +02:00
Marcel Märtens
699e3e0934
switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0
2020-09-22 12:04:07 +02:00
Marcel Märtens
8fd5b2358f
switching veloren naming scheme, to either one of the following:
...
`stable-0.7.0 (<hash>-<datetime>)` for release versions.
And
`nightly-<date> (<hash>)` for nightly and master versions
Reason is, many players only give information that they are running `0.x.0` but are not giving us the information which day, or commit they are running. So we should make master builds less confusing.
2020-09-22 11:47:18 +02:00
jshipsey
9401c305e1
small corrections
2020-09-21 23:57:10 -04:00
Snowram
7d96ad318d
Fixed various issues from better-things branch
2020-09-21 23:57:10 -04:00
Sam
b9bd9ae94e
Addressed comments
2020-09-21 17:55:29 -05:00
Sam
3cddaf4ce8
Added icon for skillbar ability of sword.
2020-09-21 17:40:20 -05:00
jshipsey
803870e6a8
resolve minor anim hiccup
2020-09-21 17:40:19 -05:00
Sam
e92fdb79da
Fixed pipeline errors.
2020-09-21 17:40:19 -05:00
Sam
d6b7d422c1
Made 3rd ability interruptible. Final balance tweaks.
2020-09-21 17:40:16 -05:00
jshipsey
a478979914
spin anim
2020-09-21 17:38:57 -05:00
jshipsey
9db1638db6
dash animation
2020-09-21 17:38:55 -05:00
Sam
cb707fb6b2
Initial implementation of spin attack for sword.
2020-09-21 17:38:54 -05:00
jshipsey
7596fb2d9a
slightly quicker alpha, improved anims
2020-09-21 17:38:54 -05:00
Sam
c44b02bf19
Addressed second round of feedback.
2020-09-21 17:38:53 -05:00
Sam
7c18663990
Addressed first round of feedback on sword overhaul.
2020-09-21 17:38:52 -05:00
Sam
36e7f3d9c1
Added swing duration to dash melee. Added framework for animation to be added.
2020-09-21 17:38:51 -05:00
Sam
55eb949ba4
Initial implementation of new dash melee.
2020-09-21 17:38:48 -05:00
jshipsey
a0cbdaee28
stage 2 and 3 anim
2020-09-21 17:38:46 -05:00
Sam
75adf154ae
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
1b39374d29
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
7b3b4da073
stage 2 animation
2020-09-21 17:38:44 -05:00
Sam
2682b18bc2
Added enum for stage section instead of using 4 bools.
2020-09-21 17:38:43 -05:00
Sam
0ce0765b09
Did stuff to support addition of keyframes for combo melee animation.
2020-09-21 17:38:43 -05:00
Sam
4cab71667e
Animation time for combo melee now resets between stages.
2020-09-21 17:38:42 -05:00
Sam
e3b7507ba4
Initial implementation of combo melee attack.
2020-09-21 17:38:41 -05:00
Joshua Barretto
b44ecf5a3d
Added make_sprite command
2020-09-21 16:39:20 +01:00
Joshua Barretto
d17ab15dd9
Improved representation of Block for better performance, more features, and better backwards-compatibility
2020-09-20 11:46:12 +01:00
Samuel Keiffer
65da0a7f55
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
078971683e
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
32bca583d5
Addressed another comment.
2020-09-19 14:40:22 -05:00
Sam
227dd2883e
Addressed comments
2020-09-19 14:40:21 -05:00
Sam
8aed41de4b
Golem now spawns in dungeon.
2020-09-19 14:40:20 -05:00
Sam
7eab7dca41
Moved knockback to a server event so that it would actually be applied to the player.
2020-09-19 14:40:17 -05:00
scott-c
42aecad3e3
Tweak particle effects
2020-09-19 14:40:15 -05:00
Sam
ea9d4d5292
Added particles dedicated for shockwave.
2020-09-19 14:40:15 -05:00
Sam
5454c51248
Added particles to shockwave attack.
2020-09-19 14:40:14 -05:00
Sam
84fc76ac56
Started to implement shockwave system.
2020-09-19 14:29:06 -05:00
Sam
7fc9c72a4a
Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.
2020-09-19 14:29:04 -05:00
