3665 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	691aebefc2	Temporarily removed fire	2020-04-23 18:19:41 +01:00
Joshua Barretto	049a3a023e	Fixed river width determination	2020-04-23 18:19:41 +01:00
Joshua Barretto	2d27275afa	Improvements to town generation	2020-04-23 18:19:41 +01:00
Joshua Barretto	7062deed9a	Innumerable minor improvements to towns, added bridges, better paths, more house variations, etc.	2020-04-23 18:19:41 +01:00
Joshua Barretto	ebea3c7636	Basic town house generation	2020-04-23 18:19:40 +01:00
Pfauenauge90	f9166921dd	pizza sprite	2020-04-23 18:19:40 +01:00
Pfauenauge	6a7e83d2c1	ember sprite	2020-04-23 18:19:40 +01:00
Joshua Barretto	e98a6063b9	Refactored town generation code	2020-04-23 18:19:40 +01:00
Joshua Barretto	25d35feb2e	Significantly better house generation	2020-04-23 18:19:40 +01:00
Joshua Barretto	149d6d05af	Added skeleton house generation	2020-04-23 18:19:40 +01:00
Joshua Barretto	ebf2c405d9	Began adding building skeleton structure	2020-04-23 18:19:40 +01:00
Joshua Barretto	c4d30c71a1	Lighting improvements, fixed NaN issue for agents	2020-04-23 18:19:40 +01:00
Joshua Barretto	cffa72e05c	Resolved rebase problems	2020-04-23 18:19:40 +01:00
Joshua Barretto	589229f668	Start of layered settlement generation, better settlement terraingen	2020-04-23 18:19:40 +01:00
Joshua Barretto	714346ef83	Fixed value rationalisation	2020-04-23 18:19:40 +01:00
Joshua Barretto	83c485300b	Added trading to new economic model	2020-04-23 18:19:40 +01:00
Joshua Barretto	3d14f7054b	Overhauled domestic economy simulation, better debug information	2020-04-23 18:19:40 +01:00
Joshua Barretto	3c9047fb51	Fixed cheap shader	2020-04-23 18:19:40 +01:00
Joshua Barretto	3c1c49901f	Nicer water shaders	2020-04-23 18:19:40 +01:00
Joshua Barretto	cb12d8ba7a	Added correctly allocated labours, fishing	2020-04-23 18:19:40 +01:00
Joshua Barretto	f62e6a4303	Basic trading simulation	2020-04-23 18:19:40 +01:00
Joshua Barretto	642a8f98f5	Began work on basic economic simulation	2020-04-23 18:19:40 +01:00
Joshua Barretto	85b75e016d	Better track routing for civsim	2020-04-23 18:19:40 +01:00
Joshua Barretto	a072126ed3	Added store	2020-04-23 18:19:40 +01:00
Joshua Barretto	5c04e15e5f	Added initial civ generation	2020-04-23 18:19:40 +01:00
Joshua Barretto	e58ec2655a	Removed old settlement code, removed zcache from dependency of site generators for forward compatibility	2020-04-23 18:19:40 +01:00
Joshua Barretto	9ca7a77777	Moved settlement code to site directory, removed old town generation code	2020-04-23 18:19:40 +01:00
Joshua Barretto	09c2a3394e	Cleaner clouds, better movement	2020-04-23 18:19:40 +01:00
Joshua Barretto	60244625b0	Better AO, fixed cloud pixelation	2020-04-23 18:19:40 +01:00
Joshua Barretto	7ae87d63e6	Fixed cloud bugs, made pets run into you less	2020-04-23 18:19:40 +01:00
Joshua Barretto	0885267ea3	Smoothed camera motion, gentler orientation lerping	2020-04-23 18:19:40 +01:00
Joshua Barretto	ca223112e6	Reversed water draw order	2020-04-23 18:19:40 +01:00
Joshua Barretto	1697c39adc	Better town walls, made settlements avoid rivers	2020-04-23 18:19:40 +01:00
Joshua Barretto	e321bea637	Added basic wall and tower rendering	2020-04-23 18:19:40 +01:00
Joshua Barretto	a732b2f2f1	Began work on post-generation town rendering, fixed overflow bug on large maps	2020-04-23 18:19:40 +01:00
Joshua Barretto	0b6ffbea86	Added new settlement generation to world, basic rendering	2020-04-23 18:19:40 +01:00
Joshua Barretto	a088f2396c	Town walls, wall towers	2020-04-23 18:19:40 +01:00
Joshua Barretto	3c074b4a71	Added river obstacle example	2020-04-23 18:19:40 +01:00
Joshua Barretto	08ad03ff0e	Initial settlement generation work	2020-04-23 18:19:40 +01:00
Justin Shipsey	fb08a2c567	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	0335ab4cf9	6 new music tracks	2020-04-23 17:16:45 +00:00
Marcel	04c840c91b	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	9595eca0be	fix(ci): allow coverage test to fail temporarily ... #538	2020-04-23 14:47:21 +02:00
Marcel	dc197ce0ab	Merge branch 'songtronix/fix-toolchain' into 'master' ... fix toolchain See merge request veloren/veloren!930	2020-04-21 20:04:55 +00:00
Songtronix	4028231d3c	fix toolchain	2020-04-21 20:04:55 +00:00
Marcel	62ef327a0b	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	2849861b1c	update toolchain to nightly-2020-04-17	2020-04-18 15:07:13 +00:00
Monty Marz	e41703149b	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	e32b761a62	insert correct model, change offset accordingly	2020-04-16 15:04:02 +02:00
Songtronix	b7f52a0a3b	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