Commit Graph

4927 Commits

Author SHA1 Message Date
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
Timo Koesters
608aedbadf 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
2f1021f955 Replace texture2D with texture to fix MacOS crash 2019-06-09 20:20:29 +02:00
Imbris
8dcf030bd8 Use Instant and running compensation in clock 2019-06-09 14:14:02 -04:00
Cody
ea207b911a
Amends a variable name. 2019-06-08 20:09:30 -04:00
Cody
b180f89104
Enhances deserialization so settings which are missing are added with default values. 2019-06-08 19:35:23 -04:00
Cody
026ac32972
Amends the suggested 1 FPS option to 15 to prevent accidental session crashes. 2019-06-08 12:23:58 -04:00
Cody
e18947eed1
Changes the fallback slider value to a safe one. 2019-06-08 12:23:58 -04:00
Cody
24f7323d04
Allows selection of an unstable 1 FPS option. 2019-06-08 12:23:58 -04:00
Cody
527f33a778
Adds an FPS setting and slider. 2019-06-08 12:23:58 -04:00
Monty Marz
8a19a6f2a3
Configurable max fps 2019-06-08 12:23:57 -04:00
Cody
41f3cd5803
Changes setting type to u32, enforces live in-game updates to setting. 2019-06-08 12:23:57 -04:00
Cody
a90d073c22
Adds mouse sensitivity sliders that update settings file. 2019-06-08 12:23:45 -04:00
Forest Anderson
eb83040af3 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
037fcfe5da
Ungrab mouse when closing settings with X 2019-06-07 22:23:06 +02:00
Joshua Barretto
3347c54dbb Merge branch 'midge/reduce-warnings' into 'master'
Reduce warnings

See merge request veloren/veloren!204
2019-06-06 14:48:41 +00: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
5c812a73bc 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
afd983f6f8 Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
427339cc9a Smoothed fog VD opening 2019-06-06 11:09:25 +01:00
Joshua Barretto
8da46b48ac Added frustum culling for chunks 2019-06-06 10:04:37 +01:00
Joshua Barretto
66cd8de0e1 Only draw chunks outside of fog boundary, reduce fog strength 2019-06-06 08:13:58 +01:00
Joshua Barretto
1b5d2d468b Made idx_for use idx_for_unchecked internally 2019-06-06 07:42:59 +01:00
Joshua Barretto
eb2d1f3278 Comment cleanup 2019-06-06 06:46:02 +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
4ada144164 Changed debug flag in client 2019-06-05 20:52:51 +01:00
Joshua Barretto
d663da27b5 Made character the centre of the fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
732ba9ac02 Reduced tree density, shortened chunk load timeout 2019-06-05 20:52:51 +01:00
Joshua Barretto
76dca0b0cf Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
9da2d82197 Added proper VD fog 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
478cc24c91 Deferred normal unpacking to the terrain fragment shader 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
910eccee82 Merge branch 'better-physics' into 'master'
FPS independent physics

See merge request veloren/veloren!168
2019-06-05 19:51:18 +00:00
Forest Anderson
58c783ee2e Merge branch 'midge/emergency-cherry-pick' into 'master'
Update cpal

See merge request veloren/veloren!213
2019-06-05 17:31:17 +00:00
Forest Anderson
6fab77bf7e Merge branch 'update-cpal' into 'better-physics'
Update cpal

See merge request veloren/veloren!212
2019-06-05 17:17:58 +00:00