Timo Koesters
|
74ab358da8
|
Merge branch 'songtronix/clean-audio' into 'master'
comment out unused structs/functions in voxygen/audio
See merge request veloren/veloren!305
|
2019-07-04 14:27:28 +00:00 |
|
Songtronix
|
581e576572
|
comment out unused structs/functions in voxygen/audio
|
2019-07-04 14:27:28 +00:00 |
|
Joshua Barretto
|
8aa675c731
|
Merge branch 'timo-voxygen-warnings' into 'master'
Fix warnings all around voxygen
See merge request veloren/veloren!304
|
2019-07-04 12:11:30 +00:00 |
|
timokoesters
|
fdcbf163c8
|
Fix warnings all around voxygen
|
2019-07-04 14:08:01 +02:00 |
|
Timo Koesters
|
831f02bedc
|
Merge branch 'timo-cleanup-ui' into 'master'
Clean up ui
See merge request veloren/veloren!303
|
2019-07-04 11:29:57 +00:00 |
|
timokoesters
|
a6ab37f29f
|
Clean up ui
|
2019-07-04 13:24:44 +02:00 |
|
Timo Koesters
|
7955f51635
|
Merge branch 'build-mode' into 'master'
Build mode and crosshair
See merge request veloren/veloren!290
|
2019-07-03 20:50:28 +00:00 |
|
Piotr Korgól
|
1cefa53c5e
|
Even more cleanups
|
2019-07-03 22:46:43 +02:00 |
|
Piotr Korgól
|
e04a12af9a
|
Remove printlns
|
2019-07-03 22:38:28 +02:00 |
|
Piotr Korgól
|
0532341254
|
Small cleanup to block placing and breaking
|
2019-07-03 22:28:13 +02:00 |
|
Piotr Korgól
|
24dd56b215
|
Add block breaking
|
2019-07-03 21:56:54 +02:00 |
|
timokoesters
|
53ef8643c6
|
Fix building
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
7f73ad759f
|
Handle block placing.
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
1cb9a3985b
|
Fix comment
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
8f66a735dc
|
Add crosshair
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
4ea4a1eee8
|
Sync CanBuild component, fix /build messages
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
55c95cc0ed
|
Add CanBuild component, Block placing client messages and build mode command
|
2019-07-03 21:28:07 +02:00 |
|
Joshua Barretto
|
6842f6ed3a
|
Merge branch 'desttinghim/no-audio-settings' into 'master'
Add field to disable audio into settings
See merge request veloren/veloren!302
|
2019-07-03 19:19:00 +00:00 |
|
Louis Pearson
|
2516ad11ad
|
Add field to turn off audio in settings
|
2019-07-03 13:13:38 -06:00 |
|
Joshua Barretto
|
866e5012cc
|
Merge branch 'audio/audio-base' into 'master'
[Bug Fix] The infinity thread loops and thread-blocking is not working.
See merge request veloren/veloren!299
|
2019-07-03 17:23:25 +00:00 |
|
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 |
|