1075 Commits

Author SHA1 Message Date
Mckol
6f39f30630 Added the rust-toolchain file which automatically sets the toolchain to nightly for cargo users 2019-06-14 14:38:43 +02: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
Joshua Barretto
3eea6c420f Upped cave frequency 2019-06-05 21:07:36 +01:00
Joshua Barretto
851b60db25 Changed debug flag in client 2019-06-05 20:52:51 +01:00
Joshua Barretto
8602f2dd0b Made character the centre of the fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
5b55fe1be0 Reduced tree density, shortened chunk load timeout 2019-06-05 20:52:51 +01:00
Joshua Barretto
fa66095742 Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
ca4a0e7bc1 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
672275633c Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Joshua Barretto
bdc9a3c731 Tweaked mountain base scale 2019-06-05 20:52:51 +01:00
Joshua Barretto
a49e061c7b Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
db5524a21a Deferred normal unpacking to the terrain fragment shader 2019-06-05 20:52:51 +01:00
Joshua Barretto
130cbca49a fmt 2019-06-05 20:52:51 +01:00
Joshua Barretto
f3464b36b9 Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Joshua Barretto
9c1ac23095 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
18f3fa26e3 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
3df8113a5b Merge branch 'update-cpal' into 'better-physics'
Update cpal

See merge request veloren/veloren!212
2019-06-05 17:17:58 +00:00
Louis Pearson
f06fd808ba Update cpal 2019-06-05 13:17:19 -04:00
Louis Pearson
a4dc7d8058 Update cpal 2019-06-04 13:18:59 -06:00