Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,474 Commits 151 Branches 18 Tags
Commit Graph

5474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
c3c9047658 Merge branch 'xMAC94x/netfixD' into 'master' 
xMAC94x/netfixD

See merge request veloren/veloren!1444
 2020-11-03 13:07:33 +00:00
Marcel Märtens
e24f908280 Undo one Componenet per Stream and instead use Client. 
In order to keep the performance we made it Internal Mutability and use a `Mutex` per Stream, till `Stream.send` is no longer `&mut self`.
The old solution didn't rely on this, but needed multiple Components instead which zest didn't liked
 2020-11-03 08:56:08 +01:00
Marcel Märtens
dc26a6e36f extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
3efcca88af Fix an error that a failed initialization of a client lead to a Kill of the gameserver. Instead we just log a msg now. 2020-11-03 08:55:56 +01:00
Marcel Märtens
93451d12ed Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly 2020-11-03 08:55:54 +01:00
Marcel Märtens
50ac07c752 review: 
- fix wording in error msg
 - find better name for structs
 - unify errors and cleanup code with `(|| {foo?; Some(())})()` pattern
 - fix the negative PlayersOnline, it was caused by having a gracefull shutdown AND a timeout error. we now unregister the client when he issues TERMINATE
 2020-11-03 08:55:51 +01:00
Marcel Märtens
b11ee10b9c implement lazy_msg which only serialize + compress AT MAX ONCE if the same msg is send to multiple participants 2020-11-03 08:55:46 +01:00
Marcel Märtens
cc6f094e8a remove clippy warnings no longer needed 2020-11-03 08:55:44 +01:00
Marcel Märtens
bfe623fe8d replace the single message system with 5 message systems. one per stream to handle less ECS systems PER msg system. 
As the MAIN message system was already on 25 of the max of 26 possible Ressources
 2020-11-03 08:55:42 +01:00
Marcel Märtens
378b769999 working on implementing seperated msg system. 
Does compile, but only reach connection till character screen.
Full play not yet possible
 2020-11-03 08:55:36 +01:00
Marcel Märtens
3cbde52735 remote all streams from Client and put it directly in the ecs system. 
This commit does not run compile as the message sys now would requiere 30 imput parameters which is over the max of 26 :/
 2020-11-03 08:55:35 +01:00
Samuel Keiffer
f0fc0b60e1 Merge branch 'ubruntu/make-sneak-stealthy' into 'master' 
Make Sneak Stealthy

See merge request veloren/veloren!1477
 2020-11-03 04:09:38 +00:00
ubruntu
40e7fd6c14 Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
Monty Marz
8eed7afce8 Merge branch 'Fausk/improved_descriptions' into 'master' 
fixup improved item descriptions for most items (no swords)

See merge request veloren/veloren!1469
 2020-11-02 15:18:33 +00:00
Fausk
8cd4c7bf38 Grammar and length reduction, Lucerne and Pike Hammer swap names for consistency 2020-11-01 13:29:35 -07:00
Kelly Monroe
f9b8cf5fc9 Fixing up further grammar and length issues, Lucerne and Spike Hammer swap names 2020-11-01 13:29:35 -07:00
Fausk
60ac1d2f83 fixup improved item descriptions for most items (no swords) 2020-11-01 13:29:35 -07:00
Samuel Keiffer
b2254b2ffe Merge branch 'brunt/make-bows-bleed' into 'master' 
10% of bow hits cause bleed debuff

Closes #817

See merge request veloren/veloren!1470
 2020-11-01 18:38:57 +00:00
ubruntu
d84da01a12 10% of bow hits cause bleed debuff 2020-11-01 18:38:57 +00:00
Samuel Keiffer
00cd3c40a5 Merge branch 'sam/sceptre-fix' into 'master' 
Sceptre fix

See merge request veloren/veloren!1468
 2020-10-31 19:05:31 +00:00
Sam
9e16f2ee70 Sceptre fix. 2020-10-31 12:57:51 -05:00
Imbris
9ec29c5465 Merge branch 'bbenton91/add-mount-range-check' into 'master' 
Fixes #814. Added range check to mounting

