jshipsey
|
da2ab20563
|
chat-cli fix
|
2019-07-04 11:08:48 -04:00 |
|
jshipsey
|
02ac56d84d
|
clearing animation warnings
|
2019-07-04 10:58:59 -04:00 |
|
Timo Koesters
|
4c63af94de
|
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
|
61d0474e6c
|
comment out unused structs/functions in voxygen/audio
|
2019-07-04 14:27:28 +00:00 |
|
Joshua Barretto
|
d1ccd88fab
|
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
|
d7c159a4e1
|
Fix warnings all around voxygen
|
2019-07-04 14:08:01 +02:00 |
|
Timo Koesters
|
aed096c721
|
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
|
c2f7f69a69
|
Clean up ui
|
2019-07-04 13:24:44 +02:00 |
|
Timo Koesters
|
4de3a64d7b
|
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
|
1f381cd99b
|
Even more cleanups
|
2019-07-03 22:46:43 +02:00 |
|
Piotr Korgól
|
04d3c077d0
|
Remove printlns
|
2019-07-03 22:38:28 +02:00 |
|
Piotr Korgól
|
e79f763226
|
Small cleanup to block placing and breaking
|
2019-07-03 22:28:13 +02:00 |
|
Piotr Korgól
|
42a4cc8095
|
Add block breaking
|
2019-07-03 21:56:54 +02:00 |
|
timokoesters
|
a702f7258a
|
Fix building
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
fbdc1d954a
|
Handle block placing.
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
e212d4d6f9
|
Fix comment
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
7cf299503d
|
Add crosshair
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
7f08377001
|
Sync CanBuild component, fix /build messages
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
bf748ae742
|
Add CanBuild component, Block placing client messages and build mode command
|
2019-07-03 21:28:07 +02:00 |
|
Joshua Barretto
|
9977322ba6
|
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
|
67bfc6c4cf
|
Add field to turn off audio in settings
|
2019-07-03 13:13:38 -06:00 |
|
Joshua Barretto
|
03a5c2a46b
|
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
|
6d624e96a6
|
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
|
f5b79f3d02
|
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
|
4a821446b8
|
Fix common::asset doc test
|
2019-07-03 05:17:46 -04:00 |
|
Imbris
|
d2f8c47361
|
Pass BufReader to Asset::load()
|
2019-07-03 05:02:01 -04:00 |
|
Joshua Barretto
|
fc73f71e60
|
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
|
ce33a6e1f8
|
Remove warnings
|
2019-07-02 23:09:37 -04:00 |
|
Imbris
|
cff79eadc9
|
Add glyph cache resizing, move when resize occurs
|
2019-07-02 22:31:20 -04:00 |
|
Imbris
|
b5ed35fd27
|
Smaller graphics cache that removes unused items
|
2019-07-02 21:21:36 -04:00 |
|
Joshua Barretto
|
aeed04fe41
|
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
|
0c0e93a61f
|
clean voxygen rs files
|
2019-07-02 21:29:38 +00:00 |
|
Joshua Barretto
|
2ab7c7767f
|
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
|
0c3d693561
|
clean warnings from voxygen/hud
|
2019-07-02 21:25:07 +00:00 |
|
Joshua Barretto
|
eecea846a9
|
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
|
0f41b6cdfa
|
Added ability to specify server in chat-cli
|
2019-07-02 21:06:44 +01:00 |
|
Timo Koesters
|
d280126d1f
|
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
|
46670e2689
|
Fix clippy suggestions
|
2019-07-02 21:00:57 +02:00 |
|
timokoesters
|
fe0c7028e2
|
Remove warnings from client
|
2019-07-02 20:56:29 +02:00 |
|
Timo Koesters
|
edb01beb85
|
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
|
c3671590e9
|
Loading no-audio mode from the game start without rodio crate initialisation completely
|
2019-07-02 18:35:40 +00:00 |
|
Timo Koesters
|
f47a1fa441
|
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
|
f5da167ce5
|
Fix warnings and clippy recommendations in common
|
2019-07-02 15:48:25 +02:00 |
|
Joshua Barretto
|
c7c4295a93
|
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
|
fed85420f5
|
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
|
6dae0c8cd2
|
Revamped asset loading system
|
2019-07-02 14:15:53 +01:00 |
|
Joshua Barretto
|
a72c54011a
|
Fixed relative path of current_dir
|
2019-07-02 13:52:51 +01:00 |
|
Joshua Barretto
|
107f5caa34
|
Revamped asset directory search system
|
2019-07-02 13:52:51 +01:00 |
|
Sheldon Knuth
|
0ec240ea8e
|
Revamping the audio system for Voxygen from #163
|
2019-07-02 13:52:51 +01:00 |
|
Sheldon Knuth
|
de9d05999d
|
Removed send_msg in Action::Load(path) => ... due to non-existed receiver.
|
2019-07-02 20:04:24 +08:00 |
|