716 Commits

Author	SHA1	Message	Date
Christof Petig	b1dc85dc0f	llama in one vox file	2023-04-04 23:46:20 +02:00
Monty Marz	d1a7884ac8	Merge branch 'more_spot_things' into 'master' ... grave models, spot fixes, sword overlay See merge request veloren/veloren!3842	2023-03-31 02:57:39 +00:00
Isse	c34e5ad4ed	Small fixes	2023-03-29 23:11:59 +00:00
Monty Marz	e4c5e50fb2	grave models, spot fixes, sword overlay	2023-03-29 13:10:49 +02:00
flo666	897d1e5fe5	fix_ngoubou_jaw	2023-03-20 22:07:23 +01:00
Isse	29d9c9dcae	move key and lockpick models to voxel folder	2023-03-13 00:54:29 +01:00
flo	704af5ef7b	bird_medium_scale	2023-03-12 18:08:21 +00:00
Monty Marz	277a402781	Initial quest window work, spot fixes	2023-03-10 22:16:26 +00:00
Monty Marz	9a025cfcc8	More spot features	2023-03-03 23:21:37 +00:00
Joshua Barretto	de1c961141	Fixed apple sprite offset	2023-03-01 12:09:41 +00:00
flo	98e93d1a1c	spawn and loot tweaks, tursus and werewolf anims	2023-02-22 01:32:05 +00:00
flo	bf81ffc029	frost_gigas	2023-02-15 00:10:37 +00:00
flo	0531b40fae	bird_medium_2	2023-02-14 23:17:20 +00:00
flo666	9c09000256	- change bristlemane to bristleback ... - axebeak tweaks	2023-01-31 20:34:41 +01:00
flo666	e109f5c377	axebeak, tursus	2023-01-31 20:34:40 +01:00
flo666	75bfbff2c3	bristlemane	2023-01-31 20:34:40 +01:00
flo666	271b80b832	seal	2023-01-31 20:34:40 +01:00
Christof Petig	f306b6ee69	make lamps, embers and campfires use glowing indices for the brightest fiery colors	2023-01-29 18:53:18 +01:00
Marcel	c165d28e7d	Merge branch 'wyvern_wings' into 'master' ... wyverns See merge request veloren/veloren!3720	2023-01-28 21:25:17 +00:00
flo	5e1fd02095	wyverns	2023-01-28 21:25:17 +00:00
Joshua Barretto	d9552f7ff4	Added support for glowing sprites	2023-01-19 21:59:02 +00:00
flo	0eba37ce6a	dark_guitar & icy_talharpa	2023-01-13 13:37:45 +00:00
Joshua Barretto	f48e1ca951	Make wind sway change according to weather wind velocity	2022-12-31 17:40:40 +00:00
flo	466ed2c382	dagon_kit	2022-11-30 15:27:21 +00:00
Justin Shipsey	aa2fabcd45	Merge branch 'mossdrake' into 'master' ... Moss Drake See merge request veloren/veloren!3693	2022-11-12 13:00:44 +00:00
flo	0351bf1d63	Moss Drake	2022-11-12 13:00:42 +00:00
Christof Petig	a820eee289	Merge branch 'floppy-bat-wing-tweaks' into 'master' ... tweak bat wing animation See merge request veloren/veloren!3684	2022-11-12 10:18:11 +00:00
flo	df70381a7c	tweak bat wing animation	2022-11-12 10:18:10 +00:00
Monty Marz	a763a865fe	Musical Instruments part 2	2022-11-10 20:59:53 +00:00
flo	34eae80253	fix facegourd item name	2022-10-27 13:49:06 +00:00
IsseW	9a6a3a05a1	bat config	2022-10-25 00:31:04 +02:00
flo666	586d0f6dd8	add bat (created by Gemu)	2022-10-23 20:05:39 +02:00
flo666	60a48e450c	facegourd and helmet offset (Female Orc)	2022-10-23 20:05:39 +02:00
flo666	1d98050f28	halloween npcs: ... in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd	2022-10-23 20:05:39 +02:00
Monty Marz	3a63f210b2	fix drop model for chieftain mask	2022-10-21 00:20:15 +02:00
Monty Marz	2d8627c29b	Add gnarling chieftain mask	2022-10-15 11:05:21 +00:00
flo	cfbadd36ea	fix_desert_rock_animals	2022-09-22 18:42:34 +00:00
flo	dc688bccb9	fix_salamander_and_elbst	2022-09-13 17:32:53 +00:00
flo	e43608ce80	add guitar & instrument sample edits	2022-09-10 17:23:38 +00:00
flo	e4a3671345	Creature model updates	2022-09-06 10:35:10 +00:00
flo	9339971032	Music Instruments	2022-08-28 18:48:18 +00:00
flo	e882e62c08	seachapel	2022-08-24 21:50:53 +00:00
flo	5dd9991311	DesertCity	2022-08-08 09:58:18 +00:00
Youssef Fahmy	91c85dea22	Humanoid Model Overhaul	2022-07-16 11:13:24 +00:00
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
jshipsey	4fbd3027a1	new mobs	2022-01-28 02:50:15 -05:00
floppy	fb316e8f66	SeaCrocodile spawning in tropical Oceans	2022-01-24 19:36:13 +01:00
Joshua Barretto	53574bb6ec	Tweaked lantern offsets	2022-01-19 20:08:13 -05:00
Snowram	f6d7ba33ef	Arthropods spawns and loots	2022-01-19 19:01:16 +01:00
Snowram	fd3ed89899	More arthropod animations	2022-01-19 19:01:15 +01:00
Snowram	02ed6ffd60	More arthropod work	2022-01-19 19:01:13 +01:00