Marcel
33be0a0e9f
Merge branch 'mdroogle/interaction_hint' into 'master'
...
Add interaction hint #615
See merge request veloren/veloren!1394
2020-10-01 09:31:54 +00:00
Samuel Keiffer
a2daad8c76
Merge branch 'sam/sceptre-overhaul' into 'master'
...
Sceptre Rework
Closes #760
See merge request veloren/veloren!1345
2020-09-30 03:05:14 +00:00
Sam
47abf49751
Addressed comments
2020-09-29 20:48:23 -05:00
Sam
207586cfab
Beam particles fixed/tweaked.
2020-09-29 19:48:17 -05:00
Sam
5f889773b5
Addressed comments
2020-09-29 19:48:17 -05:00
Sam
51141b2c1a
Changelog line, final balance tweaks.
2020-09-29 19:48:16 -05:00
Sam
0b80257aa3
Add migration
2020-09-29 19:48:15 -05:00
Sam
56d2afc0dc
Added keyframe support to basic beam state. Addressed some comments.
2020-09-29 19:48:15 -05:00
Sam
a8f31cbe6f
Beam tick rate now more responsive when aiming.
2020-09-29 19:48:14 -05:00
Sam
506ad1e80e
Improvements to beam collision.
2020-09-29 19:48:14 -05:00
Sam
ffe456c703
Fixed what broke after rebasing.
2020-09-29 19:48:13 -05:00
Sam
37fcfb8b6f
Created manifest for database to filepath for items.
2020-09-29 19:48:12 -05:00
Sam
3d6c26a3c7
Fully separated sceptres from staves.
2020-09-29 19:48:12 -05:00
Sam
3e2e06f2f8
Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies.
2020-09-29 19:48:11 -05:00
Sam
67eafdabd0
Separated out energy cost for healing so it's not based off of the energy regen from dealing damage.
2020-09-29 19:48:11 -05:00
Monty Marz
3734fafcd8
doubled energy consumption for M1 healing
2020-09-29 19:48:10 -05:00
Monty Marz
2a884df8de
fix SCT decimals not being absolutes
2020-09-29 19:48:10 -05:00
Sam
5bd6f0e26f
Addressed feedback in sceptre branch
2020-09-29 19:48:09 -05:00
Sam
de45784596
Addressed round of testing feedback.
2020-09-29 19:48:09 -05:00
Sam
18c2b850d3
Added healing healthsource logic to beam system.
2020-09-29 19:48:08 -05:00
Monty Marz
13d9b814ab
separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre
...
remove firebolt from starting sceptre
2020-09-29 19:48:07 -05:00
Sam
7e95a93434
Energy no longer regens when heal target is at full health.
2020-09-29 19:48:07 -05:00
Sam
07fd9ac023
Re-added necessary functionality to beam (heal, lifesteal, energy regen).
2020-09-29 19:48:06 -05:00
Sam
095433abcc
Addressed comments.
2020-09-29 19:48:06 -05:00
Sam
799a6c1d1e
Tweaked beam collision logic to be more accurate.
2020-09-29 19:48:05 -05:00
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
