55b59fbe07
various small fixes according to the MR
2020-10-12 11:25:20 +02:00
d7a74c0cf1
fix voxygen state system. before we had a timing error that we did the next voxygen step before client set in_game which lead us to a disconnect.
...
now assume in_game is correct in client unless told by server in its answer
2020-10-11 22:49:19 +02:00
b1db5ef488
Redo Network Frontend.
...
Rather than having a single Stream to handle ALL data, seperate into multiple streams:
- Ping Stream, for seperate PINGS
- Register Stream, only used till the client is registered, then no longer used!
- General Stream, used for msg that can occur always
- NotInGame Stream, used for everything NOT ingame, e.g. Character Screen
- InGame Stream, used for all GAME data, players, terrain, entities, etc...
This version does compile, and gets the client registered (with auth too) but doesnt get to the char screen yet.
This fixes also the ignoring messages problem we had, as we are not sending data to the register stream!
This fixes also the problem that the server had to sleep for the Stream Creation, as the Server is now creating the streams and client has to sleep.
2020-10-11 22:49:14 +02:00
b9b84d2890
Migrate singleplayer save folders to the new location if they have not already been generated
2020-10-10 20:25:32 -04:00
83fb26c4f9
Group editable server settings into one struct that is stored in the ecs, don't expose DataDir, use Uuid in the whitelist instead of usernames, replace Banlist record tuple with new type with named fields, remove commented code
2020-10-10 02:10:32 -04:00
a3ee5a4006
Rename model_col -> highligh_col to better reflect its usage
2020-10-10 02:10:32 -04:00
308cca0dc9
Put server-cli specific settings in their own structure, serde_derive -> serde
2020-10-10 02:10:32 -04:00
7c14a3f4a4
New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes
2020-10-10 02:10:32 -04:00
ef74d395a6
Improve figure and sprite highlighting
2020-10-10 02:10:31 -04:00
2b800a2b63
make clippy happy
...
Delete glider.ron
2020-10-07 02:23:20 +00:00
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
47abf49751
Addressed comments
2020-09-29 20:48:23 -05:00
207586cfab
Beam particles fixed/tweaked.
2020-09-29 19:48:17 -05:00
51141b2c1a
Changelog line, final balance tweaks.
2020-09-29 19:48:16 -05:00
56d2afc0dc
Added keyframe support to basic beam state. Addressed some comments.
2020-09-29 19:48:15 -05:00
ffe456c703
Fixed what broke after rebasing.
2020-09-29 19:48:13 -05:00
3d6c26a3c7
Fully separated sceptres from staves.
2020-09-29 19:48:12 -05:00
2a884df8de
fix SCT decimals not being absolutes
2020-09-29 19:48:10 -05:00
de45784596
Addressed round of testing feedback.
2020-09-29 19:48:09 -05:00
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
095433abcc
Addressed comments.
2020-09-29 19:48:06 -05:00
46563e7008
Added beam system. Added collision code for spherical wedge/cylinder detection.
2020-09-29 19:48:04 -05:00
ddbe871b50
Placeholder animation for beam attack.
2020-09-29 19:48:03 -05:00
36762be2a7
Fixed explosion color of sceptre M2.
2020-09-29 19:47:59 -05:00
6b23af6e0b
Tweaked particles. Added skill icons.
2020-09-29 19:47:58 -05:00
8b9202710f
New sceptre M2 is functional.
2020-09-29 19:47:57 -05:00
921d224ef6
Lifesteal now works. Added particles to healing beam.
2020-09-29 19:47:57 -05:00
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
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
11fc74642e
Refactored crafting to use ItemDef instead of Item
2020-09-27 14:55:31 +01: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
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
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
2ff59c9f60
Addressed comments
2020-09-21 17:55:29 -05: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
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
04af75bf8d
Initial implementation of new dash melee.
2020-09-21 17:38:48 -05:00
a18c23025e
stage 2 and 3 anim
2020-09-21 17:38:46 -05:00
