13632 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Yanovski	233d2e2685	Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen	2023-04-12 19:39:23 -07:00
Samuel Keiffer	7aa43e9e8a	Merge branch 'taoist/better-dullahan' into 'master' ... taoist&floppy/cyclops&dullahan See merge request veloren/veloren!3859	2023-04-12 22:53:38 +00:00
Tao In Way	e32460f9ee	taoist&floppy/cyclops&dullahan	2023-04-12 22:53:38 +00:00
Joshua Barretto	9e17042bf6	Merge branch 'rtsim2' into 'master' ... Initial implementation of rtsim2 Closes #1476 See merge request veloren/veloren!3517	2023-04-12 16:17:52 +00:00
Joshua Barretto	69424ea5bf	Use nested broken key as fallback if not using english fallback	2023-04-12 16:18:31 +01:00
Isse	f13ae63985	make reposition_on_load join immutable	2023-04-12 17:08:16 +02:00
Isse	fc3f7590c7	clamp chase_tgt to ground if we can't fly	2023-04-12 17:04:25 +02:00
Joshua Barretto	cb5d0f5a95	Don't perform partial localisation of content, prefer all-or-nothing	2023-04-12 12:11:53 +01:00
Joshua Barretto	16e3227f78	Correct localisation of numeric values, use coordinate conversions in rtsim	2023-04-12 10:36:11 +01:00
Isse	0c688a9b50	remove comment	2023-04-12 10:19:19 +02:00
Isse	2d83a8a1e4	fix npcs without a faction not respawning	2023-04-12 10:18:09 +02:00
Isse	0bb6fa7946	add flag to clamp to ground for RepositionOnChunkLoad	2023-04-12 10:17:49 +02:00
Isse	6be4a2b33f	only add RepositionOnChunkLoad to rtsim npcs and don't add Waypoint if it doesn't exist	2023-04-12 09:24:07 +02:00
Joshua Barretto	3582d86c70	Simplified localisation logic	2023-04-11 23:51:07 +01:00
Joshua Barretto	3484e156d1	Allowed localisation content to be recursive	2023-04-11 23:18:34 +01:00
Joshua Barretto	c69307557d	Fall back to single message if variations don't exist for localisation	2023-04-11 19:06:40 +01:00
Joshua Barretto	85a3d0bec4	Fixed tests	2023-04-11 18:17:52 +01:00
Joshua Barretto	cf701fb604	Localised rtsim NPC speech	2023-04-11 17:00:08 +01:00
Joshua Barretto	edcc2f1870	Overhauled chat message representation to allow for more exhaustive localisation	2023-04-11 15:46:36 +01:00
Joshua Barretto	bc4d1a71f6	Fix rtsim NPC respawning	2023-04-11 13:25:45 +01:00
Joshua Barretto	08afe26112	Directly compare rtism resources to avoid unnecessary hooks	2023-04-11 11:49:10 +01:00
Joshua Barretto	81b52298f0	Addressed review feedback	2023-04-11 10:34:06 +01:00
Imbris	4ea635cc8d	Merge branch 'imbris/random-tweaks-35902u8' into 'master' ... Some misc tweaks See merge request veloren/veloren!3861	2023-04-11 02:07:35 +00:00
Joshua Barretto	9d2ea10090	Use drain_sorted	2023-04-10 22:35:49 +01:00
Isse	efe2eb046c	add comment about a pure-proportional controller	2023-04-10 22:22:50 +02:00
Isse	e9978acf4c	set rider to none if replacing driver	2023-04-10 22:04:00 +02:00
Joshua Barretto	92ead1cf38	Removed vehicle riders, for now	2023-04-10 20:58:08 +01:00
Joshua Barretto	00559187d6	Fixed tests	2023-04-10 18:40:31 +01:00
Joshua Barretto	b50645c1ee	Addressed review comments	2023-04-10 17:59:43 +01:00
Joshua Barretto	a99313695c	Updated changelog	2023-04-09 19:26:26 +01:00
Joshua Barretto	859eb95033	Log error instead of panicking	2023-04-09 19:25:58 +01:00
Joshua Barretto	308ee2f674	Don't pessimise worldgen fast paths for rtsim resources	2023-04-09 19:25:58 +01:00
Joshua Barretto	c6a7d7aa9b	Synchronise rtsim saves	2023-04-09 19:25:58 +01:00
Joshua Barretto	67757f3d97	Ignore accidental unit tests	2023-04-09 19:25:58 +01:00
Joshua Barretto	efbab102a5	Make LoD towns glow	2023-04-09 19:25:58 +01:00
Joshua Barretto	d751a22af7	Fixed buggy NPC aggro behaviour	2023-04-09 19:25:58 +01:00
Joshua Barretto	251ab95ac5	Neater rtsim_npc	2023-04-09 19:25:58 +01:00
Joshua Barretto	8575ff87c5	Temporarily decrease sentiment decay time	2023-04-09 19:25:58 +01:00
Joshua Barretto	326aa3f8ff	Made /rtsim_npc order NPCs by distance	2023-04-09 19:25:58 +01:00
Joshua Barretto	70538dae66	Choose random plaza tile	2023-04-09 19:25:58 +01:00
Joshua Barretto	2fbddafd0a	Added report system, information sharing, made NPCs act on sentiments	2023-04-09 19:25:58 +01:00
Joshua Barretto	08338436ea	Added sentiments	2023-04-09 19:25:58 +01:00
Joshua Barretto	d7ba4ecef7	Allow OnDeath event to handle all actors	2023-04-09 19:25:58 +01:00
Joshua Barretto	ce5ef481e1	Added interrupt_with combinator, guard patrol patterns	2023-04-09 19:25:58 +01:00
Joshua Barretto	a7a08763f2	Gave NPCs names	2023-04-09 19:25:58 +01:00
Joshua Barretto	74610833d0	Cleaned up rtsim tick handling	2023-04-09 19:25:58 +01:00
Joshua Barretto	80e4e8deae	Fixed NPCs talking to themselves	2023-04-09 19:25:57 +01:00
Joshua Barretto	5614eaa7a5	Cleaned up rtsim rules	2023-04-09 19:25:57 +01:00
Joshua Barretto	3e0f5295c0	Added CharacterActivity, made NPCs look at the player when speaking to them	2023-04-09 19:25:57 +01:00
Joshua Barretto	85c572f6e2	Better town layout	2023-04-09 19:25:57 +01:00