Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,278 Commits 151 Branches 18 Tags 2.1 GiB
72058ef32e
Commit Graph

1042 Commits

Author SHA1 Message Date
Ben Wallis
a9be045cb8 Fixed suppressed clippy warnings for #587 - useless_conversion 2020-07-13 20:57:13 +01:00
Marcel Märtens
c212de00c2 updated dependencies and fixed stuff 
- replace serde_derive by feature of serde
   incl. source code modifications to compile
 - reduce futures-timer to "2.0" to be same as async_std
 - update notify
 - removed mio, bincode and lz4 compress in common as networking is now in own crate
   btw there is a better lz4 compress crate, which is newer than 2017
 - update prometheus to 0.9
 - can't update uvth yet due to usues
 - hashbrown to 7.2 to only need a single version
 - libsqlite3 update
 - image didn't change as there is a problem with `image 0.23`
 - switch old directories with newer directories-next
 - no num upgrade as we still depend on num 0.2 anyways
 - rodio and cpal upgrade
 - const-tewaker update
 - dispatch (untested) update
 - git2 update
 - iterations update
 2020-07-07 09:43:49 +02:00
Marcel
e19d170b61 Merge branch 'imbris/smaller-fixes' into 'master' 
Stop spamming loadout, Update specs

See merge request veloren/veloren!1165
 2020-07-06 09:50:46 +00:00
Imbris
8d39f27458 Upgrade hashbrown 2020-07-06 03:15:06 -04:00
Snowram
d6da1f0e75 post-quad rewrite fixup 2020-07-06 06:07:29 +00:00
Joshua Barretto
43f75f2f54 Removed bomb timeout 2020-07-05 16:15:51 +01:00
Joshua Barretto
fd39ee97bc Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
2f6a618d5a Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
jshipsey
d8fff8833e quadlow spawn in world, continued adjustments 2020-07-05 09:38:14 -04:00
Marcel Märtens
6535fa5744 fix various clippy issues 2020-07-01 00:37:06 +02:00
Shane Handley
304e06cbce Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
Marcel Märtens
15fc5787e4 switch log behavior for env variable and removed gfx spam by default 2020-06-22 16:49:40 +02:00
Marcel Märtens
9485b45e70 switch to tracing stlye and enhance logs with usefull information 
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
 2020-06-22 09:53:15 +02:00
Kevin Glasson
589254e4ab Convert all other veloren crates to use tracing 
- Completely removed both `log` and `pretty_env_logger` and replaced
with `tracing` and `tracing_subscriber` where necessary.

- Converted all `log::info!(...)` et al. statements to just use the
shorthand macro i.e. `info!`. This was mostly to make renaming easier.
 2020-06-21 23:19:41 +08:00
Ben Wallis
6da7a11d33 Fixed suppressed clippy warnings for #587 - clone_on_copy 2020-06-18 22:25:48 +01:00
Imbris
26e53409d8 Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' 
Globally suppressed clippy lint option_map_unit_fn for #587

See merge request veloren/veloren!1071
 2020-06-14 16:48:07 +00:00
Ben Wallis
c1c968f479 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Imbris
fb47115695 Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' 
Fixed suppressed clippy warnings for #587 - redundant_closure

See merge request veloren/veloren!1065
 2020-06-14 16:33:04 +00:00
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
Marcel Märtens
0e59ee901e dependency reduction: 
- authc no longer uses reqwest
 - image only supports PNG
 - replace routille with tiny_http
 - several other dependencies
 - cargo upgrade
 - following improvement was measured on R7 1700X:
   before:
    - cargo build: 3076.73s user / 4:45 total / 589 dependencies
    - cargo test: 6118.38s user / 7:30 total / 959 dependencies
   after:
    - cargo build: 2680.54s user / 4:05 total / 480 dependencies
    - cargo test: 5351.81s user / 7:04 total / 791 dependencies
 - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
 2020-06-11 20:55:34 +02: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
Marcel Märtens
ec03c4518a Change the version number to 0.6 2020-05-16 00:50:40 +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
8c1fb3255c Downgraded minifb 2020-04-23 20:05:44 +01:00
Joshua Barretto
0a892e488a Updated examples 2020-04-23 18:20:34 +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
Imbris
b3791a2b4e Upgrade vek version so that it actually uses the patch 2020-03-30 19:44:51 -04:00
timokoesters
6fd3339b75 Make apples great again 2020-03-27 17:51:35 +01:00
Imbris
a04c1b1d1d Add uid to Player component 
fix: world examples
 2020-03-08 22:58:38 +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
Marcel Märtens
e960c2233b Change the version number to 0.5 2020-01-31 17:26:45 +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
133ba29293 Fixing Cargo.lock after rebase. 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
ba043b91a2 Screenshots with F4 in the map, that will have the full resolution of 
the displayed map (hopefully).
 2020-01-23 18:18:16 +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
Joshua Yanovski
d54f22c9fa Add a default world map. 
Also adds map versioning, proper scaling, and updates sediment
rendering.  It also tones down warp.
 2020-01-23 18:18:15 +01:00
Joshua Yanovski
1358f1dffa Changes to worldgen, adding more sedmient etc. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
ebe0d14eab Send client 3D rendered map. 
Also shares configurable rendering between map generator and server.
 2020-01-23 18:18:14 +01:00
Joshua Yanovski
9ee0cd82d0 Code restructuring for performance. 
Turned a lot of for loops into for_each loops, which should be easier
for LLVM to optimize currently.  Also updated almost all the non-erosion
stuff in WorldGen to run in parallel (and take advantage of the cache,
in the case of TownGen), and hopefully improved performance somewhat for
chunk generation as well.
 2020-01-23 18:18:14 +01:00
Joshua Yanovski
53ac7c0eb1 Weight flux twice as much as beforein humidity calculation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
597bb3c526 Adding many new types of geomorphic laws: 
- soil production (currently disabled).
- debris flow erosion (combined with regular stream power law).
- flow computation using multiple receivers.
- filling strategy during drainage network calculations.

