Commit Graph

4448 Commits

Author SHA1 Message Date
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode 2023-09-06 17:47:16 +02:00
Maxicarlos08
ec92b2c33b
Fix group chat leak 2023-09-03 21:25:44 +02:00
flo
78b2443edc Merge branch 'qsto/bosses_loot_overhaul' into 'master'
Bosses loot overhaul

See merge request veloren/veloren!4072
2023-08-30 12:08:52 +00:00
Isse
804e24adef Merge branch 'isse/fix-airships' into 'master'
Fix rtsim airships

See merge request veloren/veloren!4064
2023-08-29 12:56:25 +00:00
Isse
06d7548dc6 Fix rtsim airships 2023-08-29 12:56:25 +00:00
Marcel Märtens
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +02:00
Marcel Märtens
96bf6309d2 small updates to dependencies 2023-08-27 19:17:04 +02:00
Marcel Märtens
3346a3bc1f some manual dependency updates 2023-08-27 19:17:01 +02:00
Christof Petig
b20ff5144c determine location names when loading character list 2023-08-22 22:41:48 +02:00
Joshua Barretto
6fbca74e88 Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
Cheesing fixes to old-style dungeons

See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event 2023-08-19 11:44:58 +02:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666) 2023-08-17 22:47:35 +02:00
Marcel
09646a9830 Merge branch 'tibbon1/update_num_derive_0_4_0' into 'master'
num_derive 0.3 -> 0.4.0

See merge request veloren/veloren!4053
2023-08-17 16:42:31 +00:00
Maxicarlos08
e5e26149ed
review 2023-08-17 11:16:20 +02:00
Maxicarlos08
8c77356ec1
reduced large cacti sizes 2023-08-16 20:19:35 +02:00
flo
a2b1097df8 wyvern_tweaks 2023-08-16 09:22:04 +00:00
flo
21bf0a5572 Merge branch 'pirate_hideout_site' into 'master'
site pirate_hideout

See merge request veloren/veloren!4057
2023-08-16 06:59:59 +00:00
flo
fba1976dee site pirate_hideout 2023-08-16 06:59:58 +00:00
Imbris
e8361d5abf Merge branch 'imbris/sync-toggle' into 'master'
Add field to Presence to control when an entity is synced to other clients

See merge request veloren/veloren!3972
2023-08-16 00:10:35 +00:00
Maxicarlos08
0c9a942027
refactor teleporter system and include nearby pets 2023-08-15 12:24:49 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation 2023-08-15 12:24:49 +02:00
Maxicarlos08
0929a3c76c
use same timings for both portals 2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
Maxicarlos08
26ada89bb9
portal event -> change body and teleport to 2023-08-15 12:24:49 +02:00
Maxicarlos08
8fe5f2e708
addressed review comments 2023-08-15 12:24:49 +02:00
Maxicarlos08
e5fe64ccf6
pre-review cleanups 2023-08-15 12:24:49 +02:00
Maxicarlos08
bb2034ca92
portal particles 2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update 2023-08-15 12:24:48 +02:00
Maxicarlos08
0f2db68498
added portals 2023-08-15 12:24:17 +02:00
Joshua Barretto
38c986fa59 Merge branch 'TelepathicWalrus/stay_follow_pets' into 'master'
Add stay/follow option for pets

See merge request veloren/veloren!3906
2023-08-15 10:19:58 +00:00
flo
9a50a2452e treant_sapling: disable flee 2023-08-15 09:53:28 +00:00
Maxicarlos08
13dbf679c5
review 2023-08-15 11:10:54 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent 2023-08-15 11:10:54 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
6f0997705f
Clean code 2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
Imbris
aba0c23bc7 Make sync_me based of PresenceKind rather than being an independent
field.
2023-08-11 20:09:55 -04:00
Imbris
ecb27deeae When sync_me is false avoid:
* Logging a warning when deleting the entity and it is not in any
  Region.
* Searching every single region for an entity that is in none of them.

Also:
* Add workaround for bug in specs where deleting any entity clears the
  components before checking that the generation is correct (surprised
  that we haven't encounted bugs from this yet).
* Properly update `tracked_entities` inside `RegionMap` when deleting
  an entity. Previously, we just relied on this being updated in
  `RegionMap::tick` by the absence of the `Pos` component at that index.
  However, this means if a new entity is created at that index after
  deletion and before calling `RegionMap::tick`, then this can be
  interpreted as an entity moving between regions rather than one being
  deleted and another created. It seems like this could lead to
  synchronization bugs like not creating the new entity on the client
  (although I haven't noticed this before, I think maybe we use newly
  inserted `Uid`s to detect new entities rather than the region system?).
  I think it could at least lead to sending redundant messages to
  synchronize the new entity.
2023-08-11 20:09:55 -04:00
Imbris
997babca18 Always sync components for a client's entity even if it has no position
or has sync_me false in `Presence`.
2023-08-11 20:09:55 -04:00
Imbris
ba7d7481d7 Move RegionMap insertion into ecs and ticking from common into server
Since it now needs Presence component to be available and we don't use
the RegionMap on the client.
2023-08-11 20:09:55 -04:00
Imbris
a01f75b38d Add sync_me parameter to Presence that must be set to true for
entities with the `Presence` component to be synced to other clients.
2023-08-11 20:09:55 -04:00
Michal Sroczynski
3a6c3ac669 Small adjustments 2023-08-11 14:09:31 +02:00
Michal Sroczynski
c8feb568ba Bosses loot overhaul p1 2023-08-11 09:47:13 +02:00
flo666
db6ebcd685 remove shovel outcome trigger from combomelee state 2023-08-03 23:00:32 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
Isse
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
Michal Sroczynski
2c23781d22 Remove tiers from dungeons names 2023-08-02 18:48:01 +02:00