Sheldon Knuth
|
9efd15c242
|
fix the missing set_playing(true) in AudioPlayer::load() to prevent infinity thread loop & adopt std::sync::{Mutex, Condvar} for accurate thread blocking.
|
2019-07-03 17:23:24 +00:00 |
|
Joshua Barretto
|
71bde8a3da
|
Merge branch 'imbris/asset_changes' into 'master'
Pass BufReader to Asset::load()
See merge request veloren/veloren!297
|
2019-07-03 09:25:34 +00:00 |
|
Imbris
|
42962cc9d7
|
Fix common::asset doc test
|
2019-07-03 05:17:46 -04:00 |
|
Imbris
|
f370dd58c2
|
Pass BufReader to Asset::load()
|
2019-07-03 05:02:01 -04:00 |
|
Joshua Barretto
|
4a6d206193
|
Merge branch 'imbris/ui_changes' into 'master'
UI Cache Updates and Warning Cleanup
See merge request veloren/veloren!296
|
2019-07-03 08:56:14 +00:00 |
|
Imbris
|
a5144d3313
|
Remove warnings
|
2019-07-02 23:09:37 -04:00 |
|
Imbris
|
89436c95d2
|
Add glyph cache resizing, move when resize occurs
|
2019-07-02 22:31:20 -04:00 |
|
Imbris
|
ce45a90362
|
Smaller graphics cache that removes unused items
|
2019-07-02 21:21:36 -04:00 |
|
Joshua Barretto
|
afccf87856
|
Merge branch 'songtronix/clean-voxygen-rs-files' into 'master'
clean voxygen rs files
See merge request veloren/veloren!292
|
2019-07-02 21:29:38 +00:00 |
|
Songtronix
|
0f1739e35b
|
clean voxygen rs files
|
2019-07-02 21:29:38 +00:00 |
|
Joshua Barretto
|
c5a92d039d
|
Merge branch 'songtronix/clean-hud' into 'master'
clean warnings from voxygen/hud
See merge request veloren/veloren!293
|
2019-07-02 21:25:07 +00:00 |
|
Songtronix
|
47805ecfbc
|
clean warnings from voxygen/hud
|
2019-07-02 21:25:07 +00:00 |
|
Joshua Barretto
|
97842a4a22
|
Merge branch 'zesterer/small-fixes' into 'master'
Added ability to specify server address to chat-cli
See merge request veloren/veloren!295
|
2019-07-02 20:15:06 +00:00 |
|
Joshua Barretto
|
72b472e54e
|
Added ability to specify server in chat-cli
|
2019-07-02 21:06:44 +01:00 |
|
Timo Koesters
|
22ceaa4b05
|
Merge branch 'timo-warnings-client' into 'master'
Timo warnings client
See merge request veloren/veloren!291
|
2019-07-02 19:08:31 +00:00 |
|
timokoesters
|
37ddea61c5
|
Fix clippy suggestions
|
2019-07-02 21:00:57 +02:00 |
|
timokoesters
|
b520b8d0e2
|
Remove warnings from client
|
2019-07-02 20:56:29 +02:00 |
|
Timo Koesters
|
622c206d0c
|
Merge branch 'audio/audio-base' into 'master'
Loading `no-audio` mode from the game start without `rodio` crate initialisation completely
See merge request veloren/veloren!289
|
2019-07-02 18:35:40 +00:00 |
|
Sheldon Knuth
|
5871c49338
|
Loading no-audio mode from the game start without rodio crate initialisation completely
|
2019-07-02 18:35:40 +00:00 |
|
Timo Koesters
|
972a0eb25b
|
Merge branch 'timo-common-warnings' into 'master'
Fix warnings and clippy recommendations in common
See merge request veloren/veloren!284
|
2019-07-02 15:25:36 +00:00 |
|
timokoesters
|
35b6aec861
|
Fix warnings and clippy recommendations in common
|
2019-07-02 15:48:25 +02:00 |
|
Joshua Barretto
|
2173be4a82
|
Merge branch 'zesterer/small-fixes' into 'master'
Revamped asset directory search system and merged audio base
See merge request veloren/veloren!286
|
2019-07-02 13:28:32 +00:00 |
|
Joshua Barretto
|
5ae0a77206
|
Merge branch 'master' into 'zesterer/small-fixes'
# Conflicts:
# common/src/assets/mod.rs
# voxygen/src/audio/base.rs
|
2019-07-02 13:18:04 +00:00 |
|
Joshua Barretto
|
b357f85279
|
Revamped asset loading system
|
2019-07-02 14:15:53 +01:00 |
|
Joshua Barretto
|
f13c55688b
|
Fixed relative path of current_dir
|
2019-07-02 13:52:51 +01:00 |
|
Joshua Barretto
|
bf2b072e73
|
Revamped asset directory search system
|
2019-07-02 13:52:51 +01:00 |
|
Sheldon Knuth
|
f66ff1c9a2
|
Revamping the audio system for Voxygen from #163
|
2019-07-02 13:52:51 +01:00 |
|
Sheldon Knuth
|
e78328f5cc
|
Removed send_msg in Action::Load(path) => ... due to non-existed receiver.
|
2019-07-02 20:04:24 +08:00 |
|
Joshua Barretto
|
9bc1fd6da4
|
Merge branch 'zesterer/small-fixes' into 'master'
Used 3-level asset directory searching, not 2
See merge request veloren/veloren!285
|
2019-07-02 12:04:06 +00:00 |
|
Joshua Barretto
|
5cb8ac2ff5
|
Used 3-level asset directory searching, not 2
|
2019-07-02 12:58:33 +01:00 |
|
Sheldon Knuth
|
2c28d0fb29
|
hotfix on assets_folder issue by increasing the depth to 3.
|
2019-07-02 19:43:38 +08:00 |
|
Dominik Broński
|
fb83dc2d9c
|
Merge branch 'audio/audio-base' into 'master'
Revamping the audio system for Voxygen from #163
See merge request veloren/veloren!247
|
2019-07-02 04:10:55 +00:00 |
|
Sheldon Knuth
|
343c27e559
|
Revamping the audio system for Voxygen from #163
|
2019-07-02 04:10:55 +00:00 |
|
Sheldon Knuth
|
6d36616d81
|
add no-audio feature while constructing AudioFrontend with no_audio().
|
2019-07-02 11:45:28 +08:00 |
|
Sheldon Knuth
|
068c8ab469
|
fix audio thread by removing PopError but use customised block function instead.
|
2019-07-02 11:29:00 +08:00 |
|
Sheldon Knuth
|
333f7bd4c1
|
Add mpmc support to audio-base.
|
2019-07-02 11:29:00 +08:00 |
|
Joshua Barretto
|
c696853487
|
Merge branch 'qutrin/command-stuff' into 'master'
Add /health command
See merge request veloren/veloren!283
|
2019-07-01 20:07:31 +00:00 |
|
Piotr Korgól
|
aec44c4fa6
|
Add /health command
|
2019-07-01 20:07:30 +00:00 |
|
Joshua Barretto
|
48f20a024e
|
Merge branch 'songtronix/fix-server-warnings' into 'master'
fix warnings from server
See merge request veloren/veloren!281
|
2019-07-01 18:49:42 +00:00 |
|
Songtronix
|
a2de533cf0
|
fix warnings from server
|
2019-07-01 18:49:42 +00:00 |
|
Joshua Barretto
|
b2c91896a2
|
Merge branch 'songtronix/fix-warnings-from-world' into 'master'
Fix warnings from world
See merge request veloren/veloren!282
|
2019-07-01 18:40:41 +00:00 |
|
Songtronix
|
229220494d
|
Fix warnings from world
|
2019-07-01 18:40:41 +00:00 |
|
Joshua Barretto
|
c8099783d1
|
Merge branch 'songtronix/clean-server-and-cli' into 'master'
Clean server and server-cli
See merge request veloren/veloren!279
|
2019-07-01 16:38:19 +00:00 |
|
Songtronix
|
c7c488e8c4
|
Clean server and server-cli
|
2019-07-01 16:38:19 +00:00 |
|
Joshua Barretto
|
df934f539e
|
Merge branch 'qutrin/chat-cli-cleanup' into 'master'
Get rid of warnings in chat-cli
See merge request veloren/veloren!280
|
2019-07-01 16:16:35 +00:00 |
|
Piotr Korgól
|
697a442020
|
Get rid of warnings
|
2019-07-01 17:24:41 +02:00 |
|
Joshua Barretto
|
3d2a6632ef
|
Merge branch 'zesterer/small-fixes' into 'master'
Fixed chonk memory usage bug, added block manipulation
See merge request veloren/veloren!278
|
2019-07-01 15:22:04 +00:00 |
|
Joshua Barretto
|
8701cbf8bb
|
Only create one block with /solid
|
2019-07-01 15:38:40 +01:00 |
|
Joshua Barretto
|
62ffdc7c17
|
fmt
|
2019-07-01 14:38:45 +01:00 |
|
Joshua Barretto
|
7b8544c786
|
Fixed remesh data race
|
2019-07-01 14:38:38 +01:00 |
|