Sam
a679a34a7b
Reverted changes to melee system that were added to when beam was initially in melee system.
2020-09-29 19:48:04 -05:00
Sam
46563e7008
Added beam system. Added collision code for spherical wedge/cylinder detection.
2020-09-29 19:48:04 -05:00
Sam
ddbe871b50
Placeholder animation for beam attack.
2020-09-29 19:48:03 -05:00
Sam
03b5cac2f9
Beams now have spherical hit detection.
2020-09-29 19:48:02 -05:00
Sam
6bb680f372
M1 now only regens stamina when healing allies if they are not at full health.
2020-09-29 19:48:02 -05:00
Sam
8f7d45100d
Tick rate now exposed as a variable.
2020-09-29 19:48:01 -05:00
Monty Marz
a2d74b71c4
change tick rate
2020-09-29 19:48:01 -05:00
Monty Marz
2b8d1e6fb9
test values
2020-09-29 19:48:00 -05:00
Sam
bcda944af9
Fixed energy cost for playtesting purposes.
2020-09-29 19:48:00 -05:00
Sam
36762be2a7
Fixed explosion color of sceptre M2.
2020-09-29 19:47:59 -05:00
Monty Marz
387f2cb60c
color adjustments
2020-09-29 19:47:59 -05:00
Sam
6b23af6e0b
Tweaked particles. Added skill icons.
2020-09-29 19:47:58 -05:00
Sam
8b9202710f
New sceptre M2 is functional.
2020-09-29 19:47:57 -05:00
Sam
921d224ef6
Lifesteal now works. Added particles to healing beam.
2020-09-29 19:47:57 -05:00
Sam
f20134d7ea
Initial implementation for beam attack.
2020-09-29 19:47:56 -05:00
Joshua Yanovski
8cf0121c0e
Merge branch 'sharp/improve-chunk-memory' into 'master'
...
Reduce chunks / chonk by trimming the ends.
See merge request veloren/veloren!1416
2020-09-29 19:15:24 +00:00
Joshua Yanovski
69f68ddf29
Reduce chunks / chonk by trimming the ends.
...
This improves the defragment operation for chonks by letting them remove
chunks at the top that match above, and bottom that match below. This
reduces the chunks / chonk from around 5.9 to around 3.4 at origin. From
my investigations, adding something for water would probably get us a
full 50% reduction, if we could collapse intermediate chunks; block
types other than rock / air / water never appear to have full chunks of
the same block, so any additional optimization will require changes to
the subchunk compression format or changes to the actual chunks we
generate.
2020-09-29 19:08:45 +02:00
Forest Anderson
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
Joshua Yanovski
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
Joshua Yanovski
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
Joshua Yanovski
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
Imbris
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
Ben Wallis
9178327e09
Removed unnecessary Option around send and receive channels in character_loader.rs
2020-09-27 22:12:41 +01:00
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
