Commit Graph

1533 Commits

Author SHA1 Message Date
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
Imbris
bed8ae68fe Optimize biome naming floodfill by replacing hashmaps 2022-05-10 03:30:09 -04:00
IsseW
9abbb0e928 naming behind feature and fix addition overflow 2022-05-10 08:03:40 +02:00
Joshua Barretto
30e73735de Added SpawnMode to allow for ice and water column spawning of wildlife 2022-05-08 12:37:29 +01:00
Treeco
66fe458623 Improve water.rs usability
Will have an accompanying book update
2022-05-06 13:12:11 +01:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00
Marcel
593d8fa4b5 Merge branch 'xMAC94x/update_vek' into 'master'
switch to upstream vek again

See merge request veloren/veloren!3342
2022-05-02 08:34:21 +00:00
Marcel
e30845c68f Merge branch 'christof/shredded_economy3' into 'master'
Economic debugging and documentation

See merge request veloren/veloren!3309
2022-05-01 18:26:29 +00:00
Marcel Märtens
fa49248c31 switch to upstream vek again 2022-04-28 09:10:55 +02:00
Isse
3027597352 Site2 giant tree entity spawning 2022-04-27 10:53:08 +00:00
Christof Petig
2ddd1cc0a7 execute with local tracing environment
sadly the level passed is ignored, and it warns about an invalid filter directive
but RUST_LOG environment variables work as expected
2022-04-24 17:26:16 +02:00
Christof Petig
ab985b54ab initialize ERROR not INFO 2022-04-24 17:26:16 +02:00
Christof Petig
5f5ebeecfe ignore expensive tests without much added value 2022-04-24 17:26:16 +02:00
Christof Petig
2f7c50281f fix neighbor logic in test, fix clippy, fix rustfmt 2022-04-24 17:26:16 +02:00
Christof Petig
8dfd6dc523 document more elements of economy 2022-04-24 17:26:16 +02:00
Christof Petig
53ace17327 output trade to csv file 2022-04-24 17:26:16 +02:00
Christof Petig
dc4b9dc19e more readable and meaningful csv output 2022-04-24 17:26:16 +02:00
Christof Petig
d897df4b78 output number of trade partners 2022-04-24 17:26:16 +02:00
Christof Petig
eedfce45bc also output normal economic simulation 2022-04-24 17:26:16 +02:00
Christof Petig
8e48d59539 also print situation in other econ test 2022-04-24 17:26:16 +02:00
Christof Petig
b144ed42e3 display trade volume 2022-04-24 17:26:16 +02:00
Christof Petig
57dafea9b4 group the first three settlements together (should enable them to survive by trade) 2022-04-24 17:26:16 +02:00
Christof Petig
6f431a6fff rearrange and connect towns (shows planning weakness) 2022-04-24 17:26:16 +02:00
Christof Petig
faf12118f0 remember which good a profession is missing for productivity 2022-04-24 17:26:16 +02:00
Christof Petig
94bef521ce new test to check different resource situations 2022-04-24 17:26:15 +02:00
Christof Petig
40cf44d7b1 Enforce a minimum price for goods 2022-04-23 22:11:29 +02:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00