Imbris
eccd7f1653
Merge branch 'shandley/character-loading' into 'master'
...
Move character DB ops off the main thread
See merge request veloren/veloren!1075
2020-06-25 16:16:15 +00:00
Songtronix
4b11001e7a
Merge branch 'songtronix/add-whitelist' into 'master'
...
feat: add server whitelist
See merge request veloren/veloren!1111
2020-06-24 16:18:41 +00:00
Songtronix
ce5b2b9ffc
feat: add server whitelist
2020-06-24 17:36:19 +02:00
Monty Marz
383b0339e0
Merge branch 'pfau/alpha-disclaimer' into 'master'
...
Pfau/alpha disclaimer
See merge request veloren/veloren!1109
2020-06-24 13:44:39 +00:00
Monty Marz
455be836a6
alpha disclaimer
2020-06-24 13:44:39 +00:00
Songtronix
1e55626f2b
Merge branch 'songtronix/fix-hot-anim' into 'master'
...
fix: hot-anim feature
See merge request veloren/veloren!1110
2020-06-24 13:30:44 +00:00
Songtronix
a3fbea3ac4
fix: hot-anim feature
2020-06-24 14:35:52 +02:00
Songtronix
0953cf5232
Merge branch 'songtronix/hotfix' into 'master'
...
fix: do not store the password in the settings
See merge request veloren/veloren!1107
2020-06-24 09:09:41 +00:00
Songtronix
5b0ef9da47
fix: do not store the password in the settings
2020-06-24 10:26:16 +02:00
Shane Handley
cb937d9e23
- Move the remaining character data loading to the message/thread formatharacter list actions
...
- Handle/notify the client of errors during character load by returning to character select with the error, clean up client and server states
- Add player_uuid check when loading character data.
2020-06-24 11:47:41 +10:00
Yusuf Bera Ertan
d367511b77
nix: Add nixfmt package to shell.nix, update readme
2020-06-23 20:51:32 +03:00
Yusuf Bera Ertan
bddbe51a1d
nix: Switch to crate2nix, and niv for dependency management
2020-06-23 20:51:32 +03:00
Shane Handley
16573fde41
Add channel setup for persistence to move character operations off the
...
main thread.
2020-06-23 21:07:43 +10:00
Marcel
030835287d
Merge branch 'shandley/fix-clippy-warnings' into 'master'
...
Fix clippy warnings after toolchain update
See merge request veloren/veloren!1103
2020-06-23 07:59:39 +00:00
Shane Handley
db3833a04e
Fix clippy warnings after toolchain update
2020-06-23 16:52:04 +10:00
Marcel
9f1d5fbbce
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
update toolchain to `nightly-2020-06-22`
See merge request veloren/veloren!1101
2020-06-22 16:48:37 +00:00
Marcel Märtens
0a47295466
update toolchain to nightly-2020-06-22
2020-06-22 18:37:24 +02:00
Marcel
6ef87cf05e
Merge branch 'kevinglasson/switch-logging-to-tokio-tracing' into 'master'
...
Kevinglasson/switch logging to tokio tracing
Closes #595
See merge request veloren/veloren!1098
2020-06-22 15:19:33 +00:00
Marcel Märtens
79feb6dceb
switch log behavior for env variable and removed gfx spam by default
2020-06-22 16:49:40 +02:00
Marcel Märtens
f2f3cd2f28
switch to tracing
stlye and enhance logs with usefull information
...
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
2020-06-22 09:53:15 +02:00
Kevin Glasson
cfe09c2f55
Convert all other veloren crates to use tracing
...
- Completely removed both `log` and `pretty_env_logger` and replaced
with `tracing` and `tracing_subscriber` where necessary.
- Converted all `log::info!(...)` et al. statements to just use the
shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 23:19:41 +08:00
Kevin Glasson
16cf7689a8
Convert voxygen to use tracing
...
There are several noteable changes in this commit that mean that logging
will behave differently to how it did previously.
- There are now no separate filter levels for terminal and file output.
This is a feature that is lacking in `tracing` but is set to be resolved
by https://github.com/tokio-rs/tracing/pull/508 . At which point we MAY
include it.
- The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 23:17:25 +08:00
Forest Anderson
57367a5a1a
Merge branch 'angel/add-testing' into 'master'
...
Expand on documentation
See merge request veloren/veloren!1097
2020-06-20 01:47:49 +00:00
Forest Anderson
a3247f4542
Expand on documentation
2020-06-19 21:13:00 -04:00
Songtronix
53b6ce5c98
Merge branch 'songtronix/fix-pages' into 'master'
...
fix(ci): pages document default features only
See merge request veloren/veloren!1096
2020-06-19 08:26:42 +00:00
Songtronix
722816753f
fix(ci): pages document default features only
...
related to !1094
2020-06-19 09:39:53 +02:00
Songtronix
66b2ec1ef6
Merge branch 'imbris/hot-anim' into 'master'
...
Hotreloadable animations for improved iterative development
See merge request veloren/veloren!1094
2020-06-19 06:46:45 +00:00
Imbris
f775b6a376
Fix cargo test failing
2020-06-19 01:46:20 -04:00
jshipsey
55c3a51534
add hotloads to all anims
2020-06-19 00:48:19 -04:00
Imbris
64421942c6
Windows is weird, cargo is weird..... (also tidy up a few things)
2020-06-19 00:48:19 -04:00
Imbris
2be5d0746d
Switch to using modify events with 300ms delay to prevent double reloading when notify produces multiple events at once
2020-06-19 00:48:19 -04:00
Imbris
16cc1c62a1
Use debug, try to fix windows path
2020-06-19 00:48:19 -04:00
Imbris
a46789013c
Hotreload animations using libloading
2020-06-19 00:48:19 -04:00
Imbris
bc0b3707f9
Merge branch 'kevinglasson/persist-hotbar-slots' into 'master'
...
Add hotbar state persistence.
Closes #577
See merge request veloren/veloren!1093
2020-06-19 00:36:39 +00:00
Kevin Glasson
d8d7f07cb5
Add hotbar state persistence.
...
Persist the hotbar state to disk by writing it out to a `profile.ron`
situated next to the existing `settings.ron`. There are individual
profiles for every character on every server. On creation of a new
character the default hotbar state will be `[None; 10]` i.e. the hotbar
will be empty.
Resolves: https://gitlab.com/veloren/veloren/-/issues/577
2020-06-19 08:00:21 +08:00
Marcel
e0dcfe43f8
Merge branch 'xvar/clippy-fixes-clone_on_copy' into 'master'
...
Fixed suppressed clippy warnings for #587 - clone_on_copy
See merge request veloren/veloren!1092
2020-06-18 21:52:40 +00:00
Ben Wallis
9508b7c3e7
Fixed suppressed clippy warnings for #587 - clone_on_copy
2020-06-18 22:25:48 +01:00
Marcel
15d9b88647
Merge branch 'xvar/fix-server-crash-on-high-char-lvl-login' into 'master'
...
Server: Fixed panic on extremely high level character login due to exp overflow (#597 )
See merge request veloren/veloren!1091
2020-06-18 20:24:49 +00:00
Ben Wallis
3aab38edef
Server: Fixed panic on extremely high level character login due to exp overflow ( #597 )
2020-06-18 20:45:37 +01:00
Justin Shipsey
108ad829d7
Merge branch 'scott-c/fix-swap-loadout' into 'master'
...
Remove wield requirement to swap loadout
See merge request veloren/veloren!1089
2020-06-18 13:31:17 +00:00
Marcel
99546f7598
Merge branch 'xvar/fix-window-moving-bug' into 'master'
...
Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588 )
See merge request veloren/veloren!1088
2020-06-17 17:47:33 +00:00
scott-c
89eda13b19
Remove wield requirement to swap loadout
2020-06-17 21:34:58 +08:00
Ben Wallis
317e118560
Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed ( #588 )
2020-06-17 12:40:11 +01:00
Marcel
9887b9c70f
Merge branch 'fix-ci' into 'master'
...
first rule evaluated to never, switched that
See merge request veloren/veloren!1086
2020-06-17 09:09:09 +00:00
Marcel Märtens
6342df7a1d
first rule evaluated to never, switched that
2020-06-17 10:41:17 +02:00
Marcel
3f3b65efd5
Merge branch 'allow_manual_ci' into 'master'
...
allow release to be build manually and remove the extra jobs for it
See merge request veloren/veloren!1070
2020-06-17 08:30:50 +00:00
Justin Shipsey
d497e6febd
Merge branch 'slipped/glidewield' into 'master'
...
glidewield
See merge request veloren/veloren!1033
2020-06-16 21:32:40 +00:00
Justin Shipsey
ead6494ca6
Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding
2020-06-16 21:32:39 +00:00
Marcel Märtens
ce8980228e
CI cleanup
...
- switching more to rules syntax
- clean up some templates
- EITHER optional builds or build builds
- ordering
2020-06-16 12:45:35 +02:00
Imbris
d349c35d32
Merge branch 'scott-c/wield-changes' into 'master'
...
Scott c/wield changes
See merge request veloren/veloren!1072
2020-06-15 20:51:35 +00:00