Marcel Märtens
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1
update toolchain to 2022-09-08
...
This reverts commit 6c9deee491a32b269252
2022-09-24 00:04:40 +02:00
Marcel
3490600ca0
Merge branch 'xMAC94x/update-deps2' into 'master'
...
update_deps_2 - now with more expirmental stuff
See merge request veloren/veloren!3634
2022-09-23 21:44:50 +00:00
flo
cfbadd36ea
fix_desert_rock_animals
2022-09-22 18:42:34 +00:00
Marcel Märtens
29d0f5b25d
update dependencies
2022-09-22 11:57:55 +02:00
flo
a37e1f8d99
seachapel npc work
2022-09-22 01:04:01 +00:00
Joshua Yanovski
e9a463d459
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
...
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
cafdcad8ce
Merge branch 'sharp/improve-msg' into 'master'
...
Improve some server system performance
See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56
Reduce overhead of messaging systems.
2022-09-14 21:04:53 -07:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Marcel Märtens
a32b269252
steal sharps clippy improvements to the old nightly
2022-09-11 16:10:56 +02:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688
update dependencies
2022-09-08 23:29:08 +02:00
kitswas
c6efafd214
Flax spawn fix
...
Flax now does not grow in the flood plains and extreme altitudes.
Lowered the humidity requirement.
Made Flax density vary by altitude.
Flax temperature changed.
2022-08-31 11:30:37 +05:30
kitswas
1064055bb2
Cotton spawn fix
...
Cotton now grows in low altitudes only. (mostly near rivers and lakes)
Density increased to compensate for the reduction in growable area.
Cotton Soil and Temperature changed.
Made patch density vary by altitude.
2022-08-31 11:30:37 +05:30
kitswas
c0911707e5
Added helper function density_factor_by_altitude
2022-08-31 11:30:37 +05:30
Christof Petig
863f9857b5
cargo fmt
2022-08-30 00:37:38 +02:00
Christof Petig
04b7090197
handle terrain more correctly
2022-08-30 00:37:38 +02:00
Christof Petig
fbe0aee40d
move trading good properties (decay, transportation) from hard coded to ron file
2022-08-30 00:37:38 +02:00
Joshua Yanovski
1dc6757668
Fix double unmaps.
2022-08-28 19:14:01 -07:00
flo666
87bac7c24a
- remove barriers in chapel tube & tower tube
...
- change pitfall entry
2022-08-26 17:40:46 +02:00
Joshua Yanovski
ae77c1814c
Improve figure meshing.
2022-08-25 23:25:21 -07:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
Joshua Yanovski
9863670169
Stdlib RwLock in wgpu, update rust-toolchain to some extent.
2022-08-18 18:49:44 -07:00
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
Joshua Yanovski
706084dd15
Improving meshing performance.
2022-08-13 23:48:50 -07: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
Joshua Barretto
9bb3681f55
Better SmallCache
2022-08-06 18:19:43 +01:00
Joshua Barretto
bdb71a15df
Improved cave performance, fixed FastNoise2d
2022-08-06 18:02:57 +01:00
Joshua Barretto
86f628037f
Made caves generate 425x faster
2022-08-06 14:46:33 +01:00
Joshua Yanovski
2a61c7790b
Substantial improvements to meshing time.
...
This mostly come out of optimizing BlocksOfInterest to (empirically)
minimize redundant computations, use a more efficient RNG, use a faster
verion of iter_changed, and optimize water block handling (theoretically
the iter_changed difference might mean we missed some water blocks, but
in practice it's unlikely to matter for fast-moving rivers).
Also did some microoptimizations of meshing etc. that seem to result in
pretty good improvements in practice, and also added another set of
optimizations to improve tree performance (special casing "easy" segment
approaches, which got a few percent, and inlining block_from_structure
for tree leaves and branches, which got us considerably more; I think
the total improvement is around 5%).
2022-07-31 01:28:37 -07:00
Joshua Yanovski
901aa8e1b4
Another 5% boost to tree chunk performance
...
(and over 25% improvement to giant tree throughput--they are under 1
ms/chunk now!)
2022-07-28 12:12:15 -07:00
Joshua Yanovski
233e12d279
Boost tree performance by ~70%.
...
Turns out inlining matters!
2022-07-27 21:47:47 -07:00
Joshua Yanovski
9ebf07c6e1
Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen
2022-07-27 15:30:37 -07:00
Joshua Yanovski
bc4600cf14
Rivers (hack, not great).
2022-07-25 18:28:27 -07:00
Joshua Yanovski
0b91f5ba90
Fix paths (sorta) and rock moss.
2022-07-18 09:19:20 -07:00
Joshua Yanovski
a3491d5073
Faster falloff, some performance optimizations.
2022-07-17 23:43:40 -07:00
Joshua Yanovski
fcb192d849
Fast density approximation.
2022-07-17 22:23:44 -07:00
Joshua Yanovski
7e9291fb4d
Larger areas and wavelengths.
2022-07-17 20:31:55 -07:00
Joshua Yanovski
09a5e49c25
Scatter testing (not complete)
2022-07-17 20:11:36 -07: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
Joshua Yanovski
35deaae540
Fix various builds.
2022-07-14 22:25:00 -07:00
Christof Petig
7a1218cf2f
make a recipe of all modular weapons
2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403
use ItemDefintionId across trade_pricing
2022-07-13 20:15:27 +02:00
Joshua Yanovski
ebe76abc54
Shrubs back!
2022-07-10 22:58:28 -07:00
Joshua Yanovski
8db5acd987
Rocks!
2022-07-10 21:08:18 -07:00
Joshua Yanovski
c4f2cae04a
Minor fixes (e.g. snow not filling in sprites).
2022-07-08 19:11:16 -07:00
Joshua Yanovski
3ba53b3e4c
Deserialize chunks off the main thread.
2022-07-07 21:06:56 -07:00
Joshua Yanovski
6eb26ba6d8
Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen
2022-07-07 16:02:18 -07:00
Marcel Märtens
e4909650e1
update hashbrown, specs, and tracy
2022-07-06 15:41:59 +02:00
Joshua Yanovski
32fdcc1c1c
Fix iteration area.
...
I'm pretty sure this bug already existed on master, so if the
performance degradation is unacceptable, we can revert.
2022-07-05 23:00:05 -07:00
Joshua Yanovski
c2410c6303
Iterate over more trees... slower, but maybe more correct.
2022-07-05 21:35:51 -07:00
Joshua Yanovski
4cf42e2563
Not really fixed water.
2022-07-05 19:23:17 -07:00
IsseW
273c5ed2f0
Temporary noise solution
2022-07-04 18:07:00 +02:00
Joshua Yanovski
66569cb085
WIP: snowfall.
2022-07-03 17:09:38 -07:00
Joshua Yanovski
034d4d084a
Temporary bench changes.
2022-07-02 21:23:51 -07:00
Joshua Yanovski
45f5fbe3dd
Remove unused tree code.
2022-07-02 19:45:33 -07:00
Joshua Yanovski
16ffbc92dd
Reenabling prefab structures.
...
This has barely any impact on anything but dungeons. Could probably be
sped up further but not a big deal.
2022-07-02 18:21:15 -07:00
Joshua Yanovski
957467e114
Fix chunk noise.
2022-07-01 23:57:09 -07:00
Joshua Yanovski
0b14ca2f3a
Improved base_z => faster and smaller chunks!
2022-07-01 15:23:27 -07:00
Joshua Yanovski
4819a17ab6
Stop duplicating terrian chunk metadata.
2022-06-30 11:22:14 -07:00
Joshua Yanovski
ad5bcf3cd8
Turning "full" chunks back on, deserialization improvements.
2022-06-29 21:52:04 -07:00
Marcel
fddc97bc77
Merge branch 'tweaks' into 'master'
...
tweaks entity stats
See merge request veloren/veloren!3437
2022-06-29 19:29:38 +00:00
Joshua Yanovski
9c4b03482d
Fixing compression benchmarks.
2022-06-28 21:28:26 -07:00
Joshua Yanovski
50070e738b
Somewhat zoomier serde.
2022-06-28 17:45:32 -07:00
Joshua Yanovski
a3b7127de9
Evven zoomier WorldGen, lots of things broken!
2022-06-28 00:24:46 -07:00
Joshua Yanovski
a973155597
Zoomy worldgen WIP, please do not complain things are broken.
2022-06-24 02:48:09 -07:00
Brandon Dyer
d1c80f0b25
#1455 | Sprites now only spawn on designated block types
2022-06-20 19:24:51 +00:00
runrobdog
25eed55ca9
stat tweaks to theropod, arthropods and basilisk
2022-06-19 01:35:18 +02:00
Samuel Keiffer
179bf7216e
Merge branch 'tormod/remove-size' into 'master'
...
Remove site size from site suitability function.
See merge request veloren/veloren!3427
2022-06-10 18:12:59 +00:00
Christof Petig
1c5cb8abcd
follow the more elegant proposal by clippy
2022-06-07 23:37:51 +02:00
Christof Petig
fca4372205
avoid economy of scale in economy_tree
2022-06-07 21:46:41 +02:00
Christof Petig
5a965d21c7
replace vector copying with an iterator
2022-06-07 21:38:17 +02:00
Christof Petig
db85d2a146
fix clippy
2022-06-07 18:30:05 +02:00
Christof Petig
6d3ea3172c
separate orders by professions and everyone
...
cleanup and fix
strictly this population growth logic is wrong, but identical to the existing one
standardize on production, remove more dead code
fix example + rustfmt
separate csv logic from tick (intention is to move it into economy)
remove the format call from economy (inactive debugging code)
remove more formatting
rustfmt
small clippy fix
Reduce precision on output
move csv code
move rest of sim2 mod into economy (context)
remove more unused parts
keep things a bit more coherent
remove pub
make more functions and fields private
remove outdated input, fix other, print names, move output to proper abstraction
remove dead code
2022-06-07 18:30:05 +02:00
Christof Petig
edffd576d4
only the code move part of shredded_economy4
2022-06-07 18:30:05 +02:00
Tormod G. Hellen
08ffcdf5a5
Create temperature requirement for giant tree.
...
Since the giant tree is currently a leafy tree, it looks a bit out
of place in colder regions where there's otherwise only pine trees.
2022-06-07 00:32:46 +02:00
Tormod G. Hellen
c1335e16fe
Remove site size from site suitability function.
...
This was buggy, in that the requirement was for _any_ chunk
in the site area being suitable as opposed to _all_ chunks
in the site being suitable. This is easy to fix, but we don't
always want to have exactly the same criteria for the center
of a site as for the outskirts of it.
This should fix gnarling forts etc. spawning in the water just
off the shore.
2022-06-07 00:27:37 +02:00
Christof Petig
59d876a654
pass humidity to meta, move smoke cycle to separate file
2022-06-01 22:13:34 +02:00
Christof Petig
3fc59d7e4d
lower trading output to trace (and raise one to warn)
2022-05-29 19:09:52 +02:00
Marcel
47a7943cc2
Merge branch 'upgrade_assets_manager' into 'master'
...
Upgrade `assets_manager` to `0.8.0` and `image` to `0.24`
See merge request veloren/veloren!3410
2022-05-28 22:41:23 +00:00
Makselord
69041137a0
reduced bamboo spawn rates
2022-05-28 18:04:06 -04:00
Makselord
c92cd26ff1
bamboo collectibles spawn near rivers
2022-05-28 17:56:35 -04:00
Benoît du Garreau
f36e74e383
Fix deprecated function use
2022-05-28 23:53:30 +02:00
Benoît du Garreau
8488c7b25e
Upgrade assets_manager to 0.8.0 and image to 0.24
...
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Avi Weinstock
a073307072
Backport site2 rasterization benchmarks from other CSG optimization branches.
2022-05-21 18:16:47 -04:00
Sam
95c3fdffa1
Addressed playtest feedback (no assets).
2022-05-16 15:11:39 -04:00
Sam
816c265662
Rebase stuffs
2022-05-16 15:11:26 -04:00
Joshua Barretto
eec2d67bb7
Merge branch 'zesterer/worldgen' into 'master'
...
Worldgen Improvements
See merge request veloren/veloren!3378
2022-05-15 19:44:12 +00:00
Joshua Barretto
30b041282f
More rocks near rivers
2022-05-15 18:31:24 +01:00
Joshua Barretto
692309029d
Improved badlands
2022-05-15 16:14:03 +01:00
Joshua Barretto
cc295b483a
Better snow cover
2022-05-15 15:34:36 +01:00
Isse
2050bce77d
Water caves
2022-05-15 10:16:53 +00:00
Joshua Barretto
ecf97a53cd
Regular warping
2022-05-15 10:19:57 +01:00
Joshua Barretto
e5c49af547
Faster, prettier, and less troublesome terrain warping
2022-05-14 17:00:03 +01:00
Joshua Barretto
907ba3dcbc
Added giant trees to LoD
2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e
Added LoD houses
2022-05-10 19:19:46 +01:00
Joshua Barretto
f35c98d1a1
Added LoD distance setting
2022-05-10 12:40:06 +01:00
Joshua Barretto
3881d2ea38
Fixed i16 underflow
2022-05-10 12:38:36 +01:00
Joshua Barretto
1db7cc7fde
LoD trees in snow are white
2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1
Different kinds of tree
2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687
Initial implementation of LoD trees
2022-05-10 12:38:36 +01:00
IsseW
9a9302a0b6
Use a seperate rng for peak and biome name gen
2022-05-10 10:24:25 +02:00
