25ab132d73
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
c0e32dd979
Merge branch 'sharp/improve-chunk-memory' into 'master'
...
Improve chunk space consumption by a lot.
See merge request veloren/veloren!1415
2020-09-28 19:08:11 +00:00
7d6aebb316
Fix hacky solution with proper defragmentation.
...
After generating a chonk, we now find the highest frequency block (in
terms of the number of groups that uniformly consist of that block) and
replace the chunk's default with that one. We also resort the data in
the process to be in the same order as the original array index. This
improves our memory savings from 3x to almost 7x, and brings us within a
factor of 3 or so of what I hope a true average will be.
The defragmentation is not totally optimal and can probably be improved
from a performance perspective, but given how much of a hard bottleneck
RAM is this seems worthwhile. Also, this doesn't suffer from the issues
the previous solution did.
2020-09-28 16:56:26 +02:00
b9528da8f6
Improve chunk space consumption by a lot.
...
3x - 5x depending on terrain. We can do a lot better but this is a good
start.
Also, added chunk group count to metrics. This correlates with memory
usage specifically by chunk voxel data in a much more direct way than
chonk or chunk count do, so this should provide extra useful information
(especially for our average overhead per chonk / chunk).
2020-09-28 13:35:49 +02:00
c8d7bf3aad
Merge branch 'xvar/remove-option-from-characterloader-channels' into 'master'
...
Removed unnecessary Option around send and receive channels in character_loader.rs
See merge request veloren/veloren!1412
2020-09-27 22:30:25 +00:00
9178327e09
Removed unnecessary Option around send and receive channels in character_loader.rs
2020-09-27 22:12:41 +01:00
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
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
1205820e8b
Preserve admin component if present on return to character select screen
2020-09-27 20:25:00 +01:00
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
b3dd8e8a02
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors
2020-09-27 17:25:33 +01:00
5af5ceb1f9
Address review comments.
2020-09-27 17:06:46 +02:00
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
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
11fc74642e
Refactored crafting to use ItemDef instead of Item
2020-09-27 14:55:31 +01:00
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
5329b4c54b
Update pt_BR.ron
2020-09-26 19:13:45 +00:00
55865dfb06
Update pt_BR.ron
2020-09-26 18:46:37 +00:00
855631feda
Update pt_BR.ron
2020-09-26 18:20:59 +00:00
738688ea60
Update pt_BR.ron
2020-09-26 18:10:22 +00:00
529533466c
Fix collision detection in liquid.
2020-09-26 16:53:49 +02:00
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
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
103bda2230
Removed redundant code missed in auth merge.
2020-09-22 18:21:31 +02:00
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
b7dc17c11f
switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0
2020-09-22 12:04:07 +02:00
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
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
4f0faf4c56
small corrections
2020-09-21 23:57:10 -04:00
fa2dd28587
Fixed various issues from better-things branch
2020-09-21 23:57:10 -04:00
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
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
2ff59c9f60
Addressed comments
2020-09-21 17:55:29 -05:00
becb58e305
Stopped all blocks being explodable
2020-09-21 23:47:33 +01:00
8ab0d5e5e0
Added icon for skillbar ability of sword.
2020-09-21 17:40:20 -05:00
0796337a8c
resolve minor anim hiccup
2020-09-21 17:40:19 -05:00
1fbcf2be80
Fixed pipeline errors.
2020-09-21 17:40:19 -05:00
b4018e7d42
Made 3rd ability interruptible. Final balance tweaks.
2020-09-21 17:40:16 -05:00
8070a38a89
spin anim
2020-09-21 17:38:57 -05:00
133e79ffd5
Modified how spin melee functions.
2020-09-21 17:38:56 -05:00
e79cef4824
dash animation
2020-09-21 17:38:55 -05:00
a8e834e754
Initial implementation of spin attack for sword.
2020-09-21 17:38:54 -05:00
b0d359e29f
slightly quicker alpha, improved anims
2020-09-21 17:38:54 -05:00
fe70b7fbce
Addressed second round of feedback.
2020-09-21 17:38:53 -05:00
b06ab250cc
Addressed first round of feedback on sword overhaul.
2020-09-21 17:38:52 -05:00
c99e4c3c18
Added swing duration to dash melee. Added framework for animation to be added.
2020-09-21 17:38:51 -05:00
6dede05a0e
Combo now only increases when landing a hit.
2020-09-21 17:38:51 -05:00
2aac008b90
Attack speed now scales with combo in combo melee.
2020-09-21 17:38:50 -05:00
e54483d789
Shifted hit attempt to before swing duration, instead of after.
2020-09-21 17:38:49 -05:00
b79235b890
Dash melee now works as desired.
2020-09-21 17:38:49 -05:00