Also tweaks a variety of other aspects of erosion.
 2020-01-23 18:18:12 +01:00
Joshua Yanovski
e91578ffdb Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
5fd8b009a6 Gentler warp, especially for high chunk size. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
8d5a5af2cb Fix overflow issue with basement. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
d0cfdb34aa Fix colors on map being transferred to client. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
2b38927345 Fixes for nonstandard chunk and map sizes. 
Also fixes a longstanding map rendering issue.
 2020-01-23 18:18:11 +01:00
Joshua Yanovski
bacc5271d4 Soil production should use ground, not basement, slope. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
ee5d383c46 Map saving, soil production, speedup attempts. 2020-01-23 18:18:10 +01:00
Pfauenauge90
5fc34081bd birches and "Acalok" Trees 2020-01-23 18:18:10 +01:00
Joshua Yanovski
c92ff34e15 Fix sediment transport, add hack for sediment. 2020-01-23 18:18:09 +01:00
Joshua Yanovski
e71f145b71 Sediment transport, plus many other things. 2020-01-23 18:18:09 +01:00
Joshua Yanovski
067429d13e Use Worley noise for uplift. 2020-01-23 18:18:09 +01:00
Joshua Yanovski
72287f2041 Implement carving strategy for lake connections. 
Also fix mapgen slopes and make a much more pleasing world.
 2020-01-23 18:18:08 +01:00
Joshua Yanovski
e01bb8a8c9 Render sediment differently. 2020-01-23 18:18:08 +01:00
Joshua Yanovski
e289849c87 Map fixes. 2020-01-23 18:18:08 +01:00
Joshua Yanovski
cc58101540 Seed elements. 2020-01-23 18:18:08 +01:00
Joshua Yanovski
69a8d5039b Adding hillslope diffusion. 2020-01-23 18:18:07 +01:00
Joshua Yanovski
825ba1b4f4 WIP fixes: more pleasing uplift generation. 
Uses the exponential distribution now.
 2020-01-23 18:18:07 +01:00
Joshua Yanovski
1b864887e7 Reverting changes except to humidity and temperature 
noise.
 2020-01-23 18:18:07 +01:00
flyingfryingpan
28d0afbfb6 wahtevermoresharp 2020-01-23 18:18:07 +01:00
flyingfryingpan
a98d4adc27 forsharp 2020-01-23 18:18:07 +01:00
Imbris
4b01c1b082 add: capability to disable blending for particular BlockKinds 2020-01-19 16:03:27 -05:00
Imbris
5666f18ded Add terrain meshing benchmark 2020-01-19 16:02:12 -05:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Piotr Korgól
e1adf40856 Improvement: Replace all '..=b' with '..b + 1' 2020-01-12 15:46:53 +01:00
S Handley
5b65b16594 Prevent NPCs from spawnign underwater 
This should be set until there are underwater NPC types.
 2020-01-08 12:48:00 +00:00
Songtronix
0d919a9dc6 improve(log): adjust verbosity of some logging 
fix: settings do not log due to logging being initialized to late
 2019-12-20 15:45:30 +01:00
Marcel Märtens
72d8f95e8c please ci toolchain 2019-12-11 15:13:46 +01:00
S Handley
56f9c5d35f Fix the glider_close sfx event 
This was failing to trigger since we now have a MovementState::Fall, but
the sfx mapper was still trying to work this out itself based on
velocity. We no longer need to track velocity as a result and can use
the MovementState.

Also silenced warnings resulting from unused vars when running tests.
 2019-12-09 09:50:14 +00:00
soruh
6dfa146484 Mitgated RUSTSEC-2019-0014 by updating noise and 
disabling its default features, specifically `image`,
which had the vulnerability.
 2019-11-05 11:14:39 +00:00
