4460 Commits

Author	SHA1	Message	Date
Imbris	91a7cf796d	Merge branch 'imbris/specs-refactor' into 'master' ... Adjust for changes in specs safety refactor See merge request veloren/veloren!4113	2023-09-26 14:01:28 +00:00
Laura	f4d48d2689	New Arena building and visit site for NPCs	2023-09-26 12:29:14 +00:00
Imbris	9c398cb06d	djust for changes in specs safety refactor	2023-09-24 23:46:59 -04:00
Marcel	5d311e13bd	Merge branch 'crabman/localize-commands' into 'master' ... Localize server side commands See merge request veloren/veloren!4110	2023-09-22 14:50:43 +00:00
Imbris	cd98dd5245	Remove unused deps flagged by cargo-machete	2023-09-21 22:59:50 -04:00
Maxicarlos08	fd42b3f767	localize commands	2023-09-20 23:29:24 +02:00
Maxicarlos08	bc9219d2b7	moved comment	2023-09-20 17:05:04 +02:00
Maxicarlos08	dccbfc4595	Soft loot protection	2023-09-20 17:02:25 +02:00
Isse	f4ca60cbb6	Map selector and generation UI	2023-09-17 17:11:19 +00:00
Imbris	afe97f4d67	Make sure we use one version of tracy-client!!!!!	2023-09-15 16:32:59 -04:00
Marcel	c25e8536ab	Merge branch 'xMAC94x/update_uuid_authc' into 'master' ... update uuid via authc See merge request veloren/veloren!4093	2023-09-13 08:47:27 +00:00
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	d54ed537ac	update uuid via authc	2023-08-28 20:09:17 +02: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