2181 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Yanovski	97eaeddd78	t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle	2019-08-19 19:21:05 +02:00
Joshua Yanovski	5919f63516	Fixing visual issues.	2019-08-19 19:20:54 +02:00
Joshua Barretto	e2082088c8	Added sprite pipeline	2019-08-19 18:01:23 +01:00
Joshua Barretto	08e982fa7c	Merge branch 'xacrimon/lotsafixes' into 'master' ... Eliminated unsafe and disabled it with lint levels. See merge request veloren/veloren!449	2019-08-19 13:25:55 +00:00
Acrimon	a41cf1a83d	Disabled unsafe using lint level.	2019-08-19 14:39:23 +02:00
Acrimon	d0f10115f4	Eliminated unsafe.	2019-08-19 14:33:31 +02:00
Joshua Yanovski	50c90e1cde	Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle	2019-08-19 11:04:09 +02:00
Marcel	9c3bc88598	Merge branch 'console-spam-hot-fix' into 'master' ... Fix low fps See merge request veloren/veloren!448	2019-08-19 08:03:20 +00:00
Monty Marz	7168850f05	Fix low fps	2019-08-19 08:03:19 +00:00
Joshua Yanovski	fa35f9932e	Smoothed some things out.	2019-08-19 05:22:39 +02:00
Joshua Yanovski	1c9be67516	Billow tweaks.	2019-08-19 03:41:32 +02:00
Joshua Yanovski	c5ffb232d4	Fixing some colors.	2019-08-19 03:01:11 +02:00
Joshua Yanovski	d8c864cf3a	Making jungles work.	2019-08-19 01:52:26 +02:00
Joshua Barretto	61d6113822	Merge branch 'pfauenauge/ui-additions' into 'master' ... Hotbar rework See merge request veloren/veloren!438	2019-08-18 18:07:21 +00:00
Monty Marz	29f6186139	hotbar changes ... completely switched to. vox files easier to see design gradient and numbers on the health/mana bar	2019-08-18 18:07:21 +00:00
Joshua Yanovski	680b81a5e6	WIP for humidity.	2019-08-18 18:35:27 +02:00
Joshua Barretto	2828e40ef4	Merge branch 'overclockx64/fluids' into 'master' ... Fluids See merge request veloren/veloren!436	2019-08-18 15:01:55 +00:00
Joshua Barretto	49426565dc	Renamed normal StructureBlock variant	2019-08-18 15:33:16 +01:00
Joshua Barretto	749ec15bf9	Cleanup, comments	2019-08-18 10:33:18 +01:00
Joshua Barretto	75dbebbd05	More interesting waves	2019-08-18 10:33:18 +01:00
Vechro	71710fb091	Dungeon fixes	2019-08-18 10:33:18 +01:00
Joshua Barretto	e535537106	Added default block kind to structure loading	2019-08-18 10:33:18 +01:00
Vechro	6cf5b99857	Add water-based dungeons	2019-08-18 10:33:18 +01:00
Joshua Barretto	f0e52e6002	Better reflections and water fog	2019-08-18 10:33:18 +01:00
Joshua Barretto	825d8bb632	Fixed water in caves, made water reflection vary with lighting	2019-08-18 10:33:18 +01:00
Joshua Barretto	5d4079b165	Better reflection calculations	2019-08-18 10:33:18 +01:00
Vechro	b5b3b980fe	Add green sludge special index	2019-08-18 10:33:18 +01:00
Vechro	944067fd43	Add water special index	2019-08-18 10:33:18 +01:00
Joshua Barretto	d65bacbea1	Better waves	2019-08-18 10:33:18 +01:00
Joshua Barretto	fa6825f13b	Better fluid meshing, disabled fluid backface culling and depth buffer writing	2019-08-18 10:33:18 +01:00
Joshua Barretto	42237a84e4	Added translucent meshing pass, water reflections	2019-08-18 10:33:18 +01:00
Luc Fauvel	4a29900914	Copying terrain pipeline and shaders for fluids	2019-08-18 10:33:18 +01:00
Joshua Barretto	910e0aed2a	Merge branch 'slipped-shoulders' into 'master' ... shoulder improvement See merge request veloren/veloren!446	2019-08-18 09:09:09 +00:00
jshipsey	f14a182734	removed wield slowdown by popular request	2019-08-18 03:26:52 -04:00
jshipsey	2ca81323d5	added shoulder movement and fixed placement	2019-08-18 02:35:27 -04:00
Joshua Barretto	68a722e442	Merge branch 'xacrimon/fix-worldgen-seed-expansion' into 'master' ... Fixed seed expansion for noise seeding. See merge request veloren/veloren!445	2019-08-17 23:10:59 +00:00
Acrimon	cb4374160c	Removed unsafe.	2019-08-19 00:55:04 +02:00
Acrimon	09525bf964	Cleaner solution.	2019-08-19 00:46:24 +02:00
Acrimon	f8d14bdfd5	Ran fmt.	2019-08-19 00:20:56 +02:00
Acrimon	6b59f0bc9a	Fixed seed expansion for noise seeding.	2019-08-19 00:19:51 +02:00
Joshua Barretto	66dc78a4ce	Merge branch 'qutrin/adminify-command' into 'master' ... Add adminify command to temporarily give admin perms See merge request veloren/veloren!444	2019-08-17 21:46:02 +00:00
Piotr Korgól	586bf5faff	Add adminify command to temporarily give admin perms	2019-08-17 23:35:01 +02:00
Imbris	f12821db35	Merge branch 'imbris/srgb' into 'master' ... Handle srgb values more accurately, Load shaders at runtime + hotloading Closes #79 See merge request veloren/veloren!412	2019-08-16 22:44:14 +00:00
Joshua Barretto	e9fc2789d1	Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' ... Scott c/cull entities outside viewport Closes #207 See merge request veloren/veloren!442	2019-08-16 16:47:02 +00:00
scott-c	fce74c6218	cargo fmt	2019-08-17 00:11:06 +08:00
scott-c	2fabdfe0eb	unwrap_or instead of map_or	2019-08-17 00:08:09 +08:00
scott-c	dc73e4ffb7	use entity scale as hitbox for frustrum culling	2019-08-16 23:39:07 +08:00
scott-c	f312299e62	Replace view distance culling with frustum culling	2019-08-16 21:45:10 +08:00
Imbris	5054f1e87d	remove palette dependency	2019-08-16 00:01:20 -04:00
Imbris	d89fff1499	Fix typo, move shaders back out of subfolders	2019-08-15 23:59:10 -04:00