soruh
e3bd152d24 update toolchain to nightly-2019-11-04 2019-11-04 18:26:32 +01:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
KyoZM
5390b1b36c format code 2019-10-10 21:00:19 -03:00
KyoZM
83a4454be5 refactor code to be smaller and clearer 2019-10-10 20:53:13 -03:00
KyoZM
6b42b1c762 remove unecessary comments 2019-10-10 20:53:13 -03:00
KyoZM
1998ed2fdd load structures from ron files / transfer static structure lists to ron files 2019-10-10 20:53:13 -03:00
Marcel Märtens
20c520a044 Change the version number to 0.4 2019-10-10 15:48:01 +02:00
Joshua Barretto
bf01069f44 Balanced chest spawning 2019-10-10 10:11:46 +01:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
087bfffc8a Proper tree colour variation 2019-10-07 09:05:18 +01:00
Joshua Barretto
6fc6864e7c Better grass colours, made flora more common 2019-10-07 08:49:02 +01:00
Forest
35b9040a6f Removed now stable feature 2019-10-03 17:28:17 -04:00
Forest Anderson
6ee99786d6 Removed trailing semicolon 2019-10-03 17:19:22 -04:00
Acrimon
f39d454f93 Update fast_noise.rs 2019-10-03 17:19:22 -04:00
Acrimon
772e85fbea Update lib.rs 2019-10-03 17:19:22 -04:00
Acrimon
e151b81c11 Update lib.rs 2019-10-03 17:19:22 -04:00
Joshua Barretto
a90ceddde0 Fixed cold near oceans, faster meshing 2019-09-27 12:46:20 +01:00
Joshua Barretto
81dc77c87b Resolved warnings 2019-09-26 13:34:15 +01:00
Joshua Barretto
b1d4ae7445 Fixed cliff generation layer bug 2019-09-26 12:19:21 +01:00
Joshua Barretto
a6d5b82ef5 Prevented pickups with full inventory 2019-09-26 00:15:07 +01:00
Joshua Barretto
7f4e587215 Made velorite rarer 2019-09-26 00:15:07 +01:00
Joshua Barretto
e22fe81a2f Added velorite 2019-09-26 00:15:07 +01:00
Joshua Barretto
a961a267f1 Added apple and mushroom collection 2019-09-26 00:15:07 +01:00
Joshua Barretto
b0a1619698 Fixed shadow distance culling 2019-09-26 00:15:07 +01:00
Joshua Barretto
499344ccab Added entity shadows 2019-09-26 00:15:07 +01:00
Joshua Barretto
50daf185a8 Resolved warnings 2019-09-26 00:15:07 +01:00
Joshua Barretto
8e2f810883 Grounded houses more 2019-09-26 00:15:07 +01:00
Joshua Barretto
ea688e725f Shorter houses 2019-09-26 00:15:07 +01:00
Joshua Barretto
b62830b8b4 Better hills 2019-09-26 00:15:07 +01:00
Joshua Barretto
2165e79971 Adjusted cliff height on mountains 2019-09-26 00:15:07 +01:00
Joshua Barretto
3979dddbc1 Faster meshing, better AO, colour correction 2019-09-26 00:15:07 +01:00
Joshua Barretto
a432cef263 Better colour correction 2019-09-26 00:15:07 +01:00
Joshua Barretto
22af0ab016 Prevented bounds mis-prediction 2019-09-26 00:15:07 +01:00
Joshua Barretto
ba7fa8b55d Prevented towns in oceans 2019-09-26 00:15:07 +01:00
Joshua Barretto
5933ae608a Applied water layer after structures layer 2019-09-26 00:15:07 +01:00
Joshua Barretto
b6e72b0075 Better warp noise 2019-09-26 00:15:07 +01:00
Joshua Barretto
a9d7cfac0b Added wells 2019-09-26 00:15:07 +01:00
Joshua Barretto
1e9eb3089e Worldgen colour tweaks, better buildings, better warping 2019-09-26 00:15:07 +01:00
Joshua Barretto
8a2dc836d8 Fixed cut-off cliff, optimised structure generation 2019-09-23 16:20:28 +01:00
Joshua Barretto
e77f165da6 Improved SmallCache 2019-09-23 15:17:06 +01:00
Imbris
f182733074 Small cache experiments 2019-09-22 22:19:07 -04:00
Imbris
debcb11e18 Simplify lerping and use smoothstep interpolation instead of cosine 2019-09-21 19:46:27 -04:00
Acrimon
7647e54858 Drastically faster diffuse 2019-09-21 17:40:27 +00:00
Joshua Barretto
542ac41e7a Merge branch 'xacrimon/rng-init-noise' into 'master' 
Update some deps, fix hashbrown not compiling and rework the ad-hoc PRNG for RandomField.

See merge request veloren/veloren!500
 2019-09-20 06:13:48 +00:00
Acrimon
7463db0dd9 Formatted code. 2019-09-17 20:35:53 +02:00
Acrimon
2786e28577 Fixed rng stuff. 2019-09-17 16:56:23 +02:00
Acrimon
85e6e54dc2 Fixed compile errors. 2019-09-17 16:12:17 +02:00
Acrimon
37d71cee26 Added some reasoning. 2019-09-17 16:07:24 +02:00
Acrimon
1dfbe40731 Made the worldgen noise generators seed from the RNG and got rid of zerocopy. 2019-09-17 16:05:08 +02:00
Joshua Yanovski
9ba64ca57f Addressing code review. 2019-09-16 15:11:47 +02:00
Joshua Yanovski
2abf7cd016 Fixing more rustfmt errors. 2019-09-16 04:05:36 +02:00
Joshua Yanovski
95b02912b6 Fixing rustfmt. 2019-09-16 04:01:05 +02:00
Joshua Yanovski
b9f545f97c Fixing previous commit. 2019-09-16 03:54:32 +02:00
Joshua Yanovski
9a4e5e06f2 Fixing previous commit. 2019-09-16 03:51:08 +02:00
haslersn
1796c09ca1 common: Rework volume API 
See the doc comments in `common/src/vol.rs` for more information on
the API itself.

The changes include:

* Consistent `Err`/`Error` naming.
  * Types are named `...Error`.
  * `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
  to an upcoming change where a “map” in the game related sense will
  be added.
* Add volume iterators. There are two types of them:
  * _Position_ iterators obtained from the trait `IntoPosIterator`
    using the method
    `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `Vec3<i32>`.
  * _Volume_ iterators obtained from the trait `IntoVolIterator`
    using the method
    `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
  Those traits will usually be implemented by references to volume
  types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
  type which usually implements several volume traits, such as `Chunk`).
  * _Position_ iterators iterate over the positions valid for that
    volume.
  * _Volume_ iterators do the same but return not only the position
    but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
  `Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
  * `RasterableVol` represents a volume that is compile-time sized and has
    its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
    because such a volume can be used with `VolGrid3d`.
  * `RectRasterableVol` represents a volume that is compile-time sized at
    least in x and y direction and has its lower bound at `(0, 0, z)`.
    There's no requirement on he lower bound or size in z direction.
    The name `RectRasterableVol` was chosen because such a volume can be
    used with `VolGrid2d`.
 2019-09-06 15:43:31 +02:00
