2636 Commits

Author SHA1 Message Date
Joshua Barretto
9491ac332f Stronger moonlight 2019-11-19 20:43:41 +00:00
Joshua Barretto
ff49de772f Smoother water at distance, fixed warnings 2019-11-19 19:22:56 +00:00
Joshua Barretto
3cf34c24b6 Fixed cloud shader banding issue 2019-11-19 19:09:22 +00:00
Joshua Barretto
b883e298c3 Fixed dense cloud void issue 2019-11-19 19:09:22 +00:00
Joshua Barretto
26e02e1ecb Split terrain rendering to avoid redrawing skybox 2019-11-19 19:09:22 +00:00
Joshua Barretto
c347bd98df Massive performance boost for clouds, fixed reflection misprojection bug 2019-11-19 19:09:22 +00:00
Joshua Barretto
293ff28f09 Removed cloud sampler early return 2019-11-19 19:09:22 +00:00
Joshua Barretto
f858709a97 Fixed close cloud precision noise 2019-11-19 19:09:22 +00:00
Joshua Barretto
93320ce25a Fixed passthrough reduction curve 2019-11-19 19:09:22 +00:00
Joshua Barretto
0ccb1ecef9 Cleanup and speedup 2019-11-19 19:09:22 +00:00
Joshua Barretto
0fc2417b1b Better passthrough calculation 2019-11-19 19:09:22 +00:00
Joshua Barretto
b69dc3d93e Improved cloud precision from internal perspective 2019-11-19 19:09:22 +00:00
Joshua Barretto
1db3aad82c Better precision cloud sampling and moon halo highlight 2019-11-19 19:09:22 +00:00
Joshua Barretto
f1e5560bdd Made clouds render over terrain 2019-11-19 19:09:22 +00:00
Joshua Barretto
c76bb6c8a7 Better water transparency 2019-11-19 19:09:22 +00:00
Joshua Barretto
d9e3172727 Prevent sun/moon terrain overlap 2019-11-19 19:09:22 +00:00
Joshua Barretto
c7ffc3e2ad Prevented cloud overlap on terrain 2019-11-19 19:09:22 +00:00
Joshua Barretto
ecf6457c40 Fixed hill colour blending 2019-11-19 19:09:22 +00:00
Joshua Barretto
fee51a15b4 Faster cloud reflections 2019-11-19 19:09:22 +00:00
Joshua Barretto
61cfcf4c8b Faster clouds, better water 2019-11-19 19:09:22 +00:00
Joshua Barretto
e9d01da358 Faster and more visually pleasing clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
2c5d21ddf5 Added clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
07262fa399 Prevented the moon rising/setting too early/late 2019-11-19 19:09:22 +00:00
Joshua Barretto
9aa2bfe591 Better moonlight 2019-11-19 19:09:22 +00:00
Joshua Barretto
7af96e4655 Added moon 2019-11-19 19:09:22 +00:00
Marcel
334048a3ad Merge branch 'newcache' into 'master'
switch to new caching inside docker, described at:...

See merge request veloren/veloren!655
2019-11-18 16:18:43 +00:00
Marcel Märtens
2617146512 switch to new caching inside docker, described at: https://gitlab.com/veloren/veloren-docker-ci/merge_requests/8
we need to ln target to /dockercache/veloren/target in order for the cace to take affect, the old caching info is no longer needed inside .gitlab-ci.yml
2019-11-18 12:11:54 +01:00
Marcel
477cf84d3c Merge branch 'fixci' into 'master'
fix a ci problem if debug dir wasnt available

See merge request veloren/veloren!652
2019-11-14 09:07:29 +00:00
Marcel Märtens
81f61eff7c fix a ci problem if debug dir wasnt available 2019-11-14 09:33:16 +01:00
Marcel
6c04b7e3ba Merge branch 'checkci' into 'master'
more debug stuff in ci

See merge request veloren/veloren!651
2019-11-14 00:56:59 +00:00
Marcel Märtens
51758a263d more debug stuff in ci 2019-11-14 01:24:08 +01:00
Joshua Barretto
8f4b5904b1 Merge branch 'zesterer/better-water' into 'master'
Better water

See merge request veloren/veloren!643
2019-11-12 14:55:54 +00:00
Forest Anderson
54640f63ba Merge branch 'xacrimon/strip-ci' into 'master'
Strip Linux executables generated by CI

See merge request veloren/veloren!644
2019-11-11 18:38:23 +00:00
Timo Koesters
ff10e7a034 Merge branch 'conditional-animations' into 'master'
Make character anims conditional by Tool held

See merge request veloren/veloren!649
2019-11-11 18:32:14 +00:00
Acrimon
a75b2da491 Strip linux executables. 2019-11-11 12:52:27 -05:00
Forest Anderson
4f03133950 Merge branch 'qwertycrackers' into 'master'
Add a `debug_items` chat command that gives all debug items.

See merge request veloren/veloren!641
2019-11-11 17:36:31 +00:00
Adam Whitehurst
c5c42e3755 Remove unnecessary elided lifetimes 2019-11-11 08:26:44 -08:00
Adam Whitehurst
b8a291a3dd Make character anims conditional by Tool held 2019-11-10 15:36:47 -08:00
Acrimon
996b5057af Merge branch 'login_desc' into 'master'
Login desc

See merge request veloren/veloren!647
2019-11-09 23:19:41 +00:00
Monty Marz
24e9cf702d Login desc 2019-11-09 23:19:41 +00:00
Monty Marz
08655ed9dc Merge branch 'pfauenauge/assets' into 'master'
Pfauenauge/assets

See merge request veloren/veloren!646
2019-11-09 13:42:42 +00:00
Monty Marz
1cf4e4be11 assets update
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
2019-11-09 13:42:42 +00:00
Justin Shipsey
9fbfc2fdfc Merge branch 'shandley/disconnection-kick-warnings' into 'master'
Network timeout updates and singleplayer UI improvements

Closes #25

See merge request veloren/veloren!599
2019-11-07 02:06:05 +00:00
Joseph Gerardot
e16431d990
Cargo fmt 2019-11-06 20:57:05 -05:00
timokoesters
5430cafabf fix: show error on client failure again 2019-11-07 09:42:03 +09:00
Joseph Gerardot
4bf5bed14e
Don't use the actual multiline doc comment syntax. 2019-11-06 18:02:58 -05:00
Joseph Gerardot
9e40b49b9b
Respond to MR feedback.
Mainly clean up code with better use of iterators, and rename the debug
    command to be just `debug`.
2019-11-06 17:57:54 -05:00
Shane Handley
6ed33fa875
Add a TODO regarding the future plan for the connection timeout setting. 2019-11-06 21:34:19 +01:00
Shane Handley
8bc53693e1
Re-add the metrics port logging which was lost in the merge. 2019-11-06 21:34:19 +01:00
Shane Handley
d6785da21b
Ignore warning about variant never being constructed. It's being used
elsewhere. Not sure why that isn't being picked up.
2019-11-06 21:34:19 +01:00