Songtronix
35b4098b16
Merge branch 'shandley/footsteps-grass' into 'master'
...
Update footsteps SFX
Closes #374
See merge request veloren/veloren!676
2019-12-08 10:03:40 +00:00
S Handley
11dd6b8090
Update footsteps SFX
2019-12-08 10:03:40 +00:00
Acrimon
3e2fe36a8c
Merge branch 'treeco/invert-mouse-setting' into 'master'
...
Added mouse inversion setting
Closes #376
See merge request veloren/veloren!677
2019-12-06 23:24:55 +00:00
Treeco
d88376f365
Added mouse inversion setting
2019-12-06 23:00:02 +00:00
Acrimon
ea6374b1e4
Merge branch 'refactor-controller-movement-states' into 'master'
...
Refactor controller movement states
See merge request veloren/veloren!672
2019-12-03 06:30:09 +00:00
Adam Whitehurst
92d99af53c
feat: weapon-type dependent wield and attack durations
...
also some controller.rs cleanup
2019-12-03 06:30:08 +00:00
Forest Anderson
1da30875c0
Merge branch 'revert-a2cfc4ba' into 'master'
...
Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'"
See merge request veloren/veloren!674
2019-12-01 22:26:16 +00:00
Forest Anderson
f840e49e72
Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'"
...
This reverts merge request !650
2019-12-01 22:12:26 +00:00
Forest Anderson
a2cfc4bae8
Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'
...
Added audio compression job for CI
See merge request veloren/veloren!650
2019-12-01 21:16:55 +00:00
Forest Anderson
14eebd930d
Added audio compression job for CI
2019-12-01 21:16:55 +00:00
Marcel
c0ae12452e
Merge branch 'treeco/fp-view-height' into 'master'
...
Made the first person camera follow race heights, plus minor zoom changes
See merge request veloren/veloren!673
2019-12-01 20:56:33 +00:00
Treeco
7c17c45f47
made first person camera follow race heights, minor zoom chances
2019-12-01 19:05:28 +00:00
Marcel
a6ef802f9c
Merge branch 'inputs-enhancements' into 'master'
...
Inputs enhancements
See merge request veloren/veloren!671
2019-11-29 15:20:35 +00:00
Adam Whitehurst
4e574cb29a
Inputs enhancements
2019-11-29 15:20:35 +00:00
Monty Marz
b7a084cbb8
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
d0b7891a34
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
d374e8e673
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
040e1a7535
Fix map being inverted and indicator positioning
2019-11-26 22:39:07 +00:00
Marcel
3f36118886
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
203d76a550
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
6c13ab8707
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
b3eb0b270f
Region name display fix
2019-11-24 16:45:13 +00:00
Songtronix
6930951ffb
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
fa93e35861
upgrade(dep): msgbox
...
Fix: FreeBSD compilation
2019-11-24 08:49:14 +01:00
Songtronix
9de10759d1
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
ea2e0d17de
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
01aa89a0c3
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
370e94b1ad
Loading Screen with pulsating text, 2 new hairstyles
2019-11-23 00:51:18 +00:00
Joshua Barretto
b804c18eb0
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
e885a78deb
change(deps): enforce crossbeam version
2019-11-22 19:12:58 +01:00
Songtronix
2f93dd2c38
adjust logging level
2019-11-22 19:12:58 +01:00
Songtronix
bdcea57201
feat(log): add date to log file
2019-11-22 19:12:58 +01:00
Songtronix
bb64c8ed76
change(log): remove all spam from logging
2019-11-22 19:12:58 +01:00
Songtronix
7abf2a0fb9
change(log): switch to fern
2019-11-22 19:12:58 +01:00
Justin Shipsey
8ef5709c1b
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
10d6f3e8b3
jump while underwater
2019-11-21 23:56:07 -05:00
Marcel
905b3ac129
Merge branch 'fixci' into 'master'
...
Fixci
See merge request veloren/veloren!660
2019-11-21 20:06:47 +00:00
Marcel Märtens
1093d51c41
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
e0d5376852
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
b44792c83d
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
4123de5842
introduce custom-profiles
2019-11-21 20:18:09 +01:00
Marcel Märtens
67b589b3c9
add tarpaulin coverage
2019-11-21 20:18:08 +01:00
Marcel Märtens
5609031391
simplify before-script
2019-11-21 20:18:06 +01:00
Marcel Märtens
22ec19ec55
make cargo check less verbose
2019-11-21 20:18:05 +01:00
Joshua Barretto
f380af930f
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
3a5c69a314
Prevented chunk load popping with smooth view distance growth
2019-11-20 10:38:11 +00:00
Joshua Barretto
8745d0a3af
Non-linear depth buffer
2019-11-20 09:59:27 +00:00
Joshua Barretto
c60799de3d
Stronger moonlight
2019-11-19 20:43:41 +00:00
Joshua Barretto
9993a4c81a
Smoother water at distance, fixed warnings
2019-11-19 19:22:56 +00:00
Joshua Barretto
7ad22c647d
Fixed cloud shader banding issue
2019-11-19 19:09:22 +00:00