Imbris
52d84248ec Remove all warnings 2019-09-04 19:03:49 -04:00
Monty Marz
f53904b534 More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
Joshua Barretto
d0768e9858 Faster prng 2019-08-31 14:24:56 +01:00
Joshua Barretto
7321eb6999 Better town park generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
1eb0720cbb Cleaned up wall generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
1176fc4d07 Better loading times 2019-08-31 11:44:52 +01:00
Joshua Barretto
c433ef36d7 Sloped wall tops 2019-08-31 11:44:52 +01:00
Joshua Barretto
25d6ab03aa Removed extra foundations 2019-08-31 11:44:52 +01:00
Joshua Barretto
e3c4e34edb Added city walls 2019-08-31 11:44:52 +01:00
Joshua Barretto
144703da1c Added wall module assets 2019-08-31 11:44:52 +01:00
Joshua Barretto
5a677b9c1e Added modular building generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
adb62f448e Added walls 2019-08-31 11:44:52 +01:00
Joshua Barretto
d17356fb38 Started work on modular buildings 2019-08-31 11:44:52 +01:00
Joshua Barretto
f8c5b277e3 Improved mountain slopes and cliffs 2019-08-31 11:44:52 +01:00
Joshua Barretto
4de7a064a1 Added module parts, made cell size smaller 2019-08-31 11:44:52 +01:00
Joshua Barretto
fe2ad92201 Initial implementation of towns 2019-08-31 11:44:52 +01:00
Joshua Barretto
d42485238e Added town road construction 2019-08-31 11:44:52 +01:00
Joshua Barretto
aaade23eef Better warping 2019-08-31 11:44:52 +01:00
Joshua Barretto
b0293ecce4 Switched to FastNoise 2019-08-31 11:44:52 +01:00
Joshua Barretto
4777921680 Added test generator 2019-08-31 11:44:52 +01:00
Joshua Barretto
1fcb4a0313 Added Generator trait, fixed ocean lighting 2019-08-31 11:44:52 +01:00
Joshua Barretto
75f5419571 Removed dryness 2019-08-31 11:44:52 +01:00
Joshua Barretto
4735d3d6da More interesting hills 2019-08-31 11:44:52 +01:00
timokoesters
c4879307af
Update to github vek repo 2019-08-26 13:12:45 +02:00
Joshua Yanovski
c02f2a7f9e Fixes to worldgen and adding a debug command. 
Humidity and temperature are now indexed to uniform altitude *over land
chunks* (and water chunks adjacent to land) rather than over the whole
range of altitude.  This is necessary in order to satisfy the uniformity
conditions of the formula for weighted sum CDF.

Additionally, fixes the computation of whether a tree should be
generated or not.  Previously, it was using a source of randomness
scaled to use much less than the full 0-1 range; this has been resolved.
This makes for much nicer and more gradual transitions between densities
and reduces the amount of completely barren landscapes, while also
making forests larger.

Finally, this commit adds a server command, debug_column, which returns
some useful debug information about a column given an x and y
coordinate.  This is useful for debugging worldgen.
 2019-08-26 11:52:25 +02:00
Joshua Yanovski
958a40b8c0 Fix clean code lints. 2019-08-25 18:17:51 +02:00
Joshua Yanovski
6f12a240de Chaos doesn't depend on temperature anymore. 
Also fix some things to use a consistent coordinate system and bump up
tree density and variation around tree density in hopes of creating more
aesthetically pleasing jungles.  However, this does change worldgen a
bit, so please make sure you look through it before merging.
 2019-08-25 17:49:33 +02:00
