Imbris
65efa779b5
Steps towards properly synchronizing when a client exits in-game to
...
return to the character screeen. And other related improvements.
* Uid now optional when removing an entity from IdMaps since that Uid
may have been transferred to the new entity created when the client
exits "in-game".
* Added notes about making sure to update the CharacterId mapping when
changing the `kind` field of `Presence`.
* Add a parameter to `delete_entity_recorded` that indicates whether it
is being called from `handle_exit_ingame` and that provides the `Uid`
that was removed from the entity so that we can more explicitly and
correctly handle that case.
* We now add the Uid of the client to the deleted entities list when it
exits "ingame". (still need to rework code so that the client doesn't
delete its own entity).
* Improved integration of possession code with ForceUpdate logic.
* Don't remove `Presence` component from old entity in possession so
that deleting that entity will properly handle updating the
CharacterId unmapping (if the old entity isn't going to be deleted we
still remove the `Presence` component so that it doesn't keep terrain
loaded).
* Added a couple TODOs on existing tangential things I noticed.
2023-06-04 12:58:16 -04:00
Imbris
996f58ebd2
Avoid using return for skipping respawn events
2023-06-04 12:58:16 -04:00
Imbris
62abed1eec
Replace u64 with Uid in some places and add/modify some comments
2023-06-04 12:58:16 -04:00
Imbris
a8fbfc026a
Fix compilation errors from recent changes
2023-06-04 12:58:16 -04:00
Imbris
c60f994c7f
Some random changes and a fmt
2023-06-04 12:58:16 -04:00
Imbris
f11baed9fa
Adapting various things to the new interface, fixing compilation errors,
...
and progressing on half done things. Also, added a few TODO comments.
2023-06-04 12:58:16 -04:00
Imbris
4094887997
Rename UidAllocator to IdMaps everywhere, also rename lookup_entity to
...
uid_entity.
Also made more progress on changes in common/src/uid.rs
(does not compile so don't know if all rebase quirks resolved)
2023-06-04 12:58:16 -04:00
Imbris
35922866a8
Start refactoring UidAllocator to contain mappings for different Id
...
types.
* Add new `IdMaps` type that contains mappings to Entity from Uid, CharacterId, and
RtsimEntity.
* Add PresenceKind::LoadingCharacter variant for when the CharacterId
has not actually been confirmed to exist and belong to the logged in
client. Switches to the regular PresenceKind::Character once the
character is loaded from the database and that is used to update the
entity.
* Start refactoring `delete_entity_recorded` to check for CharacterId
and RtsimEntity values that may need to be removed from the map (just
very start, not near complete).
* Other misc tweaks.
2023-06-04 12:58:16 -04:00
Imbris
3277d18265
Rename retrieve_entity_internal to lookup_entity
2023-06-04 12:58:16 -04:00
Imbris
ea725fffde
Cleanup UidAllocator and Uid a bit:
...
* Remove unnecessary Marker/MarkAllocator trait implementations.
* Delete excess functions
* Change some methods to take Uid instead of u64
2023-06-04 12:58:15 -04:00
Justin Shipsey
d90926e4a3
Merge branch 'master' into 'master'
...
updating fr_FR translations
See merge request veloren/veloren!3966
2023-06-04 09:32:10 +00:00
Isse
c4d24d2059
Merge branch 'isse/rtsim-work' into 'master'
...
Various rtsim related stuff
See merge request veloren/veloren!3950
2023-06-03 22:14:18 +00:00
Isse
a884e0e058
Various rtsim related stuff
2023-06-03 22:14:18 +00:00
Samuel Keiffer
272d57b4fa
Merge branch 'cyclops_and_dullahan_tweaks' into 'master'
...
npc_attack_tweaks
See merge request veloren/veloren!3969
2023-06-03 14:04:11 +00:00
flo
53288d0b22
npc_attack_tweaks
2023-06-03 14:04:10 +00:00
Samuel Keiffer
6071fe0adb
Merge branch 'quadruped_low_anim_fix' into 'master'
...
quadruped_low anim fix
See merge request veloren/veloren!3957
2023-06-03 14:03:49 +00:00
flo
0657df80a1
quadruped_low anim fix
2023-06-03 14:03:48 +00:00
Samuel Keiffer
e6fe8c6520
Merge branch 'plant_creatures' into 'master'
...
plant creatures
See merge request veloren/veloren!3937
2023-06-03 13:59:52 +00:00
flo
16d58c6b4e
plant creatures
2023-06-03 13:59:52 +00:00
Joshua Barretto
dc2afe8236
Merge branch 'floppy_savannah_hut' into 'master'
...
savannah_hut
See merge request veloren/veloren!3872
2023-06-03 11:54:58 +00:00
flo
22854cbea2
savannah_hut
2023-06-03 11:54:58 +00:00
Joshua Barretto
f7688462a1
Merge branch 'tormod/worldgen-refactorings' into 'master'
...
Make sure location hint calculation is only done once
See merge request veloren/veloren!3967
2023-06-02 13:46:56 +00:00
Tormod G. Hellen
4f2548fe78
Pass SiteKind by reference.
2023-06-02 15:04:16 +02:00
Tormod G. Hellen
1d0329cfa7
Make sure location hint calculation is only done once.
...
Location hint calculation is expensive and should not be done
in a hot loop.
This is a fixup for 1572a5a759
2023-06-02 15:04:09 +02:00
Thomas S
7e7017d705
adding fr_FR translations
2023-06-01 20:17:51 +02:00
Joshua Barretto
e71eee0cd2
Merge branch 'zesterer/damage-fixes' into 'master'
...
Make items vanish after 5 minutes
See merge request veloren/veloren!3963
2023-06-01 14:49:00 +00:00
Joshua Barretto
6bb65bd9ec
Updated changelog
2023-06-01 14:52:03 +01:00
Joshua Barretto
ec3a7d1898
Make items vanish after 5 minutes
2023-06-01 14:51:19 +01:00
Joshua Barretto
bcc6b84e48
Merge branch 'zesterer/damage-fixes' into 'master'
...
Fixed weird fall damage application
See merge request veloren/veloren!3962
2023-06-01 13:42:29 +00:00
Joshua Barretto
3a383050d5
Apply fall damage even after a block-hop
2023-06-01 14:14:28 +01:00
Isse
3fa724b90f
Merge branch 'remove-print' into 'master'
...
Remove print
See merge request veloren/veloren!3961
2023-06-01 13:12:03 +00:00
Isse
174dac9206
Remove print
2023-06-01 13:12:03 +00:00
Joshua Barretto
f00f96636c
Fixed weird fall damage application
2023-06-01 14:08:13 +01:00
Isse
65c0e224a6
Merge branch 'bump-rtsim' into 'master'
...
Bump rtsim version for frost gigas
See merge request veloren/veloren!3960
2023-06-01 07:10:27 +00:00
Isse
a4f2a74427
Bump rtsim version for frost gigas
2023-06-01 07:10:27 +00:00
Marcel
cda21beedb
Merge branch 'doiska/i18n-pt_br' into 'master'
...
Add all missing pt_br translations
See merge request veloren/veloren!3959
2023-05-31 21:19:23 +00:00
Pedro H
25c3fe3657
Add all missing pt_br translations
2023-05-31 21:19:23 +00:00
Joshua Barretto
21075638bd
Merge branch 'zesterer/experimental-shaders' into 'master'
...
More experimental shaders
See merge request veloren/veloren!3958
2023-05-31 18:51:31 +00:00
Joshua Barretto
2064ad5d80
Added color dither
2023-05-31 19:10:09 +01:00
Joshua Barretto
2a9e43b847
Draw distinction between bilinear filtering and nearest neighbour
2023-05-31 18:26:53 +01:00
Joshua Barretto
b2051767ff
More experimental shaders
2023-05-31 17:07:22 +01:00
Isse
a1e0351c23
Merge branch 'frost_gigas_spawn' into 'master'
...
spawn frost gigas
See merge request veloren/veloren!3948
2023-05-31 12:31:55 +00:00
flo
40832456f2
spawn frost gigas
2023-05-31 12:31:54 +00:00
Marcel
c36e3693be
Merge branch 'walpo/update-readme' into 'master'
...
Update README.md
See merge request veloren/veloren!3951
2023-05-29 10:00:57 +00:00
walpo
2801456b16
Update README.md
2023-05-29 10:00:57 +00:00
Marcel
0135b17588
Merge branch 'xMAC94x/anonymize_ip_addr' into 'master'
...
remove the complete ip address from the logs in case they are gonna made public.
See merge request veloren/veloren!3952
2023-05-28 11:34:06 +00:00
Marcel Märtens
53151a67bf
remove the complete ip address from the logs in case they are gonna made public.
...
First we though about hashing it together with the username, but we dont have the username. hope that removing 50% of the information is enough to identify 2 addresses as equal or different without knowing the exact address
2023-05-27 14:30:40 +02:00
Marcel
b5c4b435ff
Merge branch 'vasco-steam' into 'master'
...
Italian translation
See merge request veloren/veloren!3949
2023-05-26 15:01:05 +00:00
Marcel
5b7005f8f4
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3929
2023-05-26 15:01:01 +00:00
Jonathan Berglin
fc4e1c8a87
Update swedish translations
2023-05-26 15:01:00 +00:00
