Louis Pearson
0437f88601
Prevent audio crashes by blocking jack by default
...
Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63
2019-05-21 16:44:51 -06:00
Louis Pearson
ee6ec2d299
Continue implementing audio device selection
...
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
2019-05-21 16:44:51 -06:00
Louis Pearson
8dc35b8609
Add audio to settings
...
Former-commit-id: 6e18b95bb3460a3b6d971b89c767045dcdbe7344
2019-05-21 16:44:51 -06:00
Louis Pearson
50fc7549b9
Add baby steps for audio device choice support
...
Former-commit-id: 8c1d623b2a28997e7705ba2775b382b38e9a34ed
2019-05-21 16:44:51 -06:00
Louis Pearson
7cfd3ad1cd
Add field_grazing.ogg
...
Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b
2019-05-21 16:44:51 -06:00
Joshua Barretto
ff5d7c7d65
Merge branch 'mega-worldgen' into 'master'
...
Proper worldgen
See merge request veloren/veloren!146
Former-commit-id: c823999ad7605f5d06907af4f1382acffcd99fa5
2019-05-21 22:42:56 +00:00
Joshua Barretto
fc25dc8c7f
fmt
...
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
2019-05-21 23:31:38 +01:00
Joshua Barretto
a696847f67
Fixed singleplayer failure caused by worldgen
...
Former-commit-id: a2fdb56682922694b32e4d25890afa7a90c5b923
2019-05-21 23:31:17 +01:00
Joshua Barretto
0c78264ebc
Added spawn point
...
Former-commit-id: 04ea38df61d3610d679368166de220243ef1bfba
2019-05-21 23:04:39 +01:00
Joshua Barretto
8909a4220f
Added water, beaches, craggs
...
Former-commit-id: 0213bbac23cf01df31896461d0cdda3b0ee708dc
2019-05-21 22:51:41 +01:00
Joshua Barretto
dcd2b4392d
Added rocks, improved hills
...
Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03
2019-05-21 22:51:41 +01:00
Joshua Barretto
feece604be
Restarted worldgen
...
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 22:51:41 +01:00
Joshua Barretto
5118da0e0e
Added rivers, improved mountains
...
Former-commit-id: c1b76c54d2aa8f0616c26b0724fe34c0d80ac4fd
2019-05-21 22:51:41 +01:00
Joshua Barretto
a0dfa3fddc
Added basic mountain/valley worldgen
...
Former-commit-id: 5a45f18fcdf523841ee8433ba2ff0b8765eadf3a
2019-05-21 22:51:41 +01:00
Joshua Barretto
2996e3c8aa
Made the edges of the world be empty
...
Former-commit-id: 51a3315a3b00d28c87c6364d83e32d180f4f8e18
2019-05-21 22:51:41 +01:00
Joshua Barretto
0a12147855
Fixed semicolon typo
...
Former-commit-id: 30dbac1bccde7a5c8ebce015e04df66e9d64f1b1
2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d
Basic worldgen
...
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
2019-05-21 22:51:41 +01:00
Joshua Barretto
2548c1c31f
Added worldsim API, ticking
...
Former-commit-id: 50a63e44557c634f2b39ef7a580cdbeec5ed0d70
2019-05-21 22:51:41 +01:00
Joshua Barretto
5b055f54a5
Less noisy worldgen
...
Former-commit-id: f1df6cc5b170db4949e88f11d26b9867056caacd
2019-05-21 22:51:41 +01:00
Joshua Barretto
b48b9f0141
Attempted fix of deltatime bug
...
Former-commit-id: d287bbf541dd318a7034f1e3ad4d9a167ac3c344
2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0
Added mega worldgen
...
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
2019-05-21 22:51:41 +01:00
Imbris
591ecac702
Merge branch 'create-config-dir' into 'master'
...
Create config dir if needed
Closes #93
See merge request veloren/veloren!158
Former-commit-id: 2b3ee7d9523148e5946276e801d6b5f96d01c232
2019-05-21 05:06:15 +00:00
Louis Pearson
7dc087fe93
Create config dir if needed
...
Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018
2019-05-20 15:32:16 -06:00
Marcel
9a31c20662
Merge branch 'remove-net-settings-singleplayer' into 'master'
...
Stop saving singleplayer settings to network settings
See merge request veloren/veloren!157
Former-commit-id: 77ee0dad47bd0af10497d3db0d5a196e51d6211d
2019-05-20 21:16:05 +00:00
Louis Pearson
8de6d5ad3d
Stop saving singleplayer settings to network settings
...
Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2
2019-05-20 15:05:09 -06:00
Joshua Barretto
914ed1242d
Merge branch 'audio-volume-slider' into 'master'
...
Audio volume slider
See merge request veloren/veloren!154
Former-commit-id: e65ea111e788f5b4896ec6c256a702073020d1ab
2019-05-19 21:55:17 +00:00
Imbris
39caf7e51b
Don't allow negative volumes
...
Former-commit-id: 35a52235fa4194d40ffc0d8d3243d0653dcca0a5
2019-05-19 17:50:20 -04:00
Imbris
888bd65036
Add volume adjustment, lower default volume
...
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
2019-05-19 15:31:32 -04:00
Pfauenauge
13e916d485
visuals in settings - audio
...
Former-commit-id: 51bfcdcbed1d8254c966e7a92a472b585ff61c01
2019-05-19 19:35:40 +02:00
Joshua Barretto
0a9d7d68d5
Merge branch 'VD-Slider' into 'master'
...
View distance slider
See merge request veloren/veloren!152
Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0
2019-05-19 01:10:42 +00:00
Joshua Barretto
c40aaab69b
Added VD argument to chat-cli
...
Former-commit-id: 5feffb0877c531742a1a440bd5f9f2297098ff56
2019-05-19 02:06:34 +01:00
Joshua Barretto
3508e4afcb
Added view distance configuration
...
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
2019-05-19 01:45:02 +01:00
Imbris
0349461533
Pass up Vd slider changes to session.rs & fmt
...
Former-commit-id: 187a3d286e288d2159fcde292f78e2bc08ec796b
2019-05-18 19:55:06 -04:00
Pfauenauge
78173b4bce
added slider
...
Former-commit-id: c01a2601365c9d4d4b03e58ca33d91469cfbba0f
2019-05-19 01:22:30 +02:00
Joshua Barretto
47502b8a7b
Merge branch 'new_keys' into 'master'
...
Added Keys for Fullscreen, Screenshots, and the Debug Window
See merge request veloren/veloren!151
Former-commit-id: 287a6b6582e3f5fb13a5d220f6648de5e4f50baa
2019-05-18 23:11:36 +00:00
Imbris
4f970b63ef
fix screen shot flipping
...
Former-commit-id: 47ed01cd5f91445d1367121d939c01876008f643
2019-05-18 19:09:23 -04:00
Imbris
7855dfe52f
Add screenshot, fullscreen, & debug keys
...
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
2019-05-18 17:16:35 -04:00
Imbris
9e9e8be196
Tweak settings change event handling in hud
...
Former-commit-id: 7b9a3163f2e85d202ef295cf6bd63de3ce753640
2019-05-18 17:09:03 -04:00
Joshua Barretto
b6b42e1e3d
Merge branch 'music' into 'master'
...
Music!
Closes #19
See merge request veloren/veloren!150
Former-commit-id: f7f30d5c20f3b9d6dc3dba43f18d6b955e804695
2019-05-18 20:34:06 +00:00
Louis Pearson
b0f26633d3
Remove lewton, fix filename issue
...
Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983
2019-05-18 14:26:16 -06:00
Louis Pearson
6b0fc57ce3
Move global maintains above rendering
...
Also moves the call to the AudioFrontend constructor to take place in the
GlobalState constructor
Former-commit-id: 0be9df5a7355b6a7d1ce758894568d67df7db11a
2019-05-18 14:10:02 -06:00
Joshua Barretto
32b0af1c19
Merge branch 'assets-pathbuf' into 'master'
...
Change asset loading to use relative paths
See merge request veloren/veloren!149
Former-commit-id: 0ec825a55ee2b8e7d9e9dc0ace56b1d28b6da1d9
2019-05-18 19:56:21 +00:00
Louis Pearson
22286c24e6
Play random music whenever a track ends
...
To support this, a global_state.maintain() method was added that calls
audio.maintain().
Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 13:53:57 -06:00
Louis Pearson
315767f19f
Add code to ignore jack as an audio device
...
Former-commit-id: 1dbaa796f82f2e9be26a3648e9aaca81f3348134
2019-05-18 13:53:57 -06:00
Louis Pearson
5a04e98725
Change asset paths to be relative
...
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
2019-05-18 13:37:44 -06:00
Louis Pearson
d55e803ab5
Use PathBuf to load files
...
Former-commit-id: b72084fab1b8faeabc47eee927654f963643bb78
2019-05-18 13:30:52 -06:00
Joshua Barretto
14b28a4a17
Merge branch 'Char-Selection' into 'master'
...
Char selection
Closes #38
See merge request veloren/veloren!137
Former-commit-id: 9004df2856e00255167d639c051e46c2adc9785e
2019-05-18 19:03:13 +00:00
Forest Anderson
2e7984ebc3
Char selection
...
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
2019-05-18 19:03:13 +00:00
Joshua Barretto
db2b823fe1
Merge branch 'master' into 'master'
...
Colour adjustment and server crash fix
See merge request veloren/veloren!148
Former-commit-id: b0a42340d22980ec25162255bf41855337a8be0b
2019-05-18 17:32:56 +00:00
Joshua Barretto
7f857daa91
Colour adjustment and server crash fix
...
Former-commit-id: 7a1f6dcccc9869472f6044407d063ea86bb12dd3
2019-05-18 17:47:55 +01:00