jshipsey
f02b571f7f fmt 2019-08-24 15:32:07 -04:00
Joshua Yanovski
25a02ae6e0 Make humidity ignore ocean chunks. 2019-08-24 21:13:32 +02:00
Joshua Barretto
8635982173 Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-23 00:33:33 +01:00
Joshua Barretto
0db797744b Better snow noise 2019-08-23 00:31:27 +01:00
Joshua Yanovski
f687c591ca Remove out of date comment. 2019-08-23 01:16:15 +02:00
Joshua Yanovski
d7f567a862 Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle 2019-08-23 01:10:48 +02:00
Joshua Barretto
6136edd631 Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-23 00:09:45 +01:00
Joshua Barretto
b6cfc84810 More interesting terrain chaos 2019-08-23 00:09:14 +01:00
Joshua Yanovski
b69020b68e Fine, removing box syntax. 2019-08-23 01:08:47 +02:00
Joshua Yanovski
398c18359d Addressing concerns, for real. 2019-08-23 00:57:42 +02:00
Joshua Yanovski
2ff192021c Addressing PR issues. 2019-08-22 23:48:13 +02:00
Joshua Barretto
ba1a146cd5 Better snow, colours, more chaos 2019-08-22 22:25:17 +01:00
Joshua Yanovski
40192da977 Closest attempt. 2019-08-22 21:10:04 +02:00
Joshua Yanovski
dbeec66b2d Total chaos. 2019-08-22 21:03:42 +02:00
Joshua Yanovski
38443c173c Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-22 17:47:10 +02:00
Joshua Yanovski
5caed42e4f Fix density computation. 2019-08-22 17:45:47 +02:00
Joshua Yanovski
aa4464d8f4 Adding more jungle trees. 2019-08-22 01:33:47 +02:00
Joshua Yanovski
139933194c Restore old chaos. 2019-08-22 01:01:13 +02:00
Joshua Yanovski
16ad7ba042 Fixing colors. 2019-08-22 00:15:24 +02:00
Joshua Yanovski
d174dd99b4 Fixing a few visual issues. 2019-08-21 23:36:43 +02:00
Joshua Yanovski
bd8a0be0fb Putting back splotchy mud. 2019-08-21 20:59:26 +02:00
Joshua Yanovski
91ea62a5c9 Get rid of extraneous things. 2019-08-21 20:48:51 +02:00
Joshua Yanovski
05d501632e Fixing jungle. 2019-08-21 20:41:32 +02:00
Joshua Barretto
7ceccfecc3 Added cacti 2019-08-21 19:18:16 +01:00
Joshua Barretto
6ff264d982 Better plant grouping distribution 2019-08-21 18:56:46 +01:00
Monty Marz
fade04d44e Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Joshua Yanovski
8c644e2bb1 Distribution "fun." 2019-08-20 22:48:22 +02:00
Joshua Barretto
60544531dd More grass 2019-08-20 12:06:41 +01:00
Joshua Barretto
245c9af2e8 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
Joshua Barretto
5f09ab3a4f Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7960e6ea6d Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
b31cca4bb3 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Yanovski
405f55d725 Smoother blending into sand. 2019-08-19 19:46:47 +02:00
Joshua Yanovski
97eaeddd78 t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 19:21:05 +02:00
Joshua Yanovski
5919f63516 Fixing visual issues. 2019-08-19 19:20:54 +02:00
Acrimon
a41cf1a83d Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Joshua Yanovski
fa35f9932e Smoothed some things out. 2019-08-19 05:22:39 +02:00
Joshua Yanovski
1c9be67516 Billow tweaks. 2019-08-19 03:41:32 +02:00
Joshua Yanovski
c5ffb232d4 Fixing some colors. 2019-08-19 03:01:11 +02:00
Joshua Yanovski
d8c864cf3a Making jungles work. 2019-08-19 01:52:26 +02:00
Joshua Yanovski
680b81a5e6 WIP for humidity. 2019-08-18 18:35:27 +02:00
Joshua Barretto
49426565dc Renamed normal StructureBlock variant 2019-08-18 15:33:16 +01:00
Joshua Barretto
75dbebbd05 More interesting waves 2019-08-18 10:33:18 +01:00
Vechro
71710fb091 Dungeon fixes 2019-08-18 10:33:18 +01:00
Joshua Barretto
e535537106 Added default block kind to structure loading 2019-08-18 10:33:18 +01:00
Vechro
6cf5b99857 Add water-based dungeons 2019-08-18 10:33:18 +01:00
Joshua Barretto
f0e52e6002 Better reflections and water fog 2019-08-18 10:33:18 +01:00
Joshua Barretto
825d8bb632 Fixed water in caves, made water reflection vary with lighting 2019-08-18 10:33:18 +01:00
Vechro
b5b3b980fe Add green sludge special index 2019-08-18 10:33:18 +01:00
Vechro
944067fd43 Add water special index 2019-08-18 10:33:18 +01:00
Joshua Barretto
fa6825f13b Better fluid meshing, disabled fluid backface culling and depth buffer writing 2019-08-18 10:33:18 +01:00
Joshua Barretto
42237a84e4 Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
Acrimon
cb4374160c Removed unsafe. 2019-08-19 00:55:04 +02:00
Acrimon
09525bf964 Cleaner solution. 2019-08-19 00:46:24 +02:00
Acrimon
f8d14bdfd5 Ran fmt. 2019-08-19 00:20:56 +02:00
Acrimon
6b59f0bc9a Fixed seed expansion for noise seeding. 2019-08-19 00:19:51 +02:00
Imbris
d99a4f8d39 Lighter 2019-08-15 23:59:09 -04:00
Imbris
be0e0e52a8 Improve colors 2019-08-15 23:59:09 -04:00
Imbris
9dbdd51777 Increase saturation of some colors 2019-08-15 23:56:15 -04:00
Imbris
c09eb77149 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Acrimon
b4a46f3e6e Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
ed4909670d Use hashbrown instead of fxhashmap in world. 2019-08-11 22:10:36 +02:00
Acrimon
51a4e358dd Formatted code. 2019-08-11 13:37:04 +02:00
Acrimon
7b8a7a410d Cleaned up seed generation in worldsim. 2019-08-11 13:37:04 +02:00
Acrimon
cdf4c26be7 Rewrite diffusion function. Now has potential for a full avalanche. 2019-08-11 13:37:04 +02:00
Acrimon
00b5a4a58e Greatly simplified seed expansion. 2019-08-11 13:37:04 +02:00
Acrimon
d840ca72e3 Improved some comments. 2019-08-11 13:37:04 +02:00
Acrimon
5eee2622cb Fixed comment typo. 2019-08-11 13:37:04 +02:00
Acrimon
dcc19e2d04 Added a lot of comments. 2019-08-11 13:37:04 +02:00
Acrimon
fea6b2e776 Fixed overflow in seed_expan 2019-08-11 13:36:14 +02:00
Acrimon
8cb48804c2 Fixed diffuse_field 2019-08-11 13:36:14 +02:00
Acrimon
393ac4610c Improved worldgen seed expansion 2019-08-11 13:36:14 +02:00
Vechro
595f9ac3d2 Add a new dungeon, fixes for existing ones 2019-08-06 12:51:14 +03:00
timokoesters
1227596406 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
Piotr Korgól
d3f2ca69a4 Change the version number to 0.3 2019-08-04 13:53:59 +02:00
Joshua Barretto
daa9b81c69 Made boss spawning rarer 2019-08-04 10:27:08 +01:00
Joshua Barretto
7c6479a1fa More dungeons 2019-08-04 10:09:51 +01:00
Joshua Barretto
f14674ee9a Switched to UnitChooser 2019-08-03 22:15:23 +01:00
Joshua Barretto
8b9a92b30e Added dungeons 2019-08-03 22:15:23 +01:00
Joshua Barretto
677c5781ba Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
Joshua Barretto
6ff75dcf0b Removed NPCs that are outside the VD 2019-08-02 20:10:52 +01:00
Joshua Barretto
b5d10bfb3e Added worldgen npcs 2019-08-02 20:10:52 +01:00
Acrimon
a5b19935a2 Use named generator in worldgen. 2019-07-30 16:10:59 +02:00
Acrimon
ee49ebe807 Update rand, log and scan_fmt 2019-07-29 13:42:26 +00:00
timokoesters
5aa864ee58
Update most dependencies 2019-07-28 22:47:23 +02:00
Vechro
9c1b93a70a Fix pyramid spawning 2019-07-17 20:18:56 +03:00
Joshua Barretto
9d1575db3f Fixed pyramid biome bug 2019-07-10 12:57:29 +01:00
Joshua Barretto
09717f1c56 Added pyramids 2019-07-10 00:51:54 +01:00
Joshua Barretto
92d4b4dfbe Smoothed world borders 2019-07-09 21:42:27 +01:00
Joshua Barretto
9bc50ae547 Better acacia tree colours 2019-07-09 20:42:43 +01:00
Joshua Barretto
a6c9c10062 Better tree colours 2019-07-09 17:58:20 +01:00
Joshua Barretto
e7dd151833 Added fruit trees 2019-07-09 17:08:43 +01:00
Joshua Barretto
73e9dba153 Smoothed temperate/savannah border 2019-07-09 00:35:59 +01:00
Joshua Barretto
fa28c8a6c6 Made cliff detection more tolerant 2019-07-09 00:31:43 +01:00
Joshua Barretto
cfdb0209bd Better savannah colours 2019-07-09 00:09:04 +01:00
Joshua Barretto
d79f7d9714 Colour improvements 2019-07-08 22:10:48 +01:00
Joshua Barretto
879789ecc4 Fixed acacia colours 2019-07-08 20:28:48 +01:00
Joshua Barretto
8e8bad137a Re-added oceans 2019-07-08 20:08:08 +01:00
Joshua Barretto
6b415c1b87 Added large ribcages in deserts 2019-07-08 17:57:41 +01:00
Joshua Barretto
14ba09f96b Added acacia trees, desert bones, fixed minor worldgen issues 2019-07-08 17:41:20 +01:00
Joshua Barretto
f823b0c992 Fixed tree clipping and several other minor issues 2019-07-08 17:00:50 +01:00
Joshua Barretto
c2a11ed6b2 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Joshua Barretto
71f4704502 Restructured mountain profile 2019-07-08 01:49:54 +01:00
Joshua Barretto
c6e24b593e Rescaled mountains 2019-07-08 00:50:36 +01:00
Joshua Barretto
44b5473a82 Added rare structures, totally refactored structure spawning 2019-07-08 00:50:36 +01:00
Joshua Barretto
29803524fd Made temperature biomes larger, added savannah ground 2019-07-08 00:50:36 +01:00
Joshua Barretto
1d8656cb7d Fixed tree trimming 2019-07-07 00:21:32 +01:00
Joshua Barretto
abd07aea09 Improved z caching 2019-07-06 20:00:17 +01:00
Joshua Barretto
3623871775 Initial implementation of z cache 2019-07-06 20:00:17 +01:00
Joshua Barretto
6fc2096dae Reenabled towns, lighter days 2019-07-06 20:00:17 +01:00
Joshua Barretto
61568eac7c Better grass colour 2019-07-06 20:00:17 +01:00
Songtronix
863731f3ae Fix warnings from world 2019-07-01 18:40:41 +00:00
Joshua Barretto
f2df3a9d18 Block-hopping fix, better dusk shaders 2019-06-29 22:47:24 +01:00
Joshua Barretto
5839990a28 Disabled cities until a later MR 2019-06-26 19:32:26 +01:00
Joshua Barretto
e414b82d2f fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
b40d19ad0e Added settlement generation 2019-06-26 19:14:12 +01:00
Joshua Barretto
f781aca8e9 fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
ad2bc635f8 Rewrote sky shaders, added stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
325fa41d7e Grass improvements 2019-06-26 19:14:12 +01:00
Joshua Barretto
46fce696a2 Better path noise, better shadows 2019-06-26 19:14:12 +01:00
Joshua Barretto
41f647e862 Added path colouring 2019-06-26 19:14:12 +01:00
Joshua Barretto
ba4b425e99 Wavy paths 2019-06-26 19:14:12 +01:00
Joshua Barretto
53d5cada93 Better paths 2019-06-26 19:14:12 +01:00
Joshua Barretto
216c2583fb Paths and smoother region borders 2019-06-26 19:14:12 +01:00
Joshua Barretto
86f13af8cb Improved hash RNG function instability and speed 2019-06-26 19:14:12 +01:00
Joshua Barretto
b94c0ace8c Removed RefCell from column cache 2019-06-26 19:14:12 +01:00
Pfauenauge90
b5d529f824 changes restore 2019-06-26 19:14:12 +01:00
Joshua Barretto
b987bda9ce Stronger shadows, fewer cliffs in oceans 2019-06-26 19:14:12 +01:00
Joshua Barretto
6f1d77648a Smoother cliffs 2019-06-26 19:14:12 +01:00
Joshua Barretto
d0b38e9875 Worldgen performance improvements, better sun 2019-06-26 19:14:12 +01:00
Joshua Barretto
f3adf6ab5f Improved mountain rock transition 2019-06-26 19:14:12 +01:00
Joshua Barretto
693d59cc93 Removed old cliff code 2019-06-26 19:14:12 +01:00
Joshua Barretto
fffef7c739 Better rivers, rewrote cliffs 2019-06-26 19:14:12 +01:00
Joshua Barretto
1642988615 First attempt at rivers 2019-06-26 19:14:12 +01:00
Joshua Barretto
c86c4d0b2b fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
704e65cb41 Attempted rivers 2019-06-26 19:14:12 +01:00
Joshua Barretto
3e56c65e86 Make name generation seed-dependent again 2019-06-26 19:14:12 +01:00
Piotr Korgól
4644199f1b Make minimap title show location names 2019-06-26 19:14:12 +01:00
Pfauenauge90
ab2c0ad085 mid name parts 2019-06-26 19:14:12 +01:00
Pfauenauge90
60f8a29530 Better sylables, changed generation rules 2019-06-26 19:14:12 +01:00
Joshua Barretto
5e96e29ff1 AO improvements, day/night cycle 2019-06-26 19:14:12 +01:00
Joshua Barretto
451bbe9921 Basic region generation 2019-06-26 19:14:12 +01:00
Joshua Barretto
aa28f0b427 Better rock colours 2019-06-26 19:14:12 +01:00
Joshua Barretto
bc7cee1846 Lighting fixes 2019-06-26 19:14:12 +01:00
Joshua Barretto
4da01fba9a Fixed world viewer stack overflow on Windows 2019-06-15 15:50:54 +01:00
Joshua Barretto
bab7746a8a Updated and fixed world viewer example 2019-06-15 13:34:28 +01:00
Joshua Barretto
a9d30bbfb6 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
Joshua Barretto
30b668d0cc Added dynamic tree colours 2019-06-13 11:59:05 +01:00
Joshua Barretto
743855092a Fixed missing assets 2019-06-13 11:59:05 +01:00
Joshua Barretto
fd529b5462 Added grass blending 2019-06-13 11:59:05 +01:00
Joshua Barretto
29ecb14c45 Added dirt/stone gradient 2019-06-13 11:59:05 +01:00
Joshua Barretto
9fed2c1534 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Pfauenauge90
43ca660e63 tree stumps, shorter pines 2019-06-13 11:59:05 +01:00
Joshua Barretto
fa8f3a4b49 Tweaked lighting and AO 2019-06-13 11:59:05 +01:00
Joshua Barretto
e671d8473c Bluer snow, altered rock colour 2019-06-13 11:59:05 +01:00
Joshua Barretto
df2594cbb4 Added more terrain noise, better snow 2019-06-13 11:59:05 +01:00
Joshua Barretto
8071670a37 More trees, adjusted camera tilt 2019-06-13 11:59:05 +01:00
Joshua Barretto
38c836d6c5 Simpler cliffs, camera tilt 2019-06-13 11:59:05 +01:00
Monty Marz
bac7bad9f7 Tree fixes 2019-06-13 11:59:05 +01:00
Joshua Barretto
7f5a0970f1 Crazy cliffs 2019-06-13 11:59:05 +01:00
Joshua Barretto
414b730b59 Reduced peak scale 2019-06-13 11:59:05 +01:00
Joshua Barretto
264b1efdff Adjusted mountain steepness 2019-06-13 11:59:05 +01:00
Joshua Barretto
f62725135a Rescaled mountains 2019-06-13 11:59:05 +01:00
Joshua Barretto
e4d5476d28 Major worldgen structural refactor 2019-06-13 11:59:05 +01:00
Joshua Barretto
3285fc9b88 Added sampler clearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
a34aff3a8b Prevented rock smearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
61dda0ea8c Separated sampler code from simulation code 2019-06-13 11:59:05 +01:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
afd983f6f8 Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
9617f5f17e Fixed mountain generation limits chonk bug 2019-06-05 22:38:43 +01:00
Joshua Barretto
35f0bebcc3 Fewer caves on mountains 2019-06-05 21:40:47 +01:00
Joshua Barretto
9ddc569a75 Fixed caves again 2019-06-05 21:33:06 +01:00
Joshua Barretto
5cc4669bce Upped cave frequency 2019-06-05 21:07:36 +01:00
Joshua Barretto
732ba9ac02 Reduced tree density, shortened chunk load timeout 2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816 Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Joshua Barretto
13197a741e Tweaked mountain base scale 2019-06-05 20:52:51 +01:00
Joshua Barretto
9a8552d5fb Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
06201c7353 fmt 2019-06-05 20:52:51 +01:00
Joshua Barretto
92f2d36b0c Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Joshua Barretto
c3cd3b9a69 Compressed vertex data even more 2019-06-04 00:09:49 +02:00
Joshua Barretto
8a6ed86b2e Fixed hard cave walls 2019-06-04 00:08:23 +02:00
Joshua Barretto
e766bdf412 Removed second cave layer 2019-06-04 00:08:22 +02:00
Joshua Barretto
f35739ed30 Upped cave spawn rate 2019-06-04 00:08:22 +02:00
Joshua Barretto
f86bf5045e Made extreme biomes more common 2019-06-03 22:50:47 +01:00
Joshua Barretto
b554d7b19e Made caves wider 2019-06-03 22:50:47 +01:00
Joshua Barretto
e2182b1a68 Added basic light 2019-06-03 22:50:47 +01:00
Joshua Barretto
07eb56f287 Improved cave proportions 2019-06-03 22:50:47 +01:00
Joshua Barretto
e618e97b1f Improved cave noise 2019-06-03 22:50:47 +01:00
Pfauenauge90
ce6a9ac32d Roots added 
fmt

