Sam
e34f5f09e9
Addressed comments.
2020-11-04 19:22:05 -06:00
Sam
be2f376176
Separated out health from stats component.
2020-11-04 19:22:04 -06:00
Sam
0988b97da5
Removed most hardcoded ability keys.
2020-11-04 19:22:02 -06:00
Sam
099933bf2a
Added energy change server event.
2020-11-04 19:22:01 -06:00
Sam
b63a13bef1
Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage.
2020-11-04 19:22:00 -06:00
Marcel
0bba80a402
Merge branch 'TR_translations' into 'master'
...
Updated translations
See merge request veloren/veloren!1473
2020-11-04 16:13:53 +00:00
TheBoredProgrammer64
7820f1faea
Updated translations
2020-11-04 16:13:53 +00:00
Joshua Barretto
870ec8e9f7
Merge branch 'christof/home_town' into 'master'
...
implement /home to return to home town
See merge request veloren/veloren!1481
2020-11-04 15:58:35 +00:00
Marcel Märtens
7ef1b1f38e
put cache in ECS to get rid of allocations
2020-11-04 14:19:28 +01:00
Marcel
0bd88b5504
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
99da3c7150
add metrics for physics sys and implement concurrent physics
2020-11-04 11:53:13 +01:00
Marcel Märtens
7b155d96d3
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
fe14932f4f
keep Presence when possesing
2020-11-04 11:49:05 +01:00
Samuel Keiffer
b47fb506d6
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
2156701dfd
Fix animations regressions for biped_large
2020-11-04 02:12:43 +01:00
jshipsey
ce6592360c
manifests
2020-11-04 01:48:06 +01:00
jshipsey
b5c308c53e
convert humanoid anims, warnings
2020-11-04 01:48:06 +01:00
Snowram
ad775963c3
More biped_large work
2020-11-04 01:48:05 +01:00
jshipsey
6f294e8663
cleanup 4
2020-11-04 01:48:05 +01:00
unknown
8bb0592f9c
starting to wire in new wield setup for bipedlarge
2020-11-04 01:48:05 +01:00
jshipsey
770db614d3
setup for axe/bow wield
2020-11-04 01:48:05 +01:00
jshipsey
021f7478f5
setup for staff, more anim conversions
2020-11-04 01:48:05 +01:00
Snowram
d4c2ebedf6
Bones scaling cleanup
2020-11-04 01:48:05 +01:00
jshipsey
39a2fd6e5a
starting to wire in new wield setup
2020-11-04 01:48:05 +01:00
Snowram
95285d05d0
More new style keyframe translation
2020-11-04 01:48:05 +01:00
jshipsey
030c8730c8
cleanup 3
2020-11-04 01:48:05 +01:00
jshipsey
85f1a3bf5a
cleanup 2
2020-11-04 01:48:05 +01:00
jshipsey
c2804a0805
adjust skeleton_attr to s_a
2020-11-04 01:48:05 +01:00
Snowram
988b99592f
More new style keyframe translation
2020-11-04 01:48:04 +01:00
jshipsey
41330a7db0
start cleanup
2020-11-04 01:48:04 +01:00
Snowram
fbcd5fcb06
Convert some animations to new style keyframes
2020-11-04 01:48:04 +01:00
Christof Petig
61384aaf0e
implement /home to return to home town
2020-11-04 00:55:15 +01:00
Joshua Barretto
de99675226
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
058541d1a3
Implemented Flight
2020-11-03 22:46:07 +00:00
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
