2671 Commits

Author SHA1 Message Date
Marcel
556bd4c5ea Merge branch 'inputs-enhancements' into 'master'
Inputs enhancements

See merge request veloren/veloren!671
2019-11-29 15:20:35 +00:00
Adam Whitehurst
3cc69f0e58 Inputs enhancements 2019-11-29 15:20:35 +00:00
Monty Marz
c7afbd2dd6 Merge branch 'pfau/assets' into 'master'
Set overflow checks to 'false' for release builds in order to bandaid fix recent master error

See merge request veloren/veloren!670
2019-11-28 13:32:38 +00:00
Monty Marz
c05f63d55a Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
9866e41162 Merge branch 'pfau/assets' into 'master'
Fix map being inverted and indicator positioning

See merge request veloren/veloren!669
2019-11-26 22:39:07 +00:00
Monty Marz
9981287084 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
Marcel
c78974f0f2 Merge branch 'fixci' into 'master'
remove option to build debug builds, because they are not needed and to reduce caches

See merge request veloren/veloren!666
2019-11-25 08:59:36 +00:00
Marcel Märtens
0ab8b8095c remove option to build debug builds, because they are not needed and to reduce caches 2019-11-25 01:10:06 +01:00
Monty Marz
0208ab80a2 Merge branch 'region-name-display-fix' into 'master'
Region name display fix

See merge request veloren/veloren!665
2019-11-24 16:45:13 +00:00
Monty Marz
c93d0dfe2d Region name display fix 2019-11-24 16:45:13 +00:00
Songtronix
49f277b404 Merge branch 'songtronix/update-msgbox' into 'master'
upgrade msgbox

Closes #370

See merge request veloren/veloren!664
2019-11-24 13:03:38 +00:00
Songtronix
ba2e0fbbbf upgrade(dep): msgbox
Fix: FreeBSD compilation
2019-11-24 08:49:14 +01:00
Songtronix
77cf8eb09f Merge branch 'shandley/sfx-system' into 'master'
SFX events

See merge request veloren/veloren!653
2019-11-23 08:26:39 +00:00
S Handley
1c607c0a0c SFX system
This is an event based approach to SFX sounds. There is a specific
character sound event mapper which determines sfx to play based on
character or NPC state, as well as emitting sfx events for
non-character-triggers such as levelling up.
2019-11-23 08:26:39 +00:00
Monty Marz
2fabf10758 Merge branch 'pfau/assets' into 'master'
Loading Screen with pulsating text, 2 new hairstyles

See merge request veloren/veloren!662
2019-11-23 00:51:18 +00:00
Monty Marz
b33d5d8de4 Loading Screen with pulsating text, 2 new hairstyles 2019-11-23 00:51:18 +00:00
Joshua Barretto
5acab9c0e3 Merge branch 'songtronix/fix-logging' into 'master'
fix logging

Closes #317 and #318

See merge request veloren/veloren!589
2019-11-22 21:43:50 +00:00
Songtronix
4e76775c99 change(deps): enforce crossbeam version 2019-11-22 19:12:58 +01:00
Songtronix
ccd2edf01b adjust logging level 2019-11-22 19:12:58 +01:00
Songtronix
eaebca7880 feat(log): add date to log file 2019-11-22 19:12:58 +01:00
Songtronix
92a69d2ca7 change(log): remove all spam from logging 2019-11-22 19:12:58 +01:00
Songtronix
ba0fbe631e change(log): switch to fern 2019-11-22 19:12:58 +01:00
Justin Shipsey
783c6d2604 Merge branch 'telastrus/underwater-jump' into 'master'
Jump while underwater

See merge request veloren/veloren!661
2019-11-22 14:23:47 +00:00
telastrus
e24f7954f2 jump while underwater 2019-11-21 23:56:07 -05:00
Marcel
392f050137 Merge branch 'fixci' into 'master'
Fixci

See merge request veloren/veloren!660
2019-11-21 20:06:47 +00:00
Marcel Märtens
1066764ea0 tarpaulin fails because it cannot parse Cargo.toml, somehow removing these lines makes tarpaulin run again, so we use it as a workaround/quickfix 2019-11-21 20:18:13 +01:00
Marcel Märtens
6c9dcefbb0 Simplyfy builds and checks,
when doing 2 builds, rust recompiles alot files and doesnt cache them, this is avoided by just call cargo build instead
2019-11-21 20:18:12 +01:00
Marcel Märtens
403c829e59 use gold linker instead of cc which is rust default for linux, which increases Compilcation by about 30% 2019-11-21 20:18:10 +01:00
Marcel Märtens
252f766801 introduce custom-profiles 2019-11-21 20:18:09 +01:00
Marcel Märtens
6babd428a7 add tarpaulin coverage 2019-11-21 20:18:08 +01:00
Marcel Märtens
5c83a2969b simplify before-script 2019-11-21 20:18:06 +01:00
Marcel Märtens
ecca47a7b7 make cargo check less verbose 2019-11-21 20:18:05 +01:00
Joshua Barretto
d8aded2471 Merge branch 'zesterer/clouds' into 'master'
Moon and clouds

See merge request veloren/veloren!658
2019-11-20 12:00:57 +00:00
Joshua Barretto
2b6d65062c Prevented chunk load popping with smooth view distance growth 2019-11-20 10:38:11 +00:00
Joshua Barretto
42748c262d Non-linear depth buffer 2019-11-20 09:59:27 +00:00
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