2054 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	8a4dd94132	Pixel perfection, vox orientation, image rotation	2019-09-01 15:34:20 -04:00
Imbris	6ba734a944	Add ImageFrame widget	2019-09-01 15:34:19 -04:00
Joshua Barretto	277b4181cc	Merge branch 'pfauenauge/more_sprites' into 'master' ... More sprites, ui fixes, lianas See merge request veloren/veloren!472	2019-09-01 19:04:03 +00:00
Monty Marz	8c39a4751b	More sprites, ui fixes, lianas	2019-09-01 19:04:03 +00:00
Joshua Barretto	8d0c91dc94	Merge branch 'zesterer/worldgen' into 'master' ... Worldgen improvements See merge request veloren/veloren!457	2019-08-31 21:37:54 +00:00
Joshua Barretto	7f48155de8	Merge branch 'timo-animations' into 'master' ... Split animations See merge request veloren/veloren!466	2019-08-31 15:47:16 +00:00
Joshua Barretto	8c0346a190	Faster prng	2019-08-31 14:24:56 +01:00
Joshua Barretto	2bfb5d7c5e	Fixed warnings	2019-08-31 11:44:52 +01:00
Joshua Barretto	022d303f00	Better town park generation	2019-08-31 11:44:52 +01:00
Joshua Barretto	ba4d2cf5db	Cleaned up wall generation	2019-08-31 11:44:52 +01:00
Joshua Barretto	61c35855ba	Better loading times	2019-08-31 11:44:52 +01:00
Joshua Barretto	c27d2e4c85	Sloped wall tops	2019-08-31 11:44:52 +01:00
Joshua Barretto	9e1a6662dc	Removed extra foundations	2019-08-31 11:44:52 +01:00
Joshua Barretto	3ce4186143	Added city walls	2019-08-31 11:44:52 +01:00
Joshua Barretto	1b48699d1b	Added wall module assets	2019-08-31 11:44:52 +01:00
Joshua Barretto	5a61d563d8	Added modular building generation	2019-08-31 11:44:52 +01:00
Joshua Barretto	99c5171258	Added walls	2019-08-31 11:44:52 +01:00
Joshua Barretto	ca8c78eee6	Started work on modular buildings	2019-08-31 11:44:52 +01:00
Joshua Barretto	b5da843aec	Improved mountain slopes and cliffs	2019-08-31 11:44:52 +01:00
Joshua Barretto	0a5805d423	Fixed terrain sprite transparency issue	2019-08-31 11:44:52 +01:00
Joshua Barretto	bc422e8075	Added module parts, made cell size smaller	2019-08-31 11:44:52 +01:00
Joshua Barretto	460c509a12	Fixed terrain sprite transparency layering	2019-08-31 11:44:52 +01:00
Joshua Barretto	71fcb70a51	Initial implementation of towns	2019-08-31 11:44:52 +01:00
Joshua Barretto	fb0f981bbc	Added town road construction	2019-08-31 11:44:52 +01:00
Joshua Barretto	c70e87b4af	Better warping	2019-08-31 11:44:52 +01:00
Joshua Barretto	b3cc006bce	Switched to FastNoise	2019-08-31 11:44:52 +01:00
Joshua Barretto	42837268bc	Added test generator	2019-08-31 11:44:52 +01:00
Joshua Barretto	5e78479b50	Added Generator trait, fixed ocean lighting	2019-08-31 11:44:52 +01:00
Joshua Barretto	44df366177	Removed dryness	2019-08-31 11:44:52 +01:00
Joshua Barretto	ac583f6d0a	More interesting hills	2019-08-31 11:44:52 +01:00
timokoesters	9fd258eaf6	Remove old code	2019-08-31 09:00:20 +02:00
jshipsey	11d52a3972	removing to make gitlab compiler happy	2019-08-30 23:18:56 -04:00
jshipsey	26c877d8ac	rebase	2019-08-30 23:01:29 -04:00
jshipsey	a1d23cdc14	combine character.action movement blocks	2019-08-30 22:51:46 -04:00
timokoesters	702a4afd46	Move std::mem::discriminant into new method	2019-08-30 22:51:46 -04:00
timokoesters	3430f290bb	Remove warning	2019-08-30 22:51:46 -04:00
jshipsey	7f38acd475	slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation	2019-08-30 22:50:53 -04:00
timokoesters	f7f6fd98dd	Make npcs roll correctly	2019-08-30 22:50:53 -04:00
timokoesters	8900a9e4f3	Fix rolling for the player	2019-08-30 22:50:53 -04:00
jshipsey	01105d21e5	fixed tiny feet in char creation	2019-08-30 22:50:53 -04:00
jshipsey	5a59f4bb22	readded cidle	2019-08-30 22:50:53 -04:00
jshipsey	2496256ff6	some stuff fixed, other stuff still broken	2019-08-30 22:50:53 -04:00
timokoesters	efddbcd5f9	Use movement anim as base and action anim as overwrite	2019-08-30 22:50:53 -04:00
jshipsey	737bddc15d	separate static anims for feet (run/static)	2019-08-30 22:50:53 -04:00
timokoesters	7099ef99b4	Split animations	2019-08-30 22:50:53 -04:00
timokoesters	4fdc1727bd	Allow non player entites to be removed again	2019-08-30 22:47:39 -04:00
Timo Koesters	4a2f0fdf57	Merge branch 'timo-inventory' into 'master' ... Timo inventory See merge request veloren/veloren!468	2019-08-30 22:37:40 +00:00
timokoesters	ade4bd8887	Rename controller main, alt to primary, secondary	2019-08-31 00:13:45 +02:00
timokoesters	82a8a4bc7e	Remove inventory::swap and improve inventory::insert	2019-08-31 00:09:25 +02:00
timokoesters	e7c112fec1	Make boost RMB go upward again	2019-08-31 00:08:44 +02:00