asset fix
 2019-06-03 22:50:27 +01:00
Pfauenauge90
f5f5110f77 third pine variation 2019-05-31 18:05:56 +02:00
Pfauenauge90
53ffc50242 Even more assets with offsets 2019-05-31 18:05:56 +02:00
Pfauenauge90
47e4c297d8 more assets, offsets for temperate trees 2019-05-31 18:05:55 +02:00
Pfauenauge90
04ec381715 Asset path change 2019-05-31 18:05:55 +02:00
Joshua Barretto
6725e99798 Switched to squircle caves 2019-05-31 17:00:51 +01:00
Joshua Barretto
c4f49a1bee Reduced cave winding, increased cave size 2019-05-31 16:28:01 +01:00
Joshua Barretto
abaec6d325 Much better caves 2019-05-31 16:16:26 +01:00
Joshua Barretto
024afb9b4a Added desert and snowy areas 
Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802
 2019-05-29 22:24:47 +01:00
Joshua Barretto
f49796dcef Basic cave test 
Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e
 2019-05-29 14:49:27 +01:00
Joshua Barretto
8348633a0f Stopped trees spawning in water 
Former-commit-id: 1cc73b0eea4126da4501e19a695b572efc436935
 2019-05-25 08:36:11 +01:00
Joshua Barretto
62f3808f5a Fixed world viewer 
Former-commit-id: 03113582d1bd9bce6848c66b9c73a2ba2939162e
 2019-05-25 07:00:24 +01:00
