362 Commits

Author	SHA1	Message	Date
Sam	7d42c45fdd	Site2 code is now hot-reloadable with 'hot-site2' feature.	2023-01-09 20:06:35 -05:00
Isse	02eadc3002	add doc comment	2022-11-30 15:13:52 +01:00
Isse	560d5c3153	fix doc test	2022-11-30 15:13:52 +01:00
Isse	c81fbf50c4	Fix cylinder primitive and better ramp function	2022-11-30 15:13:52 +01:00
Isse	dda54bcb01	small fixes	2022-11-30 15:13:52 +01:00
IsseW	17cd863605	tuning	2022-11-30 15:13:52 +01:00
IsseW	179c6dab8f	better flat	2022-11-30 15:13:52 +01:00
IsseW	6d2b39c254	simple hang bridge	2022-11-30 15:13:52 +01:00
IsseW	df8db713ea	lights	2022-11-30 15:13:52 +01:00
IsseW	91ed3c6a84	draw on map	2022-11-30 15:13:52 +01:00
IsseW	31b56b03b5	desert skin	2022-11-30 15:13:52 +01:00
IsseW	78e227d317	short bridges	2022-11-30 15:13:52 +01:00
IsseW	3bb66cf2ff	add hipped roof	2022-11-30 15:13:52 +01:00
IsseW	7296843923	simple bridges	2022-11-30 15:13:52 +01:00
Marcel Märtens	2812729b78	cargo clippy lifetimes	2022-11-28 15:19:57 +01:00
Marcel Märtens	dad73ba2a3	fix clamp clippy errors	2022-11-28 14:26:27 +01:00
Marcel Märtens	0ab7a2543e	fix clippy errors	2022-11-28 14:08:11 +01:00
flo	6d8f2c8c7b	add merchants to savannah pits	2022-11-13 19:14:26 +00:00
Avi Weinstock	2242f7245d	Avoid placing site2 houses on paths (this affects worldgen even with train tracks disabled, since the paths are already there).	2022-10-31 14:55:13 -04:00
flo	698a00bae3	savannah_pit	2022-10-22 19:48:50 +00:00
IsseW	c8a08b4794	fix warnings	2022-10-09 23:42:38 +02:00
Joshua Barretto	0b5d043d8e	Began work on citadel	2022-10-09 23:23:39 +02:00
Marcel Märtens	cf6a764aa4	update toolchain to 2022-09-23	2022-09-25 15:58:32 +02:00
flo	a37e1f8d99	seachapel npc work	2022-09-22 01:04:01 +00:00
Joshua Yanovski	986d104faa	Update Rust toolchain.	2022-09-08 15:43:53 -07:00
flo666	87bac7c24a	- remove barriers in chapel tube & tower tube ... - change pitfall entry	2022-08-26 17:40:46 +02:00
flo	e882e62c08	seachapel	2022-08-24 21:50:53 +00:00
flo	4c49cb933e	add campfires to clifftown and desertcity	2022-08-14 20:22:30 +00:00
flo	4ccec12dc7	DesertCity small fix	2022-08-12 11:34:40 +00:00
flo	5dd9991311	DesertCity	2022-08-08 09:58:18 +00:00
tygyh	120ee6b6c0	Fix typos	2022-07-15 18:59:37 +02:00
tygyh	fb7bdd8bf8	Fix deprecated imports	2022-07-15 16:17:19 +02:00
tygyh	cbe4d9d807	Remove unused imports	2022-07-15 16:00:27 +02:00
tygyh	5e5698249b	Remove unnecessarily qualified paths	2022-07-15 14:49:46 +02:00
Marcel Märtens	697673bcca	update toolchain to nightly-2022-04-25	2022-05-03 15:22:28 +02:00
Isse	3027597352	Site2 giant tree entity spawning	2022-04-27 10:53:08 +00:00
flo	262a730cc6	clifftown sprite fix	2022-04-15 20:01:59 +00:00
flo	3d24b1d635	CliffTowns	2022-03-29 12:52:08 +00:00
James Melkonian	5b801dc44d	Adjust harvester boss arena offset	2022-03-27 20:41:03 -07:00
Samuel Keiffer	3964ac466a	Merge branch 'ubruntu/house-decorations' into 'master' ... Site2 house decorations See merge request veloren/veloren!3273	2022-03-24 15:13:56 +00:00
ubruntu	c71354e192	Site2 house decorations	2022-03-24 15:13:56 +00:00
InfRandomness	8359d5754a	Add new primitive to draw giant trees	2022-03-24 15:13:53 +00:00
Isidor Nielsen	7621a21560	Primitive fixes	2022-03-13 03:34:49 +00:00
Isidor Nielsen	e21f04d456	Add entity spawn on painter	2022-03-09 21:40:23 +00:00
Isidor Nielsen	f8916f878a	Primitive group transformation and RotateAround primitive	2022-03-01 23:38:05 +00:00
infrandomness	1d44247efe	Enable return_self_not_must_use lint	2022-03-01 10:53:57 +01:00
IsseW	e9e4be6e7e	break when there are no stations	2022-02-20 22:11:09 +01:00
IsseW	258b3c7535	Workshop fixes	2022-02-20 22:08:13 +01:00
Joshua Barretto	00b003a23c	Enabled site2 towns by default	2022-02-15 19:01:43 +00:00
Samuel Keiffer	6c7c0eefae	Merge branch 'gnarlings' into 'master' ... Gnarlings See merge request veloren/veloren!3194	2022-02-15 00:22:37 +00:00
Avi Weinstock	70b7e1ef92	Automatically fill top-level unions as separate fills.	2022-02-14 14:28:00 -05:00
Sam	2bcf9b9a26	Removed unions in gnarling site to make chunkgen more performant	2022-02-14 12:40:06 -05:00
Joshua Barretto	6e46b4ddef	Fixed CI	2022-02-14 11:46:42 -05:00
Avi Weinstock	aab552afc5	Iterate over partially-disjoint unions of primitive bounds, improving CSG rasterization performance in the presence of sparse/disjoint unions.	2022-02-13 23:48:12 -05:00
Sam	6dafacaa24	Addressed review comments	2022-02-13 21:49:46 -05:00
Avi Weinstock	4f962df7c8	Automatically use right-recursion instead of left-recursion for union/intersection of CSG primitives via measuring the depth of the trees when unioning/intersecting them.	2022-02-13 15:44:51 -05:00
Sam	2e6610314c	Balance tweaks	2022-02-13 00:39:46 -05:00
Sam	c77270b799	Addressed feedback	2022-02-12 20:52:01 -05:00
Sam	49e8803ee0	Fixed tests	2022-02-12 17:22:08 -05:00
James Melkonian	8da1ae578f	Simplify tunnel entity spawning	2022-02-12 14:21:22 -08:00
James Melkonian	8a02a943f4	Document tunnel generation	2022-02-12 13:57:44 -08:00
InfRandomness	090ac9030c	Change Path colors	2022-02-11 17:05:10 +00:00
jshipsey	2eee43865f	chieftain anims	2022-02-11 02:18:48 -05:00
Sam	4991f7ecea	Gnarlign site tweaks and chieftain buff	2022-02-11 01:23:09 -05:00
James Melkonian	95ea7a47e0	Gnarling cavern entrance stump	2022-02-10 19:35:30 -08:00
Sam	cab87658a3	Placement tweaks	2022-02-10 14:58:39 -05:00
James Melkonian	07d19bf03c	Gnarling cavern tweaks	2022-02-10 14:58:38 -05:00
Sam	86a00e75bb	Tweaked fire particles	2022-02-10 14:58:37 -05:00
Sam	bf7e84c6ae	Initial particle work	2022-02-10 14:58:37 -05:00
jshipsey	5eea73f793	root walls, minor tweaks	2022-02-10 14:58:36 -05:00
Sam	0031aa6f5f	Chieftain AI and attacks	2022-02-10 14:58:35 -05:00
jshipsey	3a35dcc77f	brick texture colors	2022-02-10 14:58:34 -05:00
jshipsey	0c788997a4	anims	2022-02-10 14:58:34 -05:00
James Melkonian	14080da693	Fix rebase	2022-02-10 14:58:33 -05:00
Sam	f1801560fa	Deadwood ai	2022-02-10 14:58:31 -05:00
jshipsey	cb48dd0a75	adjust chieftain hut, start alter	2022-02-10 14:58:30 -05:00
Sam	c15fb2b68f	Better mugger AI	2022-02-10 14:58:28 -05:00
jshipsey	e93e7fd21c	random hut variation and banner tatter	2022-02-10 14:58:26 -05:00
James Melkonian	d0477c259e	Color caverns and provide some foliage	2022-02-10 14:58:25 -05:00
jshipsey	3a02d11bab	banners, reworked huts/watchtowers/fencetowers	2022-02-10 14:58:25 -05:00
James Melkonian	3a8a0d9c53	Cavern systems under gnarling fortifications	2022-02-10 14:58:24 -05:00
jshipsey	c1df0ddbf3	some aesthetic work	2022-02-10 14:58:23 -05:00
Sam	6c6caa7535	Enemy spawns in gnarling fortification.	2022-02-10 14:58:22 -05:00
Sam	2dfeadcbc4	Basic enemy spawning.	2022-02-10 14:58:22 -05:00
Sam	59551efb06	Fixed bug that would cause gate to be next to chieftain hut.	2022-02-10 14:58:21 -05:00
Sam	9dcfb43fe6	Watchtowers near gate entrance.	2022-02-10 14:58:20 -05:00
Sam	09ce889bfc	Chieftain hut	2022-02-10 14:58:20 -05:00
Sam	18cb0c7e41	Wall segments and towers for chieftain area.	2022-02-10 14:58:19 -05:00
Sam	466a02e1cf	Re-organzied code relating to tower and wall generation.	2022-02-10 14:58:18 -05:00
Sam	643713d8b1	Huts now have doors. Added totems.	2022-02-10 14:58:18 -05:00
Sam	dd289ea5da	Initial huts	2022-02-10 14:58:17 -05:00
Sam	920fa11ddf	Section of wall opened.	2022-02-10 14:58:16 -05:00
Sam	cf73da2955	Gnarling watch towers.	2022-02-10 14:58:15 -05:00
Sam	90cedfc95d	Gnarlings can now make walls.	2022-02-10 14:58:15 -05:00
Sam	b28f6276dd	Gnarling dungeons now only generate near forests.	2022-02-10 14:58:09 -05:00
Joshua Barretto	31192c80bc	Merge branch 'biome_name_update_and_site&theme_based_naming' into 'master' ... biome_name_update_and_site&theme_based_naming See merge request veloren/veloren!3187	2022-02-10 09:35:47 +00:00
jshipsey	786ae39fb4	new entities	2022-02-09 20:10:59 -05:00
floppy	80490580a4	fix plazas in site2 towns spawning on top of each other	2022-02-09 23:44:27 +01:00
floppy	422be1b451	- add generate_gnarling and generate_town in namegen.rs ... - enable generate_town for site2 towns in site2/mod.rs	2022-02-05 13:32:45 +01:00
Joshua Barretto	ac13d07443	Merge branch 'crafting_stations_in_site2_towns' into 'master' ... add crafting stations to workshop in site2 towns See merge request veloren/veloren!3174	2022-02-03 17:16:30 +00:00
floppy	74bf89077f	use const CARDINALS to generate spawn positions for crafting_stations.	2022-02-03 17:40:26 +01:00
floppy	595e6ee076	- randomize distribution of crafting_stations to static positions	2022-02-02 22:15:04 +01:00
InfRandomness	54b69e37a5	Implement giant trees in site2	2022-02-02 02:33:37 +00:00
floppy	ddc35d8b7d	- add crafting stations to workshop in site2 towns ... - TODO: connect Painter rng when implemented	2022-02-01 23:53:18 +01:00
James Melkonian	2aab277d0b	Add doc comments to PrimitiveRef methods	2022-01-31 18:39:03 -08:00
James Melkonian	b445bd494e	Bezier curve prisms	2022-01-31 16:13:45 -08:00
James Melkonian	04bdcf2924	Add cubic bezier curve function	2022-01-31 16:13:45 -08:00
James Melkonian	b41f86ab99	More CSG primitives	2022-01-31 16:13:45 -08:00
Justin Shipsey	612f084831	Merge branch 'slipped/bipeds' into 'master' ... Slipped/bipeds See merge request veloren/veloren!3163	2022-01-31 17:08:01 +00:00
Joshua Barretto	1b9488186e	Merge branch 'treeco/realign-workshop' into 'master' ... Realign workshops See merge request veloren/veloren!3168	2022-01-30 23:27:50 +00:00
Treeco	ba7251c7e3	Realign workshops	2022-01-30 22:45:56 +00:00
Avi Weinstock	5f8957d8ef	Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.	2022-01-30 20:16:20 +01:00
jshipsey	7827797106	weapon tweaks	2022-01-30 01:10:13 -05:00
Samuel Keiffer	fe532cf536	Merge branch 'isse/repeat-primitive' into 'master' ... Repeat CSG primitive and float line segment See merge request veloren/veloren!3158	2022-01-28 20:04:45 +00:00
Isidor Nielsen	6f99e70cca	Repeat CSG primitive and float line segment	2022-01-28 20:04:45 +00:00
Joshua Barretto	d8c4284a32	Merge branch 'zesterer/worldgen' into 'master' ... Improvements to site2 See merge request veloren/veloren!3159	2022-01-28 17:14:07 +00:00
Joshua Barretto	15c5f2f969	Better paths in snow	2022-01-28 16:45:58 +00:00
Joshua Barretto	5b3d826396	Better hazard checks	2022-01-28 15:17:56 +00:00
Joshua Barretto	69436db64c	Added wall lamps	2022-01-28 13:58:41 +00:00
Joshua Barretto	e991ff7d6d	More precise path placement	2022-01-28 11:56:07 +00:00
jshipsey	4fbd3027a1	new mobs	2022-01-28 02:50:15 -05:00
juliancoffee	6ae25d5956	Require rng from EntityInfo::with_asset_expect	2022-01-28 00:02:34 +02:00
Joshua Barretto	e329100455	Prevent workshops destroying their neighbours	2022-01-27 19:37:24 +00:00
Joshua Barretto	692855198e	Improved terrain in sites	2022-01-27 11:48:41 +00:00
InfRandomness	52c92ba0d4	Give names to site2 sites	2022-01-26 11:42:35 +00:00
Sam	9b6c76bd3b	Removed health scaling that bypasses the skill system.	2022-01-15 11:58:28 -05:00
Isidor Nielsen	5642680687	Site2 util	2022-01-15 13:06:18 +00:00
jshipsey	7f928d0bc0	woodengolem, chieftain, icedrake, blowgun	2022-01-13 23:20:52 -05:00
Imbris	bf48bd5346	update toolchain to nightly-2021-12-19	2021-12-23 13:04:24 +01:00
Joshua Barretto	78f76dde83	Added baubles to trees	2021-12-20 18:03:52 +00:00
Jonathan Berglin	d9dd49552b	Tygyh/resolve all '# allow(clippy needless update)]' error supressions	2021-11-29 09:32:55 +00:00
Treeco	3a998ca5b9	Merge branch 'isse/primitive-fixes' into 'master' ... Primitive fixes See merge request veloren/veloren!3016	2021-11-27 19:02:12 +00:00
Marcel Märtens	ef40ebe0c8	update toolchain to nightly-2021-11-24	2021-11-24 10:09:22 +01:00
IsseW	7eaddcafad	Ok just call it without	2021-11-20 13:13:21 +01:00
IsseW	88840fe58d	Change "and_not" and "diff" to "subtract"	2021-11-19 23:38:33 +01:00
IsseW	4b6f3ddeea	Intersect instad of union in pyramid	2021-11-17 14:32:07 +01:00
IsseW	07da6a9271	Rename 'and' to 'intersect' and 'or' to 'union'	2021-11-17 14:11:20 +01:00
Joshua Barretto	de087ae992	Added site2 worldgen feature	2021-11-01 22:53:38 +00:00
Joshua Barretto	16889b2b3e	Fixed house supports	2021-11-01 22:19:49 +00:00
Joshua Barretto	4acffb9cfb	New CSG API for site2	2021-11-01 22:19:49 +00:00
Joshua Barretto	e3ab8fc8ce	Added rtsim merchants to site2	2021-11-01 22:19:49 +00:00
Joshua Barretto	bacb2aa504	Better town layout	2021-11-01 22:19:49 +00:00
Joshua Barretto	4a9581b54d	Fixed house entrances	2021-11-01 22:19:49 +00:00
Joshua Barretto	8e2ca9cdec	Added rtsim villagers to site2 towns	2021-11-01 22:19:49 +00:00
James Melkonian	485b057d60	Prettier town houses	2021-09-17 15:49:14 -07:00
James Melkonian	42fdf0818d	Gable primitive and dungeon lava rooms	2021-09-17 15:45:26 -07:00
juliancoffee	f810af4eec	Rename EntityInfo level field to health_scaling	2021-09-17 20:12:42 +03:00
Snowram	ee37c8d62d	Adds new dungeon entrances	2021-09-04 14:55:55 +02:00
juliancoffee	38493b615b	Rebalance chest density in dungeons ... - Make it depend on relative floor and not absolute floor to keep it the same through different dungeons. - Make it start around the middle of dungeon to avoid chest only runs.	2021-09-03 01:08:15 +03:00
Joshua Barretto	9ac5e555e6	Improved giant trees	2021-08-30 00:03:16 +01:00
juliancoffee	771df2f0f1	Don't chose room kinds with dynamic_rng	2021-08-09 18:19:35 +03:00
juliancoffee	fadf53a6ba	Nerf pillars ... * make platforms one block high	2021-08-05 21:07:45 +03:00
Avi Weinstock	60a5373b04	Avoid duplicate work across chunks when blitting site2 primitives.	2021-07-27 19:12:51 -04:00
Avi Weinstock	516ad1c772	Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" ... This reverts commit 63eff216f0.	2021-07-25 12:28:25 -04:00
Jonathan Berglin	cd2992afd3	Tygyh/resolve clippy error supressions	2021-07-25 15:35:14 +00:00
Jonathan Berglin	b15f426ee5	Resolve all approved error supressions	2021-07-18 17:11:46 +00:00
Samuel Keiffer	37147e2a83	Merge branch 'juliancoffee/overworld_assetization' into 'master' ... Wildlife assetization See merge request veloren/veloren!2591	2021-07-18 13:43:32 +00:00
Imbris	9c72333741	Revert "Merge branch..." ... This reverts merge request !2608	2021-07-17 22:04:59 +00:00
juliancoffee	d920f911a2	Add Exact body field for EntityConfig ... Add Alignment field to EntityConfig + Migrate to specifying alignment and body in entity assets + Make Body required field (with Uninit if you want to specify it later)	2021-07-17 15:37:30 +03:00
Jonathan Berglin	c1c331d59e	Resolve all '#[allow(clippy::approx_constant)]' error supressions	2021-07-15 16:56:55 +00:00
Dr. Dystopia	5cc2fc8182	Resolve all '#[allow(clippy::or_fun_call))]' error supressions	2021-07-15 13:49:59 +02:00
Marcel Märtens	9b3b21f368	fix clippy warnings	2021-07-12 12:09:09 +02:00
Snowram	5dfef5a563	Spawn dungeon entrances depending on the Site origin biome	2021-07-07 00:35:50 +02:00
juliancoffee	2c714dadad	(fix) spawn HaniwaSentry in T3	2021-07-05 18:49:25 +03:00
juliancoffee	f2f50c88dc	Split room enemy generation to separate functions	2021-06-30 03:52:51 +03:00
juliancoffee	7ff62275bf	Add RoomKind enum, address comments ... - enum RoomKind {Peaceful, Fight, Boss, Miniboss} to specify type of generated room.	2021-06-30 03:52:51 +03:00
juliancoffee	63a9ceda29	More deterministic dungeon fights ... - Spawn fixed number of enemies (2-4) in a room with any size. 1-3 enemies for T5 dungeon.	2021-06-30 03:52:50 +03:00
Avi Weinstock	957ba5d218	Use new dungeons in dungeon_voxel_export, remove old dungeon sampling function, and add more of world/examples to CI.	2021-06-27 15:35:43 -04:00
Joshua Barretto	768e1c0d31	Merge branch 'aweinstock/site2dungeon' into 'master' ... Convert dungeons to site2. See merge request veloren/veloren!2499	2021-06-25 23:06:24 +00:00
Avi Weinstock	0ac6305dfc	Rename difficulty to dungeon_difficulty.	2021-06-25 18:18:27 -04:00
Avi Weinstock	524dd02f45	Tweaks to dungeon pillars.	2021-06-25 15:54:42 -04:00
Avi Weinstock	7328b71243	Add comments to dungeon code. Fix the radius calculation (which lead to dungeons getting truncated), and fix sprites spawning above staircases.	2021-06-25 14:08:23 -04:00
Avi Weinstock	19979413d5	Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings.	2021-06-24 23:03:24 -04:00
Avi Weinstock	033dbbf02a	Add pillars and wall sconces to site2 dungeons.	2021-06-23 23:22:14 -04:00
Avi Weinstock	c68d79315e	Add wall contours and sprites to site2 dungeon. Also add septagon decal in boss rooms.	2021-06-23 23:22:14 -04:00
Avi Weinstock	c8383aba38	Traverse the dungeon tile structure to create the rooms, and align the stairs.	2021-06-23 23:22:14 -04:00
Avi Weinstock	c6bb61f2e6	Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.	2021-06-23 23:22:14 -04:00
Avi Weinstock	95214649db	Get structures loading via sampling primitive.	2021-06-23 23:22:14 -04:00
Avi Weinstock	df4f536523	Progress on converting dungeons to site2. Adds Sampling and Translate primitives.	2021-06-23 23:22:14 -04:00
Synis	d7aea52a8f	Rotation uses matrix and some fixes for plane primitive	2021-03-24 18:21:01 +01:00
Synis	35ef2082e2	Rotation primitive and some minor fixes	2021-03-24 18:21:01 +01:00
Synis	187d7d4fe7	Added a bunch of primitives	2021-03-24 18:21:01 +01:00
Marcel Märtens	6b23101fac	update toolchain to nightly-2021-03-22	2021-03-22 16:41:04 +01:00
Synis	9f9ed4b211	Addressed comments	2021-03-11 23:51:57 +01:00
Synis	631a591a68	Castle generation	2021-03-11 22:17:31 +01:00
Joshua Barretto	911acdd9db	Fixed clippy warnings and fmt	2021-03-07 14:25:07 +00:00
Synis	c35780d05b	More work on castles	2021-03-07 14:25:07 +00:00
Synis	f7f7f12a38	Basic Castle Wall	2021-03-07 14:25:07 +00:00
Joshua Barretto	0ede7d3899	Brick fill	2021-03-07 14:25:04 +00:00
Joshua Barretto	173a127d5e	Better Fill type	2021-03-07 14:25:03 +00:00
Joshua Barretto	97141d12a6	Better paths	2021-03-07 14:25:03 +00:00
Joshua Barretto	e65e3b52f4	Fewer fields	2021-03-07 14:25:03 +00:00
Joshua Barretto	a568669526	Fixed plazas, buggy willow trees	2021-03-07 14:25:03 +00:00
Joshua Barretto	862cd5fe49	fmt	2021-03-07 14:25:03 +00:00
Joshua Barretto	02d86f0fb0	Switched to 6x6 tiles, more natural paths	2021-03-07 14:25:02 +00:00
Joshua Barretto	1d16f14dd5	Small fixes	2021-03-07 14:25:02 +00:00
Joshua Barretto	f537f82b17	Updated vek, fixed house wall bugs	2021-03-07 14:25:02 +00:00
Joshua Barretto	fe8ffc8f87	Fixed more silly issues	2021-03-07 14:25:02 +00:00
Joshua Barretto	6e6e322e90	Fixed stupid generation bugs, made houses more interesting	2021-03-07 14:25:02 +00:00
Joshua Barretto	293d1f2d5e	More plot generation work	2021-03-07 14:25:02 +00:00