1738 Commits

Author SHA1 Message Date
jshipsey
b5d3cd09e6 hammer leap melee anim 2020-10-14 12:50:33 -07:00
Sam
197755c233 Fixed errors from transitioning some states to keyframes. 2020-10-14 12:50:33 -07:00
Sam
30b45fc079 Added keyframes to leap melee. 2020-10-14 12:50:33 -07:00
Sam
b2501a5b5d Added keyframes to repeater ranged. 2020-10-14 12:50:33 -07:00
Sam
05091687df Added keyframes to charged melee. 2020-10-14 12:50:32 -07:00
jiminycrick
90e93e63bd Made bow leap more graceful and set energy costs and removed jitter for no leap 2020-10-14 12:50:32 -07:00
jiminycrick
a84faedf17 Reducing the amount of data in character state 2020-10-14 12:50:32 -07:00
jiminycrick
973f59da6e Addressed comments 2020-10-14 12:50:32 -07:00
jiminycrick
7e5ced158b Add skillbar stuff for 3rd skills 2020-10-14 12:50:32 -07:00
jiminycrick
7e091dddc6 Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff 2020-10-14 12:50:32 -07:00
Imbris
d824bfaaee Fix system data folder name, panic when outside the project dir and there is no env var set 2020-10-13 02:29:32 -04:00
Marcel Märtens
69b3d8616c rename a file, fix error msg, dont spam persistence by default 2020-10-13 00:06:24 +02:00
Marcel Märtens
e8e6e7e49a pack together InGame, CharacterScreen and General variant in a single enum, as requested by zesterer.
His reason to reqeust that is, that there might not be a perfect disctinction in the future.
Now we need to send ServerGeneral over streams and do additional checking at various places to verify that not the wrong variant is send.
2020-10-12 11:27:21 +02:00
Marcel Märtens
ebd4ff084a create a ServerMsg and ClientMsg enum and verify the state when in debug mode to benefit from the transition 2020-10-11 22:59:53 +02:00
Marcel Märtens
17bcccbed0 fix naming, replace NotInGame with CharacterScreen 2020-10-11 22:55:38 +02:00
Marcel Märtens
c1b27cc3e1 No longer block the main thread for client connections, new clients will be handled by server without waiting.
- Instread we have a dedicated thread that will async wait for new participants to connect and then notify the main thread
- registry no longer sends a view distance with it.
- remove ClientMsg::Command again as it's unused
2020-10-11 22:55:02 +02:00
Marcel Märtens
46126b0046 Rename enums to allow a super enum in the future, but i am not yet sure if we want to introduce this yet
```
//This is a helper structure, containing all possible data send over
pub enum ClientMsg {
    Initial(ClientType),
    General(ClientGeneralMsg),
    InGame(ClientInGameMsg),
    NotInGame(ClientNotInGameMsg),
    Register(ClientRegisterMsg),
    Ping(PingMsg)
}
```
2020-10-11 22:49:25 +02:00
Marcel Märtens
877f84757b 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
Monty Marz
489f8697e6 loot table adjustments
- decrease blue glider drop rate
- decrease cloth scaprs drop rate from villagers
- add crafting mats to crates instead
2020-10-11 16:25:35 +00:00
Imbris
8ad8864b9b Change admins from Vec<String> into Hashset<Uuid>, add commands to server-cli-bin for adding and removing admins 2020-10-10 02:10:32 -04:00
Imbris
35a0787f04 Fix clippy warnings 2020-10-10 02:10:32 -04:00
Imbris
52362cfd08 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
Imbris
2a99072d21 Change projectiles to not be pushed back by collisions, moved group check into projectile system from physics system 2020-10-10 02:10:31 -04:00
Monty Marz
d80683bc76 make clippy happy
Delete glider.ron
2020-10-07 02:23:20 +00:00
Sam
dbe6ac0fc8 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
bf20e5090b Addressed comments 2020-09-29 19:48:17 -05:00
Sam
bd89c81907 Changelog line, final balance tweaks. 2020-09-29 19:48:16 -05:00
Sam
4ee552cd86 Add migration 2020-09-29 19:48:15 -05:00
Sam
7df6b781f1 Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
5803d47a94 Beam tick rate now more responsive when aiming. 2020-09-29 19:48:14 -05:00
Sam
884eb2f7e6 Improvements to beam collision. 2020-09-29 19:48:14 -05:00
Sam
aead42a336 Fixed what broke after rebasing. 2020-09-29 19:48:13 -05:00
Sam
8de843a073 Created manifest for database to filepath for items. 2020-09-29 19:48:12 -05:00
Sam
46060c22a6 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Sam
b8e4f506cc 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
9a9668969d 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
2244a271a1 doubled energy consumption for M1 healing 2020-09-29 19:48:10 -05:00
Sam
e71e487abd Addressed feedback in sceptre branch 2020-09-29 19:48:09 -05:00
Sam
813144832c Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Sam
509bff0d79 Added healing healthsource logic to beam system. 2020-09-29 19:48:08 -05:00
Monty Marz
0d4979395e 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
410090317e Energy no longer regens when heal target is at full health. 2020-09-29 19:48:07 -05:00
Sam
8b23fc7aca Re-added necessary functionality to beam (heal, lifesteal, energy regen). 2020-09-29 19:48:06 -05:00
Sam
29f27bfdec Addressed comments. 2020-09-29 19:48:06 -05:00
Sam
628b02b1bd Tweaked beam collision logic to be more accurate. 2020-09-29 19:48:05 -05:00
Sam
f26dad94a0 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
a3459b309c Added beam system. Added collision code for spherical wedge/cylinder detection. 2020-09-29 19:48:04 -05:00
Sam
3fcf22b2e0 Beams now have spherical hit detection. 2020-09-29 19:48:02 -05:00
Sam
7a50b94445 M1 now only regens stamina when healing allies if they are not at full health. 2020-09-29 19:48:02 -05:00
Sam
19dadb2c8d Tick rate now exposed as a variable. 2020-09-29 19:48:01 -05:00