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
14,022 Commits 151 Branches 18 Tags 2.1 GiB
34da94cbad
Commit Graph

14022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isse
28ee38ad1b Merge branch 'clifftown_rework' into 'master' 
clifftown rework

See merge request veloren/veloren!3968
 2023-06-07 18:45:17 +00:00
flo
02bba1e343 clifftown rework 2023-06-07 18:45:12 +00:00
Marcel
caf33b69d9 Merge branch 'walpo/update-translation-files' into 'master' 
Make i18n language identifiers comply with IETF BCP 47

See merge request veloren/veloren!3964
 2023-06-07 13:12:35 +00:00
walpo
b919312d1b Make i18n language identifiers comply with IETF BCP 47 2023-06-07 13:12:34 +00:00
Imbris
f8ae6cdbbe Merge branch 'imbris/id-maps' into 'master' 
IdMaps: Uid refactor and adding mappings from rtsim entities and character IDs to ecs entity IDs.

See merge request veloren/veloren!3971
 2023-06-05 20:21:23 +00:00
Imbris
0b213b6149 Move common code into a separate function to avoid the complexity of calling delete_entity_recorded from handle_exit_ingame 2023-06-04 22:29:19 -04:00
Imbris
599e25c9c6 Address review on !3971 2023-06-04 21:12:39 -04:00
Imbris
9a12de5fcf rebase fix 2023-06-04 14:24:01 -04:00
Imbris
b72bf74563 Update TODO after re-reading code and seeing that it was slightly inaccurate 2023-06-04 12:59:09 -04:00
Imbris
b96e7e1b26 Adjust tests to match changes 2023-06-04 12:59:09 -04:00
Imbris
ea77a443a2 Fix conditions on some error logging spots 2023-06-04 12:59:09 -04:00
Imbris
77e1b1919a Use new id mappings to improve lookup_actor function 2023-06-04 12:59:09 -04:00
Imbris
ab946a0d60 Update changelog 2023-06-04 12:59:07 -04:00
Imbris
42ba445ea2 Add RtsimEntity mapping if it is included as a component on a newly 
created npc.

Also, improve wording of a comment.
 2023-06-04 12:58:16 -04:00
Imbris
01df87bdb4 Address/cleanup a couple TODOs, mainly comment improvements 2023-06-04 12:58:16 -04:00
Imbris
a976aa3f40 fmt after rebase 2023-06-04 12:58:16 -04:00
Imbris
b8af76deff Remove potential for client to delete its own entity. 
Also:
* Fix some clippy warnings
* Remove unused clippy allow
* Document semantics of `DeletedEntities`
 2023-06-04 12:58:16 -04:00
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