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
cfb3fb5d42
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
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
9ede33d2e4
Merge branch 'hotfix-loottables' into 'master'
...
Hotfix loottables
See merge request veloren/veloren!1431
2020-10-11 16:25:35 +00: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
39d54e0722
Merge branch 'imbris/migrate-singleplayer-save-location' into 'master'
...
Migrate singleplayer saves folder to the new location if they have not already been generated
See merge request veloren/veloren!1430
2020-10-11 02:05:49 +00:00
Imbris
68096dd24b
Migrate singleplayer save folders to the new location if they have not already been generated
2020-10-10 20:25:32 -04:00
Imbris
6789807322
Merge branch 'imbris/random-fixes2' into 'master'
...
Random fixes 2.0
Closes #774 and #711
See merge request veloren/veloren!1396
2020-10-10 19:46:39 +00:00
Imbris
7211b6a8ad
Fix clippy, minor fmt, add TODO comments
2020-10-10 03:01:30 -04:00
Imbris
3ccca6aa17
Remove saves dir env var and setting from server settings and just always use saves as the dir name
2020-10-10 02:15:54 -04: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
b54aa022d5
Apply saves dir override when loading settings, change whitelist to a HashSet, let admins login even if they are not on the whitelist to reflect the comments in login code
2020-10-10 02:10:32 -04:00
Imbris
088b0994f9
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
Imbris
2e25205b15
Rename model_col -> highligh_col to better reflect its usage
2020-10-10 02:10:32 -04:00
Imbris
35a0787f04
Fix clippy warnings
2020-10-10 02:10:32 -04:00
Imbris
2532603ae8
Update CI and docker files to work with changes to data folder structure
2020-10-10 02:10:32 -04:00
Imbris
26dec245fa
Put server-cli specific settings in their own structure, serde_derive -> serde
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
7ad7c25cde
Downgrade debug -> trace in persistence code
2020-10-10 02:10:32 -04:00
Imbris
62105d654d
Add server-cli option to disable auth
2020-10-10 02:10:32 -04:00
Imbris
bbff0932e9
Make basic server-cli mode default to not reading input and add interactive option
2020-10-10 02:10:31 -04:00
Imbris
5856d665e8
Improve figure and sprite highlighting
2020-10-10 02:10:31 -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
6429b71f8f
Merge branch 'pfau/microscopic-fixes' into 'master'
...
Lanterns, Gliders, Quality Stat
See merge request veloren/veloren!1400
2020-10-07 02:23:20 +00:00
Monty Marz
d80683bc76
make clippy happy
...
Delete glider.ron
2020-10-07 02:23:20 +00:00
Marcel
7c198365c7
Merge branch 'undefined' into 'master'
...
Correction of errors
See merge request veloren/veloren!1421
2020-10-05 22:54:49 +00:00
Marcel
570366f8d2
Merge branch 'xvar/sigint-graceful-shutdown' into 'master'
...
Implemented graceful shutdown and fixed various TUI bugs
See merge request veloren/veloren!1423
2020-10-04 21:32:26 +00:00
Ben Wallis
cdf9d1b059
Implemented graceful shutdown on SIGUSR1 signal. Added shutdown <seconds> TUI command. Added abortshutdown TUI command. Fixed a bug in TUI that caused a panic on quit in basic mode on windows.
2020-10-04 21:24:45 +01:00
Samuel Keiffer
4cb618b018
Merge branch 'sam/sceptre-loot-fix' into 'master'
...
Loot table fix
See merge request veloren/veloren!1422
2020-10-04 14:54:35 +00:00
Sam
81fc925071
Loot table fix
2020-10-04 08:52:19 -05:00
pablo saavedra soler
23b3be0433
I have corrected many errors in Spanish grammar and dialect in Latin America
2020-10-04 06:41:35 +00:00
Marcel
bf09f2be4f
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
22e17042d6
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
dbe6ac0fc8
Addressed comments
2020-09-29 20:48:23 -05:00
Sam
be353c9fe0
Beam particles fixed/tweaked.
2020-09-29 19:48:17 -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
Monty Marz
3848594122
fix SCT decimals not being absolutes
2020-09-29 19:48:10 -05:00
Sam
e71e487abd
Addressed feedback in sceptre branch
2020-09-29 19:48:09 -05:00
