602 Commits

Author	SHA1	Message	Date
Ben Wallis	4d6c553b1b	Fixed suppressed clippy warnings for #587 - redundant_closure	2020-06-12 20:47:22 +01:00
Ben Wallis	8ed2109bcf	Fixed suppressed clippy warnings for #587 - collapsible_if	2020-06-12 20:34:54 +01:00
Ben Wallis	950c62efc6	Suppressed all existing clippy warnings in preparation for fixes as part of #587	2020-06-10 22:01:42 +01:00
Monty Marz	b34da9b07b	More item drops	2020-06-03 17:59:09 +00:00
CapsizeGlimmer	78a06550d0	Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame	2020-05-27 13:49:18 +02:00
Joshua Barretto	786665eac4	Merge branch 'sharp/deterministic-civsim' into 'master' ... Make civsim and sites deterministic. See merge request veloren/veloren!1009	2020-05-26 19:22:48 +00:00
Treeco	4c41cc1050	Changed SEED_SKIP to 0	2020-05-21 21:59:59 +01:00
Joshua Yanovski	2f89b863e0	Merge branch 'treeco/new-map' into 'master' ... Changed default map and seed, lowered site counts See merge request veloren/veloren!992	2020-05-21 20:46:54 +00:00
Joshua Yanovski	34427373ef	Make civsim and sites deterministic. ... For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen.	2020-05-21 21:43:54 +02:00
Joshua Barretto	db59a3ca3d	Merge branch 'small-fixes' into 'master' ... Dungeon Bosses See merge request veloren/veloren!994	2020-05-15 19:07:11 +00:00
Joshua Barretto	fff4021777	Better spawn town	2020-05-15 19:26:09 +01:00
Joshua Barretto	ba80f7c872	Fixed square staircases in dungeons	2020-05-15 18:34:05 +01:00
Joshua Barretto	93de58252e	More interesting dungeon features	2020-05-15 17:22:51 +01:00
Joshua Barretto	fb0c817528	More powerful bosses	2020-05-15 16:32:09 +01:00
Joshua Barretto	aac28d04d5	Added dungeon bosses, boss loot, boss arenas	2020-05-15 16:05:50 +01:00
Treeco	61bcfbeeb2	Changed default map and seed, lowered site counts	2020-05-15 11:36:19 +01:00
François Mockers	c757645587	fix links	2020-05-14 22:13:20 +02:00
Joshua Barretto	dd91fc53f8	Resolved bizarre dungeon spawn rate bug	2020-05-13 15:49:33 +01:00
Treeco	6281ab865a	Increased the spawn rate of towns and dungeons	2020-05-11 18:37:34 +01:00
Treeco	2797af0c87	Removed old-style dungeons ... I believe this means that trees are the only thing still using the old-style structure spawning. Maybe it can be simplified a lot more?	2020-05-11 18:37:16 +01:00
Monty Marz	b589c3fc71	Fix animals not attacking	2020-05-04 16:59:32 +00:00
Monty Marz	c792cc05a9	Villagers and Cultists	2020-04-30 20:43:24 +00:00
Joshua Barretto	44fc88b4d1	Better dungeon waypoint placement	2020-04-29 17:01:35 +02:00
Joshua Barretto	3e86b20c2c	Fixed dungeon offsets	2020-04-29 17:01:34 +02:00
Joshua Barretto	d0b1c9eb6f	Added dungeon entrances	2020-04-29 17:01:34 +02:00
Joshua Barretto	a1983712d3	Prevented windows spawning inside houses	2020-04-25 21:44:23 +01:00
Joshua Barretto	90de779559	Better LoD variable names	2020-04-25 21:44:23 +01:00
Joshua Barretto	c05f4fe009	Added configurable sprite view distance, minor bug fixes	2020-04-25 21:44:23 +01:00
Joshua Barretto	8bf5709ddf	Implemented Treeco's z-only LoD suggestion	2020-04-25 21:44:23 +01:00
Joshua Barretto	5bdc420726	Harbarboofarfoobar	2020-04-25 21:44:23 +01:00
Joshua Barretto	1feae79243	Added reseeding for sites	2020-04-25 21:44:23 +01:00
Joshua Barretto	b588be4962	fmt	2020-04-23 22:10:05 +01:00
Joshua Barretto	c0bd0279fc	Added sites to the map	2020-04-23 21:59:09 +01:00
Joshua Barretto	2a6a19f7ef	fmt	2020-04-23 18:19:42 +01:00
Joshua Barretto	06dc96c56b	Made paths connect at the ends, removed paths from dungeons	2020-04-23 18:19:42 +01:00
Joshua Barretto	01e2cd2b88	Warning cleanup	2020-04-23 18:19:42 +01:00
Joshua Barretto	840078d2b7	Gave some villagers weapons	2020-04-23 18:19:42 +01:00
Joshua Barretto	982886b3f8	Made players spawn in the nearest town to the centre of the world, delete object.zip	2020-04-23 18:19:41 +01:00
Joshua Barretto	57153a1720	Balanced dungeon spawn rates slightly	2020-04-23 18:19:41 +01:00
Joshua Barretto	cd5e4ef3b7	Better path colour on map, typo fixes	2020-04-23 18:19:41 +01:00
Joshua Barretto	444f2ecb45	Made /waypoint admin-only, MR cleanup	2020-04-23 18:19:41 +01:00
Joshua Barretto	e35dff2f4b	Fixed noise on bridges	2020-04-23 18:19:41 +01:00
Joshua Barretto	8d4f1da3a6	Improved path rendering on the map, removed ugly path noise	2020-04-23 18:19:41 +01:00
Joshua Barretto	60bf396e4f	Added doors to houses	2020-04-23 18:19:41 +01:00
Joshua Barretto	a65dbc570a	Returned to normal world size	2020-04-23 18:19:41 +01:00
Joshua Barretto	514281c837	Made lantern placement on paths more regular	2020-04-23 18:19:41 +01:00
Joshua Barretto	89f99dbcc9	Added lanterns to town streets	2020-04-23 18:19:41 +01:00
Joshua Barretto	628dc7c47e	Added waypoints outside of dungeons	2020-04-23 18:19:41 +01:00
Joshua Barretto	431e199731	Added correctly generating world paths, sub-voxel shader noise	2020-04-23 18:19:41 +01:00
Joshua Barretto	431b2ae07b	Fixed window mask layering, fmt	2020-04-23 18:19:41 +01:00
Joshua Barretto	77d0292e91	Added windows to buildings and scarecrows	2020-04-23 18:19:41 +01:00
Joshua Barretto	0329b355ef	Made civsim paths visible in-game	2020-04-23 18:19:41 +01:00
jshipsey	27dab981d2	town ground color	2020-04-23 18:19:41 +01:00
jshipsey	a89b28e117	adjusted run animation to allow villager walking	2020-04-23 18:19:41 +01:00
Pfauenauge90	9572c2eaad	spawn rates	2020-04-23 18:19:41 +01:00
Pfauenauge90	49d61b33c5	turnip	2020-04-23 18:19:41 +01:00
Pfauenauge90	98704a4753	turnip and window blocks	2020-04-23 18:19:41 +01:00
Joshua Barretto	c5efa43fa3	Reduced enemy spawn rate in dungeons, fixed spawning	2020-04-23 18:19:41 +01:00
Joshua Barretto	ca26efea47	Better town spawn rates	2020-04-23 18:19:41 +01:00
Joshua Barretto	4dbb6a631f	Reduced enemy spawn rate in dungeons, fixed spawning	2020-04-23 18:19:41 +01:00
Joshua Barretto	708f15915a	Agent adjustments, better dungeon stairwells	2020-04-23 18:19:41 +01:00
Joshua Barretto	cf986e75dc	Made civsim considerably more deterministic	2020-04-23 18:19:41 +01:00
Joshua Barretto	6448c17110	Fixed sprite AO, overhauled entity spawning, better enemy spawning in dungeons, made agents more skilled at combat	2020-04-23 18:19:41 +01:00
Joshua Barretto	d0641ecbe3	Unblocked tunnels	2020-04-23 18:19:41 +01:00
Joshua Barretto	aee7802d48	Reduced tunnel width	2020-04-23 18:19:41 +01:00
Joshua Barretto	2f96f3e0b9	Removed EntityKind for a second time because Pfau screwed up a rebase	2020-04-23 18:19:41 +01:00
Joshua Barretto	5229bcc8e2	Reduced crop densities	2020-04-23 18:19:41 +01:00
Monty Marz	0fb3a115da	Add more crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	7d4443cbcd	Fixed screw-up	2020-04-23 18:19:41 +01:00
Joshua Barretto	3541305ff4	Narrower tunnels	2020-04-23 18:19:41 +01:00
Joshua Barretto	e3ebdc56b3	Fixed figure AO (still need to do sprite AO), added more control over NPC spawning, loot in dungeons	2020-04-23 18:19:41 +01:00
Joshua Barretto	3042a09dfd	Disabled warping in towns	2020-04-23 18:19:41 +01:00
Joshua Barretto	866fd1992e	Fixed bad AO quad flipping in dark places, bosses spawning in dungeon walls, large creatues being uncompromisingly pedantic when trying to path towards targets	2020-04-23 18:19:41 +01:00
Joshua Barretto	fd14223c33	Basic boss spawning in dungeons, better AO	2020-04-23 18:19:41 +01:00
Joshua Barretto	c4879e991d	Enabled AO in darkness, better light attenuation	2020-04-23 18:19:41 +01:00
Joshua Barretto	525cba5029	Added dungeon rooms, corridors, mazes	2020-04-23 18:19:41 +01:00
Joshua Barretto	3ffc5a7d87	Added simple dungeon impl	2020-04-23 18:19:41 +01:00
Joshua Barretto	568a8ab87c	Increased block rendering altitude range	2020-04-23 18:19:41 +01:00
Joshua Barretto	32d2274caf	Better fields	2020-04-23 18:19:41 +01:00
Joshua Barretto	f999edffaa	Fixed crop crash issues	2020-04-23 18:19:41 +01:00
Joshua Barretto	a4872c4e8d	Added crop terrain sprite generation	2020-04-23 18:19:41 +01:00
Pfauenauge90	4b72a07e22	sprites	2020-04-23 18:19:41 +01:00
Joshua Barretto	a51d214c21	Fixed path irregularities, better bridges	2020-04-23 18:19:41 +01:00
Joshua Barretto	e352858c03	Fixed chimney blockage	2020-04-23 18:19:41 +01:00
Joshua Barretto	5146cc1981	More consistent bridge generation	2020-04-23 18:19:41 +01:00
Joshua Barretto	ea93353042	Fixed chimneys	2020-04-23 18:19:41 +01:00
Joshua Barretto	1b12ab0d29	Experimental house towers, wall/roof refactor	2020-04-23 18:19:41 +01:00
Joshua Barretto	a5ccfe3bc9	Significantly improved house variation	2020-04-23 18:19:41 +01:00
Joshua Barretto	c1945a1445	Added house overhangs, better per-wing generation options	2020-04-23 18:19:41 +01:00
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	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	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	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	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
Treeco	542491c48d	Fixed leaf lerp doing weird things	2020-04-09 21:03:17 +01:00
Songtronix	e64462ad2e	Merge branch 'imbris/security' into 'master' ... Update deps with security issues See merge request veloren/veloren!879	2020-04-02 05:47:50 +00:00
Imbris	831d7c77a6	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
Imbris	5ed77b5054	Fix security	2020-04-01 20:03:15 -04:00
timokoesters	6fd3339b75	Make apples great again	2020-03-27 17:51:35 +01:00
Marcel Märtens	8f5e409ac4	update toolchain to	2020-02-09 22:58:01 +01:00
Monty Marz	93d7c67cdc	Hack to allow minimap rotation. ... Currently it just always rotates towards the camera, but it wouldn't be hard to create a config option that swaps out the rotation of the indicator and the map.	2020-02-06 17:34:32 +00:00
Marcel Märtens	dae31ae5b6	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00
Marcel Märtens	dd21235ff8	Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable, ... especially enumerations and other source code in errosions file	2020-02-01 21:37:36 +01:00
Joshua Yanovski	6d5e42f10b	Better is_underwater() check. ... Takes rivers into account somewhat, and doesn't take up extra space in SimChunk.	2020-01-26 16:18:51 +01:00
Joshua Barretto	4f0d27690c	Patched waypoint spawning	2020-01-26 14:27:11 +00:00
Joshua Barretto	6e2784ba0e	Convert to chunk positions for downhill	2020-01-26 13:21:33 +00:00
Joshua Barretto	a4573f6fb2	Use .downhill for waypoint generation	2020-01-26 13:05:28 +00:00
Joshua Barretto	631124f3fc	Switched to _squared(), added comments, parallelised waypoint gen	2020-01-26 12:52:32 +00:00
Joshua Barretto	723b578378	Improved pet aggression system, made waypoints rarer	2020-01-26 12:52:32 +00:00
Joshua Barretto	7437c18b99	Various bug fixes	2020-01-26 12:52:32 +00:00
Joshua Barretto	8c7e96e313	Improved waypoint spawn locations, scaled down pathfinding cost	2020-01-26 12:52:32 +00:00
Joshua Barretto	d04a595b3f	Made waypoints work, added waypoint spawning	2020-01-26 12:52:28 +00:00
Joshua Barretto	11193a692a	Better neutral AI, initial waypoint objects	2020-01-26 12:52:28 +00:00
Joshua Barretto	2d9aa21eef	Added test world, friendly NPC pathfinding	2020-01-26 12:52:07 +00:00
Justin Shipsey	64690279af	new mobs ... alligators	2020-01-26 00:22:48 +00:00
Monty Marz	b583f60326	35 new ground sprites, UI fixes	2020-01-25 11:14:02 +00:00
Joshua Yanovski	02f9c9490b	Addressing MR comments.	2020-01-24 03:45:29 +01:00
Joshua Yanovski	2908843448	Erosion cleanup, part 3. ... Covers world/src/sim/erosion.rs.	2020-01-23 18:18:18 +01:00
Joshua Yanovski	64d19a80e3	Make changing Alt/Compute to f32 work again.	2020-01-23 18:18:18 +01:00
Joshua Yanovski	756cc0aab4	Erosion cleanup, part 2. ... Covers all remaining files touched by MR except world/src/sim/erosion.rs.	2020-01-23 18:18:17 +01:00
Joshua Yanovski	3383e991e7	Erosion cleanup, part 1. ... Covers all files touched by MR that are not in world/src/sim.	2020-01-23 18:18:17 +01:00
Joshua Yanovski	55a96bce09	Minor fix to map generation. ... Also fixes some typos and makes formatting easier for changes needed to produce large maps.	2020-01-23 18:18:17 +01:00
Joshua Yanovski	49e7e55cd6	Fix warnings in examples and benchmarks.	2020-01-23 18:18:16 +01:00
Joshua Yanovski	1d6d0ea03d	Fix all warnings.	2020-01-23 18:18:16 +01:00
Joshua Yanovski	ccd85e8907	Fixes to enable loading (relatively) large maps. ... With these changes, we can successfully open, map, and play maps thare are 16x the size of a standard (1024 x 1024 chunk) map, 4x larger in each direction.	2020-01-23 18:18:16 +01:00