622 Commits

Author	SHA1	Message	Date
Imbris	6c8970f6fd	Merge branch 'imbris/voxygen-compile-time' into 'master' ... Improve voxygen compile time with small tweak See merge request veloren/veloren!3449	2022-07-01 08:22:05 +00:00
Imbris	291a424b4e	This seems to save at least 30 seconds (out of 90 to 120 secs) when tweaking TILE_SIZE in voxygen/src/mesh/greedy.rs (NOTE: I did some more timing, see associated MR description)	2022-06-30 00:11:04 -04:00
runrobdog	95148a9968	tweaks entity stats	2022-06-17 12:35:06 +02:00
Christof Petig	2bf8e1865f	Skiing and ice skating	2022-05-27 17:19:52 +00:00
Chase Rozon	7dcee3eb23	Multiple Balance Tweaks & Miscellaneous Changes	2022-05-19 22:46:31 +00:00
Youssef Fahmy	080d8ef8b1	Tweaks for this week	2022-05-19 19:35:31 +00:00
Sam	aeca67443b	Simplified item key (assets)	2022-05-18 16:28:10 -04:00
Sam	cbf5336343	Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets).	2022-05-16 15:11:45 -04:00
Sam	13ea6dee93	Addressed second round of balance feedback (assets).	2022-05-16 15:11:40 -04:00
brunt	d46cdf60b5	renamed hilt voxels, adjusted secondary components in item image manifests [ci_skip]	2022-05-16 15:11:39 -04:00
Sam	9b078c3383	Addressed playtest feedback (assets).	2022-05-16 15:11:38 -04:00
brunt	fc28449703	rotate voxels and sceptre positioning [ci_skip]	2022-05-16 15:11:37 -04:00
UncomfySilence	1c626da66b	loot tables and adding models	2022-05-16 15:11:36 -04:00
Sam	528b62c59a	Rebase commit	2022-05-16 15:11:36 -04:00
Sam	3f2f0a7715	Fixed item drop manifest for secondary components.	2022-05-16 15:11:36 -04:00
brunt	5ab9c0f1ad	sceptre positioning [ci_skip]	2022-05-16 15:11:32 -04:00
Sam	6ccc0b82f0	Models for sceptres and secondary components	2022-05-16 15:11:32 -04:00
Bryant Deters	af1a44264a	add melee weapons to item_drop_manifest [ci skip]	2022-05-16 15:11:29 -04:00
Bryant Deters	4edd041056	add staffs to item_drop_manifest [ci skip]	2022-05-16 15:11:29 -04:00
Bryant Deters	1ce474adbb	modular bow offset tweaks [ci skip]	2022-05-16 15:11:28 -04:00
Bryant Deters	f767e81133	modular staff offsets [ci skip]	2022-05-16 15:11:28 -04:00
Sam	e8c97f7a00	Staff models	2022-05-16 15:11:27 -04:00
Bryant Deters	f1940128bf	modular bow offset adjustments [ci skip]	2022-05-16 15:11:27 -04:00
Snowram	f6343ff4f9	Modular bows offsets	2022-05-16 15:11:24 -04:00
Sam	558e2aefb7	Bow models	2022-05-16 15:11:23 -04:00
Snowram	74a3f4a7dc	Modular 1h weapons offsets	2022-05-16 15:11:21 -04:00
Sam	ef5b2e4a1e	Added method of differing names for 1h and 2h variants of a modular wepaon. ... Added all 1h melee weapon models.	2022-05-16 15:11:19 -04:00
Sam	d7f5b907ff	Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS	2022-05-16 15:11:14 -04:00
Sam	03ab68eb60	Added models for sword blade, axe head, and hammer head components.	2022-05-16 15:11:09 -04:00
Snowram	b01e816c0d	Modular axes and hammers offsets	2022-05-16 15:11:08 -04:00
Snowram	e693b3132d	Modular swords offsets	2022-05-16 15:11:07 -04:00
Sam	ac306bbec0	Added weapon models for 2h axe, hammer, and sword.	2022-05-16 15:11:07 -04:00
Sam	c6b5798cfd	Inserted entries in item image and biped weapon manifests to aid in addition of models later.	2022-05-16 15:11:03 -04:00
Sam	38cb465722	Fixed loading of modular weapons from the loadout to work with nested components. ... Modular weapons can now be correctly dispalyed when wielded.	2022-05-16 15:10:57 -04:00
Sam	c01fe655f1	Added wood	2022-05-16 15:10:55 -04:00
aflying pumpkin	c7f7e63495	Added Lionesses	2022-04-16 16:57:59 +00:00
flo	3d24b1d635	CliffTowns	2022-03-29 12:52:08 +00:00
ninefox	329051c6df	removed extra fields from item_drop_manifest.ron ... added TODO about applying non-random rotations in load.rs	2022-02-26 10:13:04 -08:00
Treeco	90fbadbd03	Fix ember z fighting, remove ember sway	2022-02-15 23:05:20 +00:00
Samuel Keiffer	6c7c0eefae	Merge branch 'gnarlings' into 'master' ... Gnarlings See merge request veloren/veloren!3194	2022-02-15 00:22:37 +00:00
unvariant	9d98cd9e58	Render item drops instead of placeholder textures	2022-02-14 02:09:45 +00:00
jshipsey	2eee43865f	chieftain anims	2022-02-11 02:18:48 -05:00
Sam	0031aa6f5f	Chieftain AI and attacks	2022-02-10 14:58:35 -05:00
jshipsey	0c788997a4	anims	2022-02-10 14:58:34 -05:00
Sam	e044bf5091	Mandragora attacks and ai	2022-02-10 14:58:32 -05:00
Sam	82c976919e	Darts are now darts.	2022-02-10 14:58:29 -05:00
Joshua Barretto	6263942041	Merge branch 'slipped/site2' into 'master' ... new entities, frostpines See merge request veloren/veloren!3193	2022-02-10 01:59:20 +00:00
jshipsey	786ae39fb4	new entities	2022-02-09 20:10:59 -05:00
jshipsey	6f8cadc847	wall contact, run anim tweaks	2022-02-09 19:34:22 -05:00
jshipsey	7827797106	weapon tweaks	2022-01-30 01:10:13 -05:00