2187 Commits

Author	SHA1	Message	Date
flo666	c8bb0050ad	adlet npc work	2023-05-13 09:30:53 -04:00
Sam	680d987e11	Adlet hunter AI	2023-05-13 09:30:51 -04:00
Sam	92e28f09fc	Adlet abilities	2023-05-13 09:30:51 -04:00
Joshua Barretto	451e586aac	Made mounting biped_large work, for the hell of it	2023-05-12 22:11:06 +01:00
Joshua Barretto	9e9889eed6	Allowed bird pets to mount their owners when nearby	2023-05-12 21:03:44 +01:00
Marcel Märtens	3a19669d53	use workspace dependencies to make our life easier maintaining them :)	2023-05-10 18:16:25 +02:00
Isse	a6665ed988	some comments	2023-05-09 19:43:10 +02:00
Isse	192356f6c5	use interpolated pos and ori	2023-05-09 19:43:09 +02:00
Isse	e39790e9e4	make sprites work on multiple ships at once	2023-05-09 19:43:09 +02:00
Isse	134d0f0c04	varius fixes	2023-05-09 19:43:09 +02:00
Isse	a35a1a34c4	more sprites on airships	2023-05-09 19:43:09 +02:00
Isse	6674cce2cc	intercat with sprites on ships	2023-05-09 19:43:09 +02:00
Isse	d292234c47	lod for sprites on volumes	2023-05-09 19:43:09 +02:00
Isse	fcb7011cde	sprites on volumes	2023-05-09 19:43:09 +02:00
Isse	2928eb8d15	sit on sprites	2023-05-09 19:43:08 +02:00
Joshua Barretto	1cc221f653	Merge branch 'zesterer/rtsim-tweaks' into 'master' ... Started adding wandering rtsim monsters See merge request veloren/veloren!3908	2023-05-09 14:51:15 +00:00
Marcel Märtens	377787e3c8	avoid: ... ``` PHI nodes not grouped at top of basic block! %246 = phi <4 x float> [ <float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00>, %114 ], [ %241, <badref> ], !dbg !961029 label %243 in function _ZN14veloren_common4comp9inventory4item7modular11ModularBase4kind17h0950571ff74739d8E LLVM ERROR: Broken function found, compilation aborted! ```	2023-05-08 18:58:54 +02:00
Marcel Märtens	95bca5418a	update toolchain to nightly-2023-04-20	2023-05-08 18:58:54 +02:00
Sam	a38f336c9e	Added dual wielding sword contextual abilities.	2023-05-07 20:43:51 -04:00
Sam	0ecf4fbe87	Dual wielding weapons of the same kind added as a context	2023-05-07 20:43:51 -04:00
Sam	9cedf854de	Abilities can now be activated from multiple contexts	2023-05-07 20:43:50 -04:00
Marcel Märtens	6a8f10bf41	fix master fmt	2023-05-05 18:26:14 +02:00
Isse	eed613a50f	change other value parsers	2023-05-05 15:05:57 +02:00
Marcel	223ae7ee98	Merge branch 'xMAC94x/update_deps' into 'master' ... update further dependencies See merge request veloren/veloren!3913	2023-05-05 08:42:43 +00:00
Marcel Märtens	d90ea8c1da	get rid of structop and update clippy in common test, now only criterion is left with version 2	2023-05-05 09:46:46 +02:00
Joshua Barretto	8d9625d6ee	Addressed comments	2023-05-04 23:18:40 +01:00
Joshua Barretto	ee971e4056	Added item merging	2023-05-04 22:12:25 +01:00
Joshua Barretto	a5b1e41d8b	Make NPC interaction go via rtsim	2023-05-04 11:23:46 +01:00
Joshua Barretto	2ff0118df0	More rtsim monsters	2023-05-04 10:13:02 +01:00
Joshua Barretto	0f92f38967	Started adding wandering rtsim monsters	2023-05-01 18:29:32 +01:00
Isse	ab4076518f	Add multiloot	2023-04-23 19:17:39 +00:00
Imbris	cd02b3a172	Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list	2023-04-22 11:37:52 -04:00
Sam	4f991190d3	Removed 3rd to_owned call	2023-04-19 18:43:43 -04:00
Sam	e819cd2309	Updated hashbrown, removed some to_owned calls in handling recently unequipped items	2023-04-19 18:43:40 -04:00
Sam	63bf8f3ac7	Responded to review comments and fixed tests	2023-04-19 18:34:17 -04:00
Sam	7fdfc0e71b	Addressed review	2023-04-19 18:34:17 -04:00
Sam	c1a64e1d69	Recently unequipped items are now tracked and durability loss on death is applied to them	2023-04-19 18:34:16 -04:00
Sam	9d503d1e1f	Debug items no longer have durability	2023-04-14 18:25:24 -04:00
Isse	2208a3037e	improve flying goto	2023-04-14 11:23:17 +02:00
Isse	d1f6e6bef6	somewhat fix airships	2023-04-14 11:22:10 +02:00
Joshua Barretto	504ea158d2	Merge branch 'zesterer/towns' into 'master' ... Improvements to towns and NPCs See merge request veloren/veloren!3867	2023-04-13 21:03:02 +00:00
Joshua Barretto	daacadaedb	Made NPCs give directions to nearby towns, fixed player death propagation	2023-04-13 14:34:31 +01: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	16e3227f78	Correct localisation of numeric values, use coordinate conversions in rtsim	2023-04-12 10:36:11 +01: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	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