4273 Commits

Author	SHA1	Message	Date
flo666	1750c9a0f2	structure work	2023-05-13 09:30:48 -04:00
jshipsey	da3c2369e5	initial setup	2023-05-13 09:30:13 -04:00
Joshua Barretto	ec5e3fe716	Avoid re-fetching system data on every link persist	2023-05-13 12:31:19 +01:00
Joshua Barretto	451e586aac	Made mounting biped_large work, for the hell of it	2023-05-12 22:11:06 +01:00
Joshua Barretto	2aca9db4ac	Prevent mounted pets stealing targetting, allowed sitting on chairs with a pet on your shoulder	2023-05-12 21:18:32 +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	9fa4c7217e	more info on todo comment and allow clippy lint	2023-05-10 15:22:35 +02:00
Isse	1617c180ef	small changes	2023-05-09 19:55:52 +02:00
Isse	bcc8c55b5e	change 'force from mount' to 'force from volume' in commands	2023-05-09 19:43:10 +02:00
Isse	6219b52f87	rename Vox trait to FilledVox, and change is_empty to is_filled	2023-05-09 19:43:10 +02:00
Isse	7dde25df39	fix rebase oopsie	2023-05-09 19:43:10 +02:00
Isse	87b2f0fd26	don't apply move state velocity if volume riding, don't mount sprites on interact	2023-05-09 19:43:10 +02:00
Isse	a0ed18c3db	add doc comments	2023-05-09 19:43:10 +02:00
Isse	61ecd2c178	various small fixes	2023-05-09 19:43:10 +02:00
Isse	a6665ed988	some comments	2023-05-09 19:43:10 +02:00
Isse	78dc394c48	use sitting animation by default when sprite mounted	2023-05-09 19:43:10 +02:00
Isse	192356f6c5	use interpolated pos and ori	2023-05-09 19:43:09 +02:00
Isse	57551c479c	force of mount in teleporting commands	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	b3a70627e5	fix volumes	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	458acce5ac	set vel to zero when sprite mounted	2023-05-09 19:43:09 +02:00
Isse	6ddfd631d6	don't sit through walls	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	faff715c4f	Simultaneous melee hits now show separately in SCT	2023-05-07 20:43:52 -04: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
Marcel Märtens	cd7d889c13	get rid of oldtime in chrono	2023-05-05 18:25:49 +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	b6d8182382	Merge branch 'zesterer/item-merging' into 'master' ... Zesterer/item merging See merge request veloren/veloren!3912	2023-05-05 00:03:22 +00: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
Marcel Märtens	27620e665b	we need a new version of refinery that needs a new version of rusqlite, so update both	2023-05-04 20:53:00 +02:00
Marcel	ce4beff7fe	Merge branch 'xMAC94x/update_deps' into 'master' ... update veloren deps See merge request veloren/veloren!3911	2023-05-04 18:28:59 +00:00
Imbris	60dbcf86f9	Merge branch 'imbris/server-start-faster' into 'master' ... Improve server startup times, in particular, finding paths between sites. See merge request veloren/veloren!3888	2023-05-04 18:06:38 +00:00
Joshua Barretto	a5b1e41d8b	Make NPC interaction go via rtsim	2023-05-04 11:23:46 +01:00
Marcel Märtens	054f4f9453	update veloren deps	2023-05-04 11:58:43 +02:00
Joshua Barretto	2ff0118df0	More rtsim monsters	2023-05-04 10:13:02 +01:00