Joshua Barretto
92391883a9 fmt 
Former-commit-id: 689464ed1009ebfd74769fa113fc7b433ea62bbd
 2019-05-25 06:54:47 +01:00
Joshua Barretto
16b80ab006 Marginally increased tree spawn frequency 
Former-commit-id: c23a172e4796317bafdf4a6661330ed86d4eb248
 2019-05-25 06:49:55 +01:00
Joshua Barretto
e0aaa96262 Improved grass and tree colour 
Former-commit-id: 9372612047df95ec9588d35a32161248df85178a
 2019-05-25 06:47:11 +01:00
Joshua Barretto
c919f6fc83 Better tree spawning, more trees 
Former-commit-id: abf4ff8a2eb005c2cd1832f5a3ae7182c4fc31f6
 2019-05-25 06:38:40 +01:00
Joshua Barretto
9ed330d8fe Improved sea-like slopes 
Former-commit-id: 4b3ba56dcf6d99db7e48c169d42e042811872fd3
 2019-05-25 05:51:45 +01:00
Joshua Barretto
1551bf0ae6 Much bigger terrain 
Former-commit-id: f83f281a1ec1d18079a574580d5d963416fccde2
 2019-05-25 05:51:45 +01:00
Joshua Barretto
842f518535 Made mountains bigger 
Former-commit-id: c6ef0a8dba599e70177c7446fe282f357d33a66b
 2019-05-25 05:51:45 +01:00
