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
Joshua Barretto
119abb92c9
Merge branch 'inventory' into 'master'
...
Create a skeleton for the Inventory system and Item system
See merge request veloren/veloren!147
Former-commit-id: 714d743ca466066c84cf408c81310b77cac0208f
2019-05-18 16:46:14 +00:00
Piotr Korgól
0e2b09a5f8
Create a skeleton for the Inventory system and Item system
...
Former-commit-id: 2579b70257ee9faa6d8614c33677ad0fc3c77a0d
2019-05-18 16:46:14 +00:00
Joshua Barretto
03502c1bac
Merge branch 'language-fixes' into 'master'
...
Pedantic comment and language fixes.
See merge request veloren/veloren!145
Former-commit-id: fe4867a506f2822c243b0bee433ffa85805ced87
2019-05-17 22:40:42 +00:00
Cody
6b09fd7c53
Pedantic comment and language fixes.
...
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Imbris
96cdbdb881
Merge branch 'chonks' into 'master'
...
Chonks!
See merge request veloren/veloren!144
Former-commit-id: ec1b239237f63479886add6a5722b6e9e76761e1
2019-05-17 22:01:28 +00:00
Joshua Barretto
5a2c7a7813
Removed accidental println
...
Former-commit-id: a203e8105cd42463b9a72245e1623dde68874571
2019-05-17 22:55:50 +01:00
Joshua Barretto
7174830279
fmt
...
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7
Added chonks
...
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
2019-05-17 18:44:30 +01:00
Joshua Barretto
fa052a22b7
More lenient max deltatime to avoid physics lag
...
Former-commit-id: bdd4a9d634f9aa1e52ab3885e5b8a49348011760
2019-05-17 13:39:40 +01:00
Joshua Barretto
babb5ff0cd
Merge branch 'fix_minimize_and_cleanup' into 'master'
...
Fix minimize crash and cleanup
See merge request veloren/veloren!142
Former-commit-id: b2b8524e1dffee097c3ca4f47ca48b6fc4bbfc01
2019-05-17 08:26:58 +00:00
Imbris
8e0c1b1abd
cleanup some warnings, pretty crash string literal
...
Former-commit-id: 43492866f624c12c87762a94188c6c193e5bb90c
2019-05-17 03:55:51 -04:00
Imbris
c780b85f24
Stop crash when minimizing
...
Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573
2019-05-17 01:13:14 -04:00
Forest Anderson
ee83fb4268
Merge branch 'add-contributing-instructions' into 'master'
...
Add CONTRIBUTING
See merge request veloren/veloren!130
Former-commit-id: eb66685558ac696ef4996dc37abfc048395e977e
2019-05-17 01:34:07 +00:00
Forest Anderson
f3fd02836e
Add CONTRIBUTING
...
Former-commit-id: 00d6f8e20f539cbe0a631d5a5d600c0b73b4f203
2019-05-17 01:34:07 +00:00
Joshua Barretto
ba8c8cfdf3
Merge branch 'master' into 'master'
...
Stopped syncing time
See merge request veloren/veloren!141
Former-commit-id: 654d855682af6300e964955f2784ef0b8932aaca
2019-05-16 23:27:49 +00:00
Joshua Barretto
3940e73b31
Stopped syncing time
...
Former-commit-id: 8453a8f1c2361b1e6b5bb7f11470c33f2c0f910b
2019-05-17 00:26:18 +01:00
Joshua Barretto
dfb9e93052
Merge branch 'master' into 'master'
...
Colour in figure shader and sphynx update
See merge request veloren/veloren!134
Former-commit-id: a1682becf03294a30e96b15afbd5fdf2c3d24028
2019-05-16 23:14:59 +00:00
Joshua Barretto
db4be8e492
Updated sphynx
...
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-17 00:05:46 +01:00
Joshua Barretto
6f984ca181
Added figure colour to shader and health component
...
Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516
2019-05-16 23:34:57 +01:00
Joshua Barretto
ef8daef828
Merge branch 'gliding' into 'master'
...
Gliding
See merge request veloren/veloren!140
Former-commit-id: 7e1471af2a250e28557d593944719954e6af4bbe
2019-05-16 22:18:12 +00:00
