2498 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	d0768e9858	Faster prng	2019-08-31 14:24:56 +01:00
Joshua Barretto	cc214982bf	Fixed warnings	2019-08-31 11:44:52 +01:00
Joshua Barretto	7321eb6999	Better town park generation	2019-08-31 11:44:52 +01:00
Joshua Barretto	1eb0720cbb	Cleaned up wall generation	2019-08-31 11:44:52 +01:00
Joshua Barretto	1176fc4d07	Better loading times	2019-08-31 11:44:52 +01:00
Joshua Barretto	c433ef36d7	Sloped wall tops	2019-08-31 11:44:52 +01:00
Joshua Barretto	25d6ab03aa	Removed extra foundations	2019-08-31 11:44:52 +01:00
Joshua Barretto	e3c4e34edb	Added city walls	2019-08-31 11:44:52 +01:00
Joshua Barretto	144703da1c	Added wall module assets	2019-08-31 11:44:52 +01:00
Joshua Barretto	5a677b9c1e	Added modular building generation	2019-08-31 11:44:52 +01:00
Joshua Barretto	adb62f448e	Added walls	2019-08-31 11:44:52 +01:00
Joshua Barretto	d17356fb38	Started work on modular buildings	2019-08-31 11:44:52 +01:00
Joshua Barretto	f8c5b277e3	Improved mountain slopes and cliffs	2019-08-31 11:44:52 +01:00
Joshua Barretto	17a61e0b7c	Fixed terrain sprite transparency issue	2019-08-31 11:44:52 +01:00
Joshua Barretto	4de7a064a1	Added module parts, made cell size smaller	2019-08-31 11:44:52 +01:00
Joshua Barretto	27c208d1a5	Fixed terrain sprite transparency layering	2019-08-31 11:44:52 +01:00
Joshua Barretto	fe2ad92201	Initial implementation of towns	2019-08-31 11:44:52 +01:00
Joshua Barretto	d42485238e	Added town road construction	2019-08-31 11:44:52 +01:00
Joshua Barretto	aaade23eef	Better warping	2019-08-31 11:44:52 +01:00
Joshua Barretto	b0293ecce4	Switched to FastNoise	2019-08-31 11:44:52 +01:00
Joshua Barretto	4777921680	Added test generator	2019-08-31 11:44:52 +01:00
Joshua Barretto	1fcb4a0313	Added Generator trait, fixed ocean lighting	2019-08-31 11:44:52 +01:00
Joshua Barretto	75f5419571	Removed dryness	2019-08-31 11:44:52 +01:00
Joshua Barretto	4735d3d6da	More interesting hills	2019-08-31 11:44:52 +01:00
timokoesters	ecbf7cad5b	Remove old code	2019-08-31 09:00:20 +02:00
jshipsey	bb71bdd4a2	removing to make gitlab compiler happy	2019-08-30 23:18:56 -04:00
jshipsey	3c473d6d6c	rebase	2019-08-30 23:01:29 -04:00
jshipsey	b81cd6a8f9	combine character.action movement blocks	2019-08-30 22:51:46 -04:00
timokoesters	9a832dd56b	Move std::mem::discriminant into new method	2019-08-30 22:51:46 -04:00
timokoesters	d822356161	Remove warning	2019-08-30 22:51:46 -04:00
jshipsey	78bf7a0997	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	b99bac87db	Make npcs roll correctly	2019-08-30 22:50:53 -04:00
timokoesters	77a48c61a1	Fix rolling for the player	2019-08-30 22:50:53 -04:00
jshipsey	d84c07c1cb	fixed tiny feet in char creation	2019-08-30 22:50:53 -04:00
jshipsey	f8d0b1040a	readded cidle	2019-08-30 22:50:53 -04:00
jshipsey	bec942753e	some stuff fixed, other stuff still broken	2019-08-30 22:50:53 -04:00
timokoesters	cd3e340647	Use movement anim as base and action anim as overwrite	2019-08-30 22:50:53 -04:00
jshipsey	e6197d4c10	separate static anims for feet (run/static)	2019-08-30 22:50:53 -04:00
timokoesters	637b4642d8	Split animations	2019-08-30 22:50:53 -04:00
timokoesters	e674424974	Allow non player entites to be removed again	2019-08-30 22:47:39 -04:00
Timo Koesters	b5f649eb15	Merge branch 'timo-inventory' into 'master' ... Timo inventory See merge request veloren/veloren!468	2019-08-30 22:37:40 +00:00
timokoesters	15978d216b	Rename controller main, alt to primary, secondary	2019-08-31 00:13:45 +02:00
timokoesters	a95893e43b	Remove inventory::swap and improve inventory::insert	2019-08-31 00:09:25 +02:00
timokoesters	ba02956f05	Make boost RMB go upward again	2019-08-31 00:08:44 +02:00
timokoesters	bd8e71c5aa	Rename activate_inventory_slot to use_inventory_slot	2019-08-30 22:46:45 +02:00
timokoesters	5d02d32ec6	Make inventory::get return a reference	2019-08-30 22:42:43 +02:00
timokoesters	082ccd7c46	Avoid right-ward shift	2019-08-30 22:32:47 +02:00
timokoesters	7e66fe792d	Return the item again if slot was not wrong	2019-08-30 21:03:49 +02:00
timokoesters	b063694d05	Implement icons based on weapon	2019-08-29 21:48:05 +02:00
timokoesters	952ec35857	Remove warnings	2019-08-29 19:54:53 +02:00