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,602 Commits 151 Branches 18 Tags 2.1 GiB
6085edaa34
Commit Graph

5602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Märtens
a7123c6e14 put cache in ECS to get rid of allocations 2020-11-04 14:19:28 +01:00
Marcel
602da59b79 Merge branch 'xMAC94x/netfixE' into 'master' 
keep Presence when possesing

See merge request veloren/veloren!1482
 2020-11-04 11:28:12 +00:00
Marcel Märtens
ce3173ecdf add metrics for physics sys and implement concurrent physics 2020-11-04 11:53:13 +01:00
Marcel Märtens
bbe6e8be7c Improve Phyiscs speed of entity handling. 
Before we had accessed velocities in a nested loop O(n²).
Now we copy it only once out of the ECS system and store it in a tmp Vec.
As we no longer need to hold a mut and imutable reference, we can iter of `&mut velocities` again in the outer loop.
Also improved many calculations called in the loop to make the check if 2 entities are to far apart as easy as possible
 2020-11-04 11:53:09 +01:00
Marcel Märtens
094bb7c45a keep Presence when possesing 2020-11-04 11:49:05 +01:00
Samuel Keiffer
e07dc51d2d Merge branch 'snowram/newstyle-keyframes' into 'master' 
animation small fixes part 1

See merge request veloren/veloren!1445
 2020-11-04 04:32:53 +00:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
fb1aae22dd manifests 2020-11-04 01:48:06 +01:00
jshipsey
3bb839da85 convert humanoid anims, warnings 2020-11-04 01:48:06 +01:00
Snowram
b47f42bad5 More biped_large work 2020-11-04 01:48:05 +01:00
jshipsey
f009492319 cleanup 4 2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f starting to wire in new wield setup for bipedlarge 2020-11-04 01:48:05 +01:00
jshipsey
e6eeef4524 setup for axe/bow wield 2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Snowram
ef1428f9fe Bones scaling cleanup 2020-11-04 01:48:05 +01:00
jshipsey
3d23475abd starting to wire in new wield setup 2020-11-04 01:48:05 +01:00
Snowram
72b15a1e24 More new style keyframe translation 2020-11-04 01:48:05 +01:00
jshipsey
c878673a84 cleanup 3 2020-11-04 01:48:05 +01:00
jshipsey
f79181c01f cleanup 2 2020-11-04 01:48:05 +01:00
jshipsey
e5734c1829 adjust skeleton_attr to s_a 2020-11-04 01:48:05 +01:00
Snowram
f9f3d33189 More new style keyframe translation 2020-11-04 01:48:04 +01:00
jshipsey
e928dbe4db start cleanup 2020-11-04 01:48:04 +01:00
Snowram
a8dd44325f Convert some animations to new style keyframes 2020-11-04 01:48:04 +01:00
Christof Petig
ac92c8a6af implement /home to return to home town 2020-11-04 00:55:15 +01:00
Joshua Barretto
0ec3cf2cd3 Merge branch 'zesterer/let-there-be-flight' into 'master' 
Implemented Flight

See merge request veloren/veloren!1479
 2020-11-03 22:46:07 +00:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Marcel
9e905b297a 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
3d9c3e481e 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
00456c8373 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
084b60d7ec 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
6bb74c9c6f 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
37d08e93ca 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
9ba19a1cd9 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
2290efd219 remove clippy warnings no longer needed 2020-11-03 08:55:44 +01:00
Marcel Märtens
e9be36c993 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
9459ccf61b 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
dd966dd00e 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
0e32cedd85 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
8c1e1fdc5c 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
e5cda89192 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
3679701ebf Grammar and length reduction, Lucerne and Pike Hammer swap names for consistency 2020-11-01 13:29:35 -07:00
Kelly Monroe
47adb2f1d1 Fixing up further grammar and length issues, Lucerne and Spike Hammer swap names 2020-11-01 13:29:35 -07:00
Fausk
477b575f4e fixup improved item descriptions for most items (no swords) 2020-11-01 13:29:35 -07:00
Samuel Keiffer
5a37bc044e 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
b11041dfa4 10% of bow hits cause bleed debuff 2020-11-01 18:38:57 +00:00
Samuel Keiffer
34c3bab6ad Merge branch 'sam/sceptre-fix' into 'master' 
Sceptre fix

See merge request veloren/veloren!1468
 2020-10-31 19:05:31 +00:00
Sam
4d8a635843 Sceptre fix. 2020-10-31 12:57:51 -05:00
Imbris
cf06912b7b 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
b5d5ccbb92 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
95163a5a65 Added range check to mounting 2020-10-30 22:34:44 -04:00