Commit Graph

1118 Commits

Author SHA1 Message Date
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
132d1a67a6 Merge branch 'zesterer-worldgen-stuff' into 'master'
Worldgen stuff

See merge request veloren/veloren!217
2019-06-16 10:46:59 +00:00
Joshua Barretto
8a490a6456 Merge branch '134-merge-all-spawning-commands-into-one' into 'master'
Resolve "Merge all spawning commands into one"

Closes #134

See merge request veloren/veloren!237
2019-06-16 10:45:54 +00:00
Joshua Barretto
76344d142e Added clouds 2019-06-15 18:23:01 +01:00
liids
e670f9b126 small fixes 2019-06-15 17:23:53 +02:00
Joshua Barretto
4da01fba9a Fixed world viewer stack overflow on Windows 2019-06-15 15:50:54 +01:00
liids
bcf7127736 make it more laconic 2019-06-15 15:42:39 +02:00
liids
6670c2b8fa fix formatting 2019-06-15 14:55:06 +02:00
Joshua Barretto
73e999af87 Stopped printing chunk location every frame 2019-06-15 13:44:50 +01:00
Joshua Barretto
bab7746a8a Updated and fixed world viewer example 2019-06-15 13:34:28 +01:00
liids
8b2b931c17 make minimum spawn amount higher than 0 2019-06-15 14:30:05 +02:00
liids
f726d755b7 fix formatting 2019-06-15 13:48:14 +02:00
Joshua Barretto
a9d30bbfb6 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
liids
cca41a3333 fix negative spawn amounts 2019-06-15 11:32:07 +02:00
liids
b733f9739d Merge branch 'master' of https://gitlab.com/liids/veloren 2019-06-15 11:15:10 +02:00
liids
2cc2a36be2 make amount optional 2019-06-15 10:22:36 +02:00
liids
c859371ddb Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Joshua Barretto
4179125133 Merge branch 'toolchain-file' into 'master'
Automatic nightly toolchain selection

See merge request veloren/veloren!236
2019-06-14 12:49:29 +00:00
Mckol
d9234fdb12 Added the rust-toolchain file which automatically sets the toolchain to nightly for cargo users 2019-06-14 14:38:43 +02: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
Monty Marz
9f5fe0231f palette changes 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
e7649e1db4 small fixes 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
581c4d0e3b Fixed frustum culling efficiency bug 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
c445e76afa Fixed usize size issue for 32-bit platforms 2019-06-13 11:59:05 +01:00
Joshua Barretto
3285fc9b88 Added sampler clearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
cf193a97c4 Set default case for block type opacity 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
Imbris
d449972bc4 Merge branch 'slipped-animation-warnings' into 'master'
cleared out unused animation variables

See merge request veloren/veloren!233
2019-06-13 05:40:24 +00:00
jshipsey
99b4406d79 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Marcel
9783ff56e8 Merge branch 'midge/mouse-sensitivity' into 'master'
Better Settings

Closes #142 and #132

See merge request veloren/veloren!216
2019-06-12 13:12:46 +00:00
Timo Koesters
99a1f153fb Merge branch 'timo-cleanup' into 'master'
Cleanup

See merge request veloren/veloren!226
2019-06-11 07:00:46 +00:00
timokoesters
2ca0c62654
Cleanup 2019-06-10 22:44:03 +02:00
Cody
7b1258dc72 Merge branch 'imbris/clock_changes' into 'midge/mouse-sensitivity'
Use Instant and running compensation in Clock

See merge request veloren/veloren!222
2019-06-10 13:13:58 +00:00