Commit Graph

1499 Commits

Author SHA1 Message Date
Isse
14aad5fde7 Merge branch 'campfires_for_clifftown_and_desertcity' into 'master'
add campfires to clifftown and desertcity

See merge request veloren/veloren!3538
2022-08-14 20:22:31 +00:00
flo
4c49cb933e add campfires to clifftown and desertcity 2022-08-14 20:22:30 +00:00
DaforLynx
daadf3abdb Gnarling Fort music; more specific sites; fix music spacing; new sfx 2022-08-14 01:57:58 +00:00
flo
4ccec12dc7 DesertCity small fix 2022-08-12 11:34:40 +00:00
IsseW
0cd4d71d00 Add town music to cliff towns and desert cities 2022-08-10 11:03:22 +02:00
flo
5dd9991311 DesertCity 2022-08-08 09:58:18 +00:00
Marcel
ed4d70ac5b Merge branch 'juliancoffee/add_cache_load_map' into 'master'
Add FileOpts::CacheLoad and a bit of refactoring

See merge request veloren/veloren!3472
2022-07-17 19:28:35 +00:00
Forest Anderson
67534488b3 Merge branch 'tygyh/CleanUp' into 'master'
Tygyh/clean up

See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
juliancoffee
fac67a40a1 Make worldgen panic if loaded map has invalid size 2022-07-17 14:49:42 +03:00
juliancoffee
9d67d80a63 Only ovewrite LoadOrGenerate map if it's fresh map 2022-07-17 14:38:29 +03:00
juliancoffee
5079c0007f Remove prefix map_ for LoadOrGenerate maps 2022-07-17 14:38:29 +03:00
juliancoffee
d2962d544b Add overwrite option to LoadOrGenerate 2022-07-17 14:38:29 +03:00
juliancoffee
60a9cce57f Change map_path to inslude map directory 2022-07-17 14:38:29 +03:00
juliancoffee
a437d31205 Checking options from loaded map instead of hash 2022-07-17 14:38:29 +03:00
juliancoffee
6d9c7a5645 Adressing review 2022-07-17 14:38:29 +03:00
juliancoffee
6faba8a1e9 Use hashable wrapper around gen opts 2022-07-17 14:38:29 +03:00
juliancoffee
ddf2c43c18 Make hacky hash for gen opts 2022-07-17 14:38:29 +03:00
juliancoffee
1a21dfbc5b Add FileOpts::CacheLoad
Add map setting that allows both generating (if not exists) and loading map
2022-07-17 14:38:29 +03:00
juliancoffee
85cee14643 Refactoring, extract FileOpts dependent methods 2022-07-17 14:38:29 +03:00
Joshua Yanovski
ef4b190ad9 Temporarily remove waypoints in caves as people are getting stuck. 2022-07-16 23:08:05 -07:00
Joshua Barretto
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00
tygyh
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
Joshua Barretto
26202c294f Better biome distribution 2022-07-15 17:53:24 +01:00
tygyh
abdd5e3906 Lift return out of if-statements 2022-07-15 16:36:11 +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
997a572647 Simplify assertions 2022-07-15 15:52:52 +02:00
Joshua Barretto
5b8bdb9c9c Cave entity spawns 2022-07-15 14:15:42 +01:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Joshua Barretto
4ca1c9ddf4 Gems and ores 2022-07-15 08:43:35 +01:00
Joshua Barretto
1a3b1e48da Better cave shape variety 2022-07-15 08:43:35 +01:00
Joshua Barretto
f4e50d18df Better ice 2022-07-15 08:43:35 +01:00
Joshua Barretto
a9c9a9d0d2 Ice caves 2022-07-15 08:43:35 +01:00
Joshua Barretto
e97d58011e Made trees and cave entrances play better 2022-07-15 08:43:35 +01:00
Joshua Barretto
629c4dbdb7 Prevented cave/water intersection 2022-07-15 08:43:35 +01:00
Joshua Barretto
f3cfff424d Distinct mushroom and leafy biomes 2022-07-15 08:43:34 +01:00
Joshua Barretto
7353c6f02b Better mushroom placement 2022-07-15 08:43:34 +01:00
Joshua Barretto
a39901d24c Better cave entrance locations 2022-07-15 08:43:34 +01:00
Joshua Barretto
9ad32b37e7 More efficient texture fetches 2022-07-15 08:43:34 +01:00
Joshua Barretto
07fc53f9bc No walls outside caves 2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917 Fixed lava 2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0 Better lighting and verticality in caves 2022-07-15 08:43:33 +01:00
Joshua Barretto
7463acc641 Moonbells in caves 2022-07-15 08:42:56 +01:00
Joshua Barretto
af10a3e6da No biomes near cave entrance 2022-07-15 08:42:56 +01:00
Joshua Barretto
b40095d867 Better mushroom cave biome 2022-07-15 08:42:56 +01:00
Joshua Barretto
1f979e4133 More biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
418839ee20 Biome improvements 2022-07-15 08:42:56 +01:00
Joshua Barretto
c6564e2c59 Better cave biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36 Began work on caves2 2022-07-15 08:42:56 +01:00