Imbris
a4a75782ab
Merge branch 'xvar/fix-admin-loss-on-character-switch' into 'master'
...
Preserve admin component if present on return to character select screen
Closes #780
See merge request veloren/veloren!1413
2020-09-27 20:34:05 +00:00
Imbris
956365e07e
Merge branch 'update-pt_BR-and-translation-fixes' into 'master'
...
Update pt_BR.ron
See merge request veloren/veloren!1407
2020-09-27 20:34:03 +00:00
Ben Wallis
1205820e8b
Preserve admin component if present on return to character select screen
2020-09-27 20:25:00 +01:00
Joshua Yanovski
443f3287e4
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
b3dd8e8a02
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors
2020-09-27 17:25:33 +01:00
Joshua Yanovski
5af5ceb1f9
Address review comments.
2020-09-27 17:06:46 +02:00
Joshua Yanovski
3512898c2b
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
2b0dee8af6
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
11fc74642e
Refactored crafting to use ItemDef instead of Item
2020-09-27 14:55:31 +01:00
Ben Wallis
099dfaae9c
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
Nícolas Wildner
5329b4c54b
Update pt_BR.ron
2020-09-26 19:13:45 +00:00
Nícolas Wildner
55865dfb06
Update pt_BR.ron
2020-09-26 18:46:37 +00:00
Nícolas Wildner
855631feda
Update pt_BR.ron
2020-09-26 18:20:59 +00:00
Nícolas Wildner
738688ea60
Update pt_BR.ron
2020-09-26 18:10:22 +00:00
Joshua Yanovski
529533466c
Fix collision detection in liquid.
2020-09-26 16:53:49 +02:00
Joshua Yanovski
938039a56e
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
98c8240879
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
103bda2230
Removed redundant code missed in auth merge.
2020-09-22 18:21:31 +02:00
Marcel
57b7d3071d
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
b7dc17c11f
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
8eec46424f
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
0a64eecffb
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
4f0faf4c56
small corrections
2020-09-21 23:57:10 -04:00
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
