Marcel
|
eae5470f7d
|
Merge branch 'T-Dark-char-alias-slur-check-hotfix' into 'master'
T dark char alias slur check hotfix
See merge request veloren/veloren!1215
|
2020-07-21 09:59:00 +00:00 |
|
T-Dark0
|
fd9ec8fbd0
|
Voxygen and server-cli no longer panic if server creation returns error
The process just exists instead
|
2020-07-21 09:59:00 +00:00 |
|
jshipsey
|
5b76ed23f4
|
small fixes
|
2020-07-20 21:37:13 -04:00 |
|
Forest Anderson
|
62005e9031
|
Merge branch 'sharp/fix-corrupted-inventory' into 'master'
Fix corrupted character inventories by adding protection.
See merge request veloren/veloren!1220
|
2020-07-20 01:34:48 +00:00 |
|
Joshua Yanovski
|
51ff7cded2
|
Fix corrupted character inventories by adding protection.
This is a temporary bandaid until we move to our new schema, but it
should at least allow people to log in with old characters.
|
2020-07-20 02:34:43 +02:00 |
|
Monty Marz
|
1377b369f6
|
more saturated pumpkins
|
2020-07-19 23:25:38 +02:00 |
|
Monty Marz
|
2d4841a4ec
|
Merge branch 'pfau/fix_chat_cutting' into 'master'
Fix cut off chat
See merge request veloren/veloren!1218
|
2020-07-18 21:56:45 +00:00 |
|
Monty Marz
|
e353bd3cfc
|
Fix cut off chat
|
2020-07-18 21:56:45 +00:00 |
|
Imbris
|
d46bf03e27
|
Merge branch 'imbris/screenshot-tweak' into 'master'
Only screenshot and toggle fullscreen once per frame
See merge request veloren/veloren!1217
|
2020-07-18 19:08:42 +00:00 |
|
Imbris
|
3c954534ed
|
Merge branch 'treeco/fix-spawn-damage' into 'master'
Reset rather than accumulate velocity when stuck or in unloaded chunks
See merge request veloren/veloren!1185
|
2020-07-18 19:08:40 +00:00 |
|
Monty Marz
|
ae8d50527f
|
acacia models
|
2020-07-18 20:29:56 +02:00 |
|
Joshua Yanovski
|
2101113b46
|
Higher detail LOD.
|
2020-07-18 18:55:25 +02:00 |
|
Imbris
|
14d500abbc
|
Only screenshot and toggle fullscreen once per frame
|
2020-07-18 12:21:22 -04:00 |
|
Imbris
|
e6776f3dce
|
Merge branch 'imbris/colorfix' into 'master'
Fix color depth selection
See merge request veloren/veloren!1216
|
2020-07-18 14:10:10 +00:00 |
|
Imbris
|
d53ad7eb43
|
Fix color depth selection
|
2020-07-18 08:17:42 -04:00 |
|
Imbris
|
c7e8a6bfae
|
Remove gravity rather than reset velocity in unloaded chunks
|
2020-07-18 07:13:30 -04:00 |
|
Imbris
|
23e1378c78
|
Merge branch 'zesterer/winit-20' into 'master'
Upgrade winit to 0.22.2
See merge request veloren/veloren!788
|
2020-07-18 03:26:59 +00:00 |
|
Imbris
|
db36578f83
|
Merge branch 'Menko/utility_items_fix_issue_612' into 'master'
#612 Fixed utility items not being removed from inventory/hotbar
See merge request veloren/veloren!1123
|
2020-07-18 02:41:45 +00:00 |
|
Nemanja
|
5caa6a07b0
|
#612 Fixed utility items not being removed from inventory/hotbar
|
2020-07-18 02:41:45 +00:00 |
|
Imbris
|
2a9785a40c
|
Remove supplement_events from Window, fix suppresed clippy lint, actually use exlusive fullscreen instead of a borderless window
|
2020-07-17 22:18:43 -04:00 |
|
Imbris
|
c8133ded43
|
Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
953773e1d3
|
Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
0275cc9523
|
Tweak pausing code to reduce duplication
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
2f5c8fa3f3
|
Fixes for Alt key related issues
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
27bfc74928
|
small fix and refactor stop auto walk to a method
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
ede0cbdfd3
|
Get misc conrod fixes onto winit-20 branch, add diagnostic printlns
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
9bfb1b5f00
|
Fix rebase mistake
|
2020-07-17 21:26:21 -04:00 |
|
Imbris
|
97364d49ed
|
Increment glutin version in Cargo.toml file
|
2020-07-17 21:26:20 -04:00 |
|
Imbris
|
7ab4f71b83
|
Windows cpal conflict fix not released yet so we need to use the git version
|
2020-07-17 21:26:20 -04:00 |
|
Imbris
|
a0d88e0774
|
Fix mistake with event processing
|
2020-07-17 21:26:20 -04:00 |
|
Imbris
|
f0d4ec32f5
|
clippy fixes
|
2020-07-17 21:26:20 -04:00 |
|
Imbris
|
8cd2207495
|
Proper fix for winit / cpal conflict
|
2020-07-17 21:26:20 -04:00 |
|
Imbris
|
29c877cff3
|
Winit 0.22 released
|
2020-07-17 21:26:16 -04:00 |
|
Imbris
|
61983b1b06
|
poll twice
|
2020-07-17 21:24:29 -04:00 |
|
Imbris
|
28e00a0f6e
|
Fix singleplayer feature and rebase related stuff
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
7dfb24d4a5
|
Clean comments, fix mistake, change dep source now that compatible version is available on crates.io
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
5e8d74e00e
|
fix Window::logical_size
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
70eba0c30a
|
Update changelog
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
db91ebe9b5
|
fix a few minor bugs
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
21a1382850
|
Update to winit 0.21.0
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
d1b635efa4
|
Rearrange PlayState system to work without loop control
|
2020-07-17 21:24:28 -04:00 |
|
Imbris
|
515dbc30a7
|
Switch to updated gfx_window_glutin
|
2020-07-17 21:24:28 -04:00 |
|
Joshua Barretto
|
807a27328c
|
Updated to winit 20
|
2020-07-17 21:24:27 -04:00 |
|
Justin Shipsey
|
5d18fc26f5
|
Merge branch 'sam/armor-stats' into 'master'
Armor Protection Stat
Closes #640
See merge request veloren/veloren!1204
|
2020-07-18 00:05:28 +00:00 |
|
Samuel Keiffer
|
6cce09be85
|
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
|
2020-07-18 00:05:28 +00:00 |
|
Imbris
|
d387709ed0
|
Merge branch 'imbris/vdfix' into 'master'
Loosen in_vd calculation on the server so that it accepts all chunks a client would request
See merge request veloren/veloren!1213
|
2020-07-17 18:04:40 +00:00 |
|
Imbris
|
9e880009e0
|
Loosen in_vd calculation on the server so that it accepts all chunks a client with the specified vd would request
|
2020-07-17 17:32:31 +01:00 |
|
Marcel
|
8c1854f22a
|
Merge branch 'xMAC94x/optional_builds' into 'master'
put optional builds in check like imbris suggested in order to test macOS and other builds easily
See merge request veloren/veloren!1214
|
2020-07-17 15:40:45 +00:00 |
|
Marcel Märtens
|
30bd570b8f
|
put optional builds in check like imbris suggested in order to test macOS and other builds easily
|
2020-07-17 12:17:34 +02:00 |
|
Marcel
|
a89c88dcb3
|
Merge branch 'T-Dark-char-alias-slur-check' into 'master'
Char alias slur check
Closes #580
See merge request veloren/veloren!1200
|
2020-07-16 14:05:35 +00:00 |
|