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
Joshua Yanovski
cd435a76bc
Address review comments.
2020-09-27 17:06:46 +02:00
Joshua Yanovski
a42f9f7d4b
Merge branch 'xvar/crafting-item-def' into 'master'
...
Refactored crafting to use ItemDef instead of Item
See merge request veloren/veloren!1408
2020-09-27 15:03:45 +00:00
Joshua Yanovski
63f2952466
Merge branch 'xvar/add-missing-itemdefs-to-persistence-migration' into 'master'
...
Added several missing items to persistence migration
See merge request veloren/veloren!1409
2020-09-27 15:03:43 +00:00
Ben Wallis
306cd4312d
Refactored crafting to use ItemDef instead of Item
2020-09-27 14:55:31 +01:00
Ben Wallis
f0041e8c02
Added several missing items that didn't exist in any inventories/loadoads on the production server to the item_persistence migration
2020-09-27 14:51:57 +01:00
Joshua Yanovski
9b3e182ab7
Fix collision detection in liquid.
2020-09-26 16:53:49 +02: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
Joshua Yanovski
750decd41d
Merge branch 'sharp/fix-redundant-code' into 'master'
...
Removed redundant code missed in auth merge.
See merge request veloren/veloren!1404
2020-09-22 16:27:04 +00:00
Joshua Yanovski
aece193072
Removed redundant code missed in auth merge.
2020-09-22 18:21:31 +02:00
Marcel
0826ea06d8
Merge branch 'xMAC94x/versioning_scheme' into 'master'
...
switching veloren naming scheme, to either one of the following:
See merge request veloren/veloren!1386
2020-09-22 13:56:59 +00: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
Justin Shipsey
b79b2e4533
Merge branch 'snowram/anim-fixes' into 'master'
...
Fixed various issues from better-things branch
See merge request veloren/veloren!1398
2020-09-22 05:14:04 +00: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
Joshua Barretto
3043b4a664
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
bb20f41045
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
b9bd9ae94e
Addressed comments
2020-09-21 17:55:29 -05:00
Joshua Barretto
9a78a21355
Stopped all blocks being explodable
2020-09-21 23:47:33 +01: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
Sam
92dba638da
Modified how spin melee functions.
2020-09-21 17:38:56 -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
f86f5131d2
Combo now only increases when landing a hit.
2020-09-21 17:38:51 -05:00
Sam
4a55a63a28
Attack speed now scales with combo in combo melee.
2020-09-21 17:38:50 -05:00
Sam
a0b7f2170a
Shifted hit attempt to before swing duration, instead of after.
2020-09-21 17:38:49 -05:00
Sam
305ada341d
Dash melee now works as desired.
2020-09-21 17:38:49 -05:00
Sam
a64c151b4e
Dash now stops when colliding with entity
2020-09-21 17:38:48 -05:00
Sam
55eb949ba4
Initial implementation of new dash melee.
2020-09-21 17:38:48 -05:00
Sam
e0960c127e
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
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
12547739d8
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
d1adb9c4fc
Addressed review issues
2020-09-21 21:10:32 +01:00
Joshua Barretto
13770f6408
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
