Commit Graph

14307 Commits

Author SHA1 Message Date
8c77356ec1 reduced large cacti sizes 2023-08-16 20:19:35 +02:00
0f9feb0a7e tiny letter correction #2 2023-08-16 18:11:26 +03:00
9231123be6 tiny letter correction 2023-08-16 18:04:34 +03:00
b63d87f888 Merge branch 'tygyh/Update-swedish-translations' of https://gitlab.com/veloren/dev/veloren into tygyh/Update-swedish-translations 2023-08-16 15:19:07 +02:00
387d8b47c6 Update swedish translations 2023-08-16 15:13:51 +02:00
flo
237d13dbce Merge branch 'jungle_ruin' into 'master'
JungleRuin

See merge request veloren/veloren!4027
2023-08-16 12:35:29 +00:00
flo
fdea283f98 JungleRuin 2023-08-16 12:35:27 +00:00
flo
49d03ab096 Merge branch 'wyvern_tweaks' into 'master'
wyvern_tweaks

See merge request veloren/veloren!4077
2023-08-16 09:22:04 +00: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
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
7497ef93c8 Merge branch 'coastal_town_fence_fix' into 'master'
coastal town fence fix

See merge request veloren/veloren!4070
2023-08-15 22:34:38 +00:00
flo
36c0096f6a coastal town fence fix 2023-08-15 22:34:38 +00:00
0c9a942027 refactor teleporter system and include nearby pets 2023-08-15 12:24:49 +02:00
92ab8dab9a require interaction to start teleportation 2023-08-15 12:24:49 +02:00
0929a3c76c use same timings for both portals 2023-08-15 12:24:49 +02:00
6a4a6bab9f dance dance 2023-08-15 12:24:49 +02:00
ac68f0af7b addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
26ada89bb9 portal event -> change body and teleport to 2023-08-15 12:24:49 +02:00
8fe5f2e708 addressed review comments 2023-08-15 12:24:49 +02:00
e5fe64ccf6 pre-review cleanups 2023-08-15 12:24:49 +02:00
bb2034ca92 portal particles 2023-08-15 12:24:48 +02:00
09f7087ac6 buildup time adjustments 2023-08-15 12:24:48 +02:00
3343ddf4cc go into blink state at half buildup time 2023-08-15 12:24:48 +02:00
25fcb04ad3 buildup times and portal model update 2023-08-15 12:24:48 +02:00
14141ecc80 failed attempt at making dungeons avoid caves 2023-08-15 12:24:46 +02:00
0f2db68498 added portals 2023-08-15 12:24:17 +02:00
730f96536a remove staircases 2023-08-15 12:24:17 +02:00
ed8fe545f8 Fixed temperate dungeon entrance height and wall artifacts around dungeons 2023-08-15 12:24:17 +02:00
2d616352a2 grey walled dungeons 2023-08-15 12:24:17 +02:00
73a79b32a1 no dungeons = no dungeons with caves! 2023-08-15 12:24:17 +02:00
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
4b5dd58c2e Merge branch 'treant_sapling_disable_flee' into 'master'
treant_sapling: disable flee

See merge request veloren/veloren!4074
2023-08-15 09:53:29 +00:00
flo
9a50a2452e treant_sapling: disable flee 2023-08-15 09:53:28 +00:00
2446ec8940 added changelog entry 2023-08-15 11:11:20 +02:00
13dbf679c5 review 2023-08-15 11:10:54 +02:00
b7c56c9057 Hud fix 2023-08-15 11:10:54 +02:00
1ea0f249f5 display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
4bdbb3ff6b Move stay position to agent 2023-08-15 11:10:54 +02:00
2cb8e2ca84 Update code quality 2023-08-15 11:10:53 +02:00
62d998252d sync 2023-08-15 11:10:53 +02:00
6adca217fe Clean code 2023-08-15 11:10:53 +02:00
6a080c242c Add server side check to stop stay when mounted
Add filter to allow telling other pets to stay when mounted
2023-08-15 11:10:53 +02:00
0648ba1bc6 Clean Code
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
25f1f8f6cb Changed to .filter and .min_by_key for iterator 2023-08-15 11:10:53 +02:00
5894913ede Changed mod.rs to use CachedSpatialGrid 2023-08-15 11:10:53 +02:00
d6496c999d Removed is_stay variable
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
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
9597810e3d Remove is_stay function
Clean code
2023-08-15 11:10:53 +02:00