Joshua Barretto
c8ba5d9f89 Basic pine tree spawning 
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
 2019-05-25 05:51:45 +01:00
Joshua Barretto
4d73f38e6d Refactored worldgen sampling, added cache layer 
Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5
 2019-05-25 05:51:45 +01:00
Joshua Barretto
857315a27d Added basic structure generation 
Former-commit-id: 88a6bf2e18ac4f8f9b560797c8aac82ca318afb0
 2019-05-25 05:51:45 +01:00
Joshua Barretto
79ae6f10e7 Changed snow altitude 
Former-commit-id: 0a673564d854e535574381874127254e83f92585
 2019-05-25 05:51:45 +01:00
Joshua Barretto
bab4cbb782 Adjusted snow 
Former-commit-id: d30f3f8bb4e59c436023ccb38f65e868935d62f0
 2019-05-25 05:51:45 +01:00
Joshua Barretto
31e25e8b09 Made mountain rock darker 
Former-commit-id: 2da60a1e6b69d2522773ee3aae5cf2d83a1d0396
 2019-05-25 05:51:45 +01:00
Joshua Barretto
86bb277116 Added snow to mountains, fixed hash sub-chunk allocation failure 
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
 2019-05-25 05:51:45 +01:00
Joshua Barretto
cafbb45e52 Small worldgen fixes and hash chunk optimisation 
Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c
 2019-05-25 05:51:45 +01:00
Joshua Barretto
611b270ded Improved cache-coherency of world chunk interpolation 
Former-commit-id: 2f45cf47916970185c65c701dfc63ae838f05734
 2019-05-25 05:51:45 +01:00
Joshua Barretto
fc25dc8c7f fmt 
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
 2019-05-21 23:31:38 +01:00
Joshua Barretto
8909a4220f Added water, beaches, craggs 
Former-commit-id: 0213bbac23cf01df31896461d0cdda3b0ee708dc
 2019-05-21 22:51:41 +01:00
Joshua Barretto
dcd2b4392d Added rocks, improved hills 
Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03
 2019-05-21 22:51:41 +01:00
Joshua Barretto
feece604be Restarted worldgen 
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5118da0e0e Added rivers, improved mountains 
Former-commit-id: c1b76c54d2aa8f0616c26b0724fe34c0d80ac4fd
 2019-05-21 22:51:41 +01:00
Joshua Barretto
a0dfa3fddc Added basic mountain/valley worldgen 
Former-commit-id: 5a45f18fcdf523841ee8433ba2ff0b8765eadf3a
 2019-05-21 22:51:41 +01:00
Joshua Barretto
2996e3c8aa Made the edges of the world be empty 
Former-commit-id: 51a3315a3b00d28c87c6364d83e32d180f4f8e18
 2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen 
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
 2019-05-21 22:51:41 +01:00
Joshua Barretto
2548c1c31f Added worldsim API, ticking 
Former-commit-id: 50a63e44557c634f2b39ef7a580cdbeec5ed0d70
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5b055f54a5 Less noisy worldgen 
Former-commit-id: f1df6cc5b170db4949e88f11d26b9867056caacd
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen 
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
 2019-05-21 22:51:41 +01:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
7174830279 fmt 
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
 2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7 Added chonks 
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
 2019-05-17 18:44:30 +01:00
Joshua Barretto
5092df0e7f Improved quadruped origin 
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
 2019-05-15 17:06:58 +01:00
Joshua Barretto
54cc9e137a fmt 
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
 2019-05-09 18:58:16 +01:00
Joshua Barretto
cf4e02252a Smartened up terrain generation 
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
 2019-05-09 18:57:47 +01:00
Joshua Barretto
94fd0b1a22 Fixed running animation, changed movement physics 
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
 2019-05-09 18:57:47 +01:00
Joshua Barretto
2e3288cc29 Adjusted view distance and worldgen 
Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
 2019-05-09 18:57:47 +01:00
Joshua Barretto
9ebe3c3e6f Added a delta time cap to avoid missing important physics events 
Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
 2019-05-09 18:57:47 +01:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs 
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
 2019-04-29 20:43:04 +02:00
Pfauenauge
d7be49def1 Minimap changes, grass colour adjusted 
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
 2019-04-25 23:43:32 +02:00
Joshua Barretto
a66cc98a03 Mildly better worldgen 
Former-commit-id: e8d77b75b164611ccfd144b1d6e6d6c5e396e515
 2019-04-25 17:52:11 +01:00
Joshua Barretto
fc8b7e9750 Worked on improving networking and terrain 
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df Added raycasting (needs testing) and basic character terrain collision 
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f4260706e6 Updated package versions 
Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
f27b5fa975 Added server-side chunk generation 
Former-commit-id: 72e02f8ec711ec4fac3111b591c4b08086dee4e3
 2019-04-14 14:23:43 +01:00
Joshua Barretto
c16a257ae3 Added server-cli, UI tests 
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
 2019-01-30 12:11:34 +00:00
Joshua Barretto
8a37662cf0 Cleaned up codebase, added cursor grab toggle 2019-01-23 22:21:47 +00:00
Joshua Barretto
248577bdef Added test terrain loading and meshing 2019-01-23 20:01:58 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +00:00