Closes #814

See merge request veloren/veloren!1466
 2020-10-31 03:50:00 +00:00
Imbris
2ac3dcb862 Merge branch 'bbenton91/add-range-check-to-block' into 'master' 
Fixes #815. Added range check to block pickup

Closes #815

See merge request veloren/veloren!1465
 2020-10-31 03:49:59 +00:00
Brad
647f000b0a Added range check to mounting 2020-10-30 22:34:44 -04:00
Brad
7a698f5fbc Added range check to block pickup 2020-10-30 19:50:36 -04:00
Joshua Barretto
2755b63fa7 Merge branch 'zesterer/clouds' into 'master' 
Minor cloud tweaks

See merge request veloren/veloren!1450
 2020-10-30 23:18:26 +00:00
Joshua Barretto
6dd5f10ffd Better minimal clouds 2020-10-30 15:43:51 +00:00
Joshua Barretto
3435d6f1f3 Cloud tweaks 2020-10-30 15:43:51 +00:00
Imbris
9512a395a8 Merge branch 'bbenton91/fix-password-length' into 'master' 
Changed password scale to allow 34 characters. Fixes issue #743

Closes #743

See merge request veloren/veloren!1464
 2020-10-30 02:37:54 +00:00
Imbris
59be1d134b Merge branch 'imbris/random-fixes' into 'master' 
Random Fixes 3

See merge request veloren/veloren!1463
 2020-10-30 01:52:36 +00:00
Brad
fcb0e788f3 Changed password scale to allow 34 characters 2020-10-29 21:17:31 -04:00
Imbris
d616fdb1b5 Update changelog, address comments, fmt 2020-10-29 19:12:54 -04:00
Imbris
5660cd6961 Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts 2020-10-29 18:40:11 -04:00
Imbris
40ab8c9dad Only try to connect to the singleplayer server after it has been initialized 2020-10-29 18:30:49 -04:00
Imbris
20c6b171d6 Log where the userdata folder is in binary crates, fix bug where the old 
path was logged instead of the new path when renaming invalid settings
 2020-10-29 18:30:49 -04:00
Imbris
0f8b6926ea Only allow hotbar keys instead of all UI related keys when the UI is hidden 2020-10-29 18:30:48 -04:00
Imbris
05e58a17f6 Rename running_tps_average -> running_average_delta 2020-10-29 18:30:19 -04:00
Samuel Keiffer
b4a9ce11e4 Merge branch 'sam/small-fixes' into 'master' 
Sam/small fixes part 1

Closes #525, #410, #412, and #397

See merge request veloren/veloren!1455
 2020-10-29 04:03:07 +00:00
Sam
1315ad68b1 Addressed comments. 2020-10-28 22:04:15 -05:00
Sam
772295df09 Fixed audio tests. 2020-10-28 18:15:28 -05:00
Sam
e86b38f3d2 Transitioned forced movement to an enum. 2020-10-28 18:15:27 -05:00
Sam
d4a8320780 Transitioned knockback to an enum. 2020-10-28 18:15:27 -05:00
Sam
0806f3155f Tweaked dash melee some more. 2020-10-28 18:15:26 -05:00
Sam
824a5e0aa7 Transitioned damage and healing from u32/i32s to enums. 2020-10-28 18:15:25 -05:00
Sam
af7d3fd1ef Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3. 2020-10-28 18:15:25 -05:00
Sam
060dd269f3 Leaps now require a non-negative vertical velocity to use. 2020-10-28 18:15:24 -05:00
Sam
7c3779582c Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity. 2020-10-28 18:15:24 -05:00
Sam
dd3e5f9a64 Added keyframes to all states that were lacking them. 2020-10-28 18:15:23 -05:00
Dominik Broński
a492ecbb1f Merge branch 'Tadabito-master-patch-76036' into 'master' 
Update tr_TR.ron

See merge request veloren/veloren!1459
 2020-10-28 23:11:46 +00:00
Tadabito
339a4070ee Added translation for place holder quest. 2020-10-28 20:36:19 +00:00