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 |
|
Joshua Barretto
|
ae4fb7eac0
|
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
|
bb900fff0f
|
Used 3-level asset directory searching, not 2
|
2019-07-02 12:58:33 +01:00 |
|
Sheldon Knuth
|
cdda20a1e8
|
hotfix on assets_folder issue by increasing the depth to 3.
|
2019-07-02 19:43:38 +08:00 |
|
Dominik Broński
|
4167e92d95
|
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
|
c699801d78
|
Revamping the audio system for Voxygen from #163
|
2019-07-02 04:10:55 +00:00 |
|
Sheldon Knuth
|
ee32f752a6
|
add no-audio feature while constructing AudioFrontend with no_audio().
|
2019-07-02 11:45:28 +08:00 |
|
Sheldon Knuth
|
7f7d35fe7f
|
fix audio thread by removing PopError but use customised block function instead.
|
2019-07-02 11:29:00 +08:00 |
|
Sheldon Knuth
|
d75d632279
|
Add mpmc support to audio-base.
|
2019-07-02 11:29:00 +08:00 |
|
Joshua Barretto
|
0f38fba897
|
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
|
a66dc9a24f
|
Add /health command
|
2019-07-01 20:07:30 +00:00 |
|
Joshua Barretto
|
d64ca810d5
|
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
|
ea340ddac7
|
fix warnings from server
|
2019-07-01 18:49:42 +00:00 |
|
Joshua Barretto
|
8874093bd9
|
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
|
863731f3ae
|
Fix warnings from world
|
2019-07-01 18:40:41 +00:00 |
|
Joshua Barretto
|
4cba73ff72
|
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
|
1ee65a66cf
|
Clean server and server-cli
|
2019-07-01 16:38:19 +00:00 |
|
Joshua Barretto
|
8b14775a59
|
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
|
8368bea654
|
Get rid of warnings
|
2019-07-01 17:24:41 +02:00 |
|
Joshua Barretto
|
631df59083
|
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
|
a55bbca6e3
|
Only create one block with /solid
|
2019-07-01 15:38:40 +01:00 |
|
Joshua Barretto
|
489f5f6b2a
|
fmt
|
2019-07-01 14:38:45 +01:00 |
|
Joshua Barretto
|
586b62ea28
|
Fixed remesh data race
|
2019-07-01 14:38:38 +01:00 |
|
Joshua Barretto
|
90566243ca
|
Removed debug printing
|
2019-07-01 14:37:32 +01:00 |
|
Joshua Barretto
|
c8a2e4722c
|
Fixed chonk memory usage bug, added block manipulation
|
2019-07-01 14:36:45 +01:00 |
|
Joshua Barretto
|
4ce89a6406
|
Merge branch 'wielding-animation' into 'master'
Wielding animation groundwork
See merge request veloren/veloren!276
|
2019-06-30 23:07:53 +00:00 |
|