1092 Commits

Author SHA1 Message Date
Pfauenauge90
22e0dbe227 tree stumps, shorter pines 2019-06-13 11:59:05 +01:00
Joshua Barretto
00e970bbeb Tweaked lighting and AO 2019-06-13 11:59:05 +01:00
Joshua Barretto
777e3242fd Bluer snow, altered rock colour 2019-06-13 11:59:05 +01:00
Joshua Barretto
9f31c01f43 Added more terrain noise, better snow 2019-06-13 11:59:05 +01:00
Joshua Barretto
f7572723a1 More trees, adjusted camera tilt 2019-06-13 11:59:05 +01:00
Joshua Barretto
dea90646e9 Simpler cliffs, camera tilt 2019-06-13 11:59:05 +01:00
Monty Marz
0ea0fafc52 Tree fixes 2019-06-13 11:59:05 +01:00
Joshua Barretto
ee74c99177 Crazy cliffs 2019-06-13 11:59:05 +01:00
Joshua Barretto
caacf78708 Reduced peak scale 2019-06-13 11:59:05 +01:00
Joshua Barretto
b428c2c22e Adjusted mountain steepness 2019-06-13 11:59:05 +01:00
Joshua Barretto
6cf5ea4db1 Rescaled mountains 2019-06-13 11:59:05 +01:00
Joshua Barretto
41b02e6a43 Fixed frustum culling efficiency bug 2019-06-13 11:59:05 +01:00
Joshua Barretto
6e66c1a23f Major worldgen structural refactor 2019-06-13 11:59:05 +01:00
Joshua Barretto
4d1d730ebf Fixed usize size issue for 32-bit platforms 2019-06-13 11:59:05 +01:00
Joshua Barretto
4d7972a046 Added sampler clearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
a8ee4418b7 Set default case for block type opacity 2019-06-13 11:59:05 +01:00
Joshua Barretto
2317098e25 Prevented rock smearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
b0f415c2a2 Separated sampler code from simulation code 2019-06-13 11:59:05 +01:00
Imbris
58cb0c10d4 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
44481cf0b7 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Marcel
6a4fe52a85 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
f263984b54 Merge branch 'timo-cleanup' into 'master'
Cleanup

See merge request veloren/veloren!226
2019-06-11 07:00:46 +00:00
timokoesters
bcb7bae955
Cleanup 2019-06-10 22:44:03 +02:00
Cody
e90f16d237 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
Timo Koesters
9c41c57728 Merge branch 'songtronix/fix-macos-crash' into 'master'
Resolve "MacOS Crash: Invalid call of undeclared identifier texture2D"

Closes #151

See merge request veloren/veloren!221
2019-06-09 19:41:44 +00:00
Songtronix
80df81e4cb Replace texture2D with texture to fix MacOS crash 2019-06-09 20:20:29 +02:00
Imbris
7f8415a8a0 Use Instant and running compensation in clock 2019-06-09 14:14:02 -04:00
Cody
62281ac4c3
Amends a variable name. 2019-06-08 20:09:30 -04:00
Cody
ab39e00d8c
Enhances deserialization so settings which are missing are added with default values. 2019-06-08 19:35:23 -04:00
Cody
6b3786234b
Amends the suggested 1 FPS option to 15 to prevent accidental session crashes. 2019-06-08 12:23:58 -04:00
Cody
c2dbc88bdc
Changes the fallback slider value to a safe one. 2019-06-08 12:23:58 -04:00
Cody
50a0ce4314
Allows selection of an unstable 1 FPS option. 2019-06-08 12:23:58 -04:00
Cody
b6f048f843
Adds an FPS setting and slider. 2019-06-08 12:23:58 -04:00
Monty Marz
f5928dd7cc
Configurable max fps 2019-06-08 12:23:57 -04:00
Cody
ea544d4746
Changes setting type to u32, enforces live in-game updates to setting. 2019-06-08 12:23:57 -04:00
Cody
e7eb31908b
Adds mouse sensitivity sliders that update settings file. 2019-06-08 12:23:45 -04:00
Forest Anderson
e439c63138 Merge branch 'timokoesters/fix-settings' into 'master'
Ungrab mouse when closing settings with X

See merge request veloren/veloren!219
2019-06-07 20:28:17 +00:00
timokoesters
f1b9b1215c
Ungrab mouse when closing settings with X 2019-06-07 22:23:06 +02:00
Joshua Barretto
3b8df32991 Merge branch 'midge/reduce-warnings' into 'master'
Reduce warnings

See merge request veloren/veloren!204
2019-06-06 14:48:41 +00:00
Cody
68d3642b3a 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
310e0559fd Merge branch 'chonk-fixes' into 'master'
Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base

See merge request veloren/veloren!211
2019-06-06 11:38:58 +00:00
Joshua Barretto
ff5a6b9bcb Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
1e0f90058b Smoothed fog VD opening 2019-06-06 11:09:25 +01:00
Joshua Barretto
1feff6c5aa Added frustum culling for chunks 2019-06-06 10:04:37 +01:00
Joshua Barretto
77a3b47bda Only draw chunks outside of fog boundary, reduce fog strength 2019-06-06 08:13:58 +01:00
Joshua Barretto
d7d51e1810 Made idx_for use idx_for_unchecked internally 2019-06-06 07:42:59 +01:00
Joshua Barretto
5a3a88553a Comment cleanup 2019-06-06 06:46:02 +01:00
Joshua Barretto
c991b840cc Fixed mountain generation limits chonk bug 2019-06-05 22:38:43 +01:00
Joshua Barretto
dcbb51ea9b Fewer caves on mountains 2019-06-05 21:40:47 +01:00
Joshua Barretto
888518bb5c Fixed caves again 2019-06-05 21:33:06 +01:00