4065 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	a754b34105	Temporarily removed fire	2020-04-23 18:19:41 +01:00
Joshua Barretto	31b2693b78	Fixed river width determination	2020-04-23 18:19:41 +01:00
Joshua Barretto	d3bf856c33	Improvements to town generation	2020-04-23 18:19:41 +01:00
Joshua Barretto	68c5612692	Innumerable minor improvements to towns, added bridges, better paths, more house variations, etc.	2020-04-23 18:19:41 +01:00
Joshua Barretto	8499143f77	Basic town house generation	2020-04-23 18:19:40 +01:00
Pfauenauge90	fd3ffdf28b	pizza sprite	2020-04-23 18:19:40 +01:00
Pfauenauge	67f27ef970	ember sprite	2020-04-23 18:19:40 +01:00
Joshua Barretto	15971f0def	Refactored town generation code	2020-04-23 18:19:40 +01:00
Joshua Barretto	c3e5b3057f	Significantly better house generation	2020-04-23 18:19:40 +01:00
Joshua Barretto	b0f9ef5f30	Added skeleton house generation	2020-04-23 18:19:40 +01:00
Joshua Barretto	4830757bc9	Began adding building skeleton structure	2020-04-23 18:19:40 +01:00
Joshua Barretto	dde0319293	Lighting improvements, fixed NaN issue for agents	2020-04-23 18:19:40 +01:00
Joshua Barretto	8c73ec982c	Resolved rebase problems	2020-04-23 18:19:40 +01:00
Joshua Barretto	966f96c588	Start of layered settlement generation, better settlement terraingen	2020-04-23 18:19:40 +01:00
Joshua Barretto	9daf20e87e	Fixed value rationalisation	2020-04-23 18:19:40 +01:00
Joshua Barretto	71b8cde266	Added trading to new economic model	2020-04-23 18:19:40 +01:00
Joshua Barretto	b3c9122395	Overhauled domestic economy simulation, better debug information	2020-04-23 18:19:40 +01:00
Joshua Barretto	d7385fd99b	Fixed cheap shader	2020-04-23 18:19:40 +01:00
Joshua Barretto	16a175abe0	Nicer water shaders	2020-04-23 18:19:40 +01:00
Joshua Barretto	a0dae82a2b	Added correctly allocated labours, fishing	2020-04-23 18:19:40 +01:00
Joshua Barretto	cee1b1f962	Basic trading simulation	2020-04-23 18:19:40 +01:00
Joshua Barretto	46190aa634	Began work on basic economic simulation	2020-04-23 18:19:40 +01:00
Joshua Barretto	348003fc1a	Better track routing for civsim	2020-04-23 18:19:40 +01:00
Joshua Barretto	fe4418bc0d	Added store	2020-04-23 18:19:40 +01:00
Joshua Barretto	c1514fc37b	Added initial civ generation	2020-04-23 18:19:40 +01:00
Joshua Barretto	41b77a9b10	Removed old settlement code, removed zcache from dependency of site generators for forward compatibility	2020-04-23 18:19:40 +01:00
Joshua Barretto	1c6a6cd6cf	Moved settlement code to site directory, removed old town generation code	2020-04-23 18:19:40 +01:00
Joshua Barretto	b9cc0f387b	Cleaner clouds, better movement	2020-04-23 18:19:40 +01:00
Joshua Barretto	df5aa93fd7	Better AO, fixed cloud pixelation	2020-04-23 18:19:40 +01:00
Joshua Barretto	d91d66027a	Fixed cloud bugs, made pets run into you less	2020-04-23 18:19:40 +01:00
Joshua Barretto	3d4a294b83	Smoothed camera motion, gentler orientation lerping	2020-04-23 18:19:40 +01:00
Joshua Barretto	5f2d0021a3	Reversed water draw order	2020-04-23 18:19:40 +01:00
Joshua Barretto	9dc46c490e	Better town walls, made settlements avoid rivers	2020-04-23 18:19:40 +01:00
Joshua Barretto	5d5e8e3238	Added basic wall and tower rendering	2020-04-23 18:19:40 +01:00
Joshua Barretto	085a115e2b	Began work on post-generation town rendering, fixed overflow bug on large maps	2020-04-23 18:19:40 +01:00
Joshua Barretto	0021bd6452	Added new settlement generation to world, basic rendering	2020-04-23 18:19:40 +01:00
Joshua Barretto	48fb14116a	Town walls, wall towers	2020-04-23 18:19:40 +01:00
Joshua Barretto	20b16d229c	Added river obstacle example	2020-04-23 18:19:40 +01:00
Joshua Barretto	944a37b848	Initial settlement generation work	2020-04-23 18:19:40 +01:00
Justin Shipsey	ecf0b90da2	Merge branch 'music' into 'master' ... 6 new music tracks See merge request veloren/veloren!929	2020-04-23 17:16:46 +00:00
Justin Shipsey	7519e842e9	6 new music tracks	2020-04-23 17:16:45 +00:00
Marcel	e549910bd1	Merge branch 'songtronix/fix-ci' into 'master' ... allow coverage test to fail temporarily See merge request veloren/veloren!934	2020-04-23 13:18:27 +00:00
Songtronix	465d4d44ee	fix(ci): allow coverage test to fail temporarily ... #538	2020-04-23 14:47:21 +02:00
Marcel	1ad3fb4e64	Merge branch 'songtronix/fix-toolchain' into 'master' ... fix toolchain See merge request veloren/veloren!930	2020-04-21 20:04:55 +00:00
Songtronix	26e27f4198	fix toolchain	2020-04-21 20:04:55 +00:00
Marcel	00f48a12c5	Merge branch 'xMAC94x/update-toolchain' into 'master' ... update toolchain to `nightly-2020-04-17` See merge request veloren/veloren!919	2020-04-18 15:07:31 +00:00
Marcel	bf43770993	update toolchain to nightly-2020-04-17	2020-04-18 15:07:13 +00:00
Monty Marz	b4345c3246	Merge branch 'pfau/fix_palms' into 'master' ... Wrong model fix for fruit trees See merge request veloren/veloren!915	2020-04-16 13:55:15 +00:00
Pfauenauge90	5daa7d7b02	insert correct model, change offset accordingly	2020-04-16 15:04:02 +02:00
Songtronix	51126da127	Merge branch 'update-appdata-files' into 'master' ... Update AppData manifest to conform guidelines See merge request veloren/veloren!907	2020-04-16 05:25:04 +00:00