Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,214 Commits 151 Branches 18 Tags
Commit Graph

1773 Commits

Author SHA1 Message Date
Joshua Barretto
2c1c00a7be Merge branch 'xvar/mouse-button-names' into 'master' 
Fixed long mouse button names overflowing hotbar slots (#637)

See merge request veloren/veloren!1120
 2020-06-28 11:11:29 +00:00
Delyth Williams
87d81c42fe Fix sprites w/o models 2020-06-27 21:08:21 +00:00
Ben Wallis
0b64af6d88 Fixed long mouse button names overflowing hotbar slots (#637) 2020-06-27 20:48:10 +01:00
Delyth Williams
c4c8235c6b Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Delyth Williams
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
Joshua Barretto
888ea1e895 Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
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
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
a3fbea3ac4 fix: hot-anim feature 2020-06-24 14:35:52 +02: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
Shane Handley
db3833a04e Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10: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
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
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
Ben Wallis
9508b7c3e7 Fixed suppressed clippy warnings for #587 - clone_on_copy 2020-06-18 22:25:48 +01: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
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
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
Delyth Williams
8b63fe7f15 added new flora 2020-06-15 16:39:21 +00:00
Shane Handley
66817c7212 Fixes a bug where run sfx were being played during a roll. 2020-06-15 06:53:50 +10:00
Imbris
656fc95adc Merge branch 'shandley/docs-audio' into 'master' 
Add documentation for audio module.

See merge request veloren/veloren!1060
 2020-06-14 16:56:32 +00:00
S Handley
6026399518 Add documentation for audio module. 2020-06-14 16:56:32 +00:00
Imbris
866bb8cc7f Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' 
Globally suppressed clippy lint option_map_unit_fn for #587

See merge request veloren/veloren!1071
 2020-06-14 16:48:07 +00:00
Ben Wallis
3d28f97f51 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Imbris
b22af56ba9 Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' 
Fixed suppressed clippy warnings for #587 - redundant_closure

See merge request veloren/veloren!1065
 2020-06-14 16:33:04 +00:00
Imbris
b28e3a3949 Stop rendering 0 size images 2020-06-14 12:06:47 -04:00
Songtronix
391dcdff30 hotfix: panic trying to create a character 2020-06-14 12:40:08 +02:00
Justin Shipsey
509ea38739 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Songtronix
a51e5c3033 Merge branch 'jtai/log-chat-messages' into 'master' 
log-chat-messages

See merge request veloren/veloren!1076
 2020-06-14 08:41:41 +00:00
Monty Marz
46e42cf8f2 fix broken main menu 2020-06-14 02:11:31 +02:00
jshipsey
67239809af log-chat-messages 2020-06-13 15:21:58 -04:00
Ben Wallis
dcf84b3ff5 Fixed suppressed clippy warnings for #587 - redundant_closure 2020-06-12 20:47:22 +01:00
Ben Wallis
52b0585135 Fixed suppressed clippy warnings for #587 - collapsible_if 2020-06-12 20:34:54 +01:00
Forest Anderson
decc386a6e Merge branch 'xvar/clippy-fixes-many_single_char_names' into 'master' 
Fixed suppressed clippy warnings for #587 - many_single_char_names

See merge request veloren/veloren!1066
 2020-06-12 08:02:53 +00:00
Ben Wallis
8e64642474 Fixed suppressed clippy warnings for #587 - many_single_char_names 2020-06-11 20:07:46 +01:00
Marcel Märtens
cb03bc61d7 dependency reduction: 
- authc no longer uses reqwest
 - image only supports PNG
 - replace routille with tiny_http
 - several other dependencies
 - cargo upgrade
 - following improvement was measured on R7 1700X:
   before:
    - cargo build: 3076.73s user / 4:45 total / 589 dependencies
    - cargo test: 6118.38s user / 7:30 total / 959 dependencies
   after:
    - cargo build: 2680.54s user / 4:05 total / 480 dependencies
    - cargo test: 5351.81s user / 7:04 total / 791 dependencies
 - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
 2020-06-11 20:55:34 +02:00
S Handley
d7562a4977 Use empty sound data when a sound file cannot be loaded 2020-06-11 12:53:24 +00:00
Ben Wallis
22bcda3e50 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00
Shane Handley
4714f8ddc7 Docs, make adding event mappers easier for sfx, remove placeholder 
sounds.
 2020-06-09 00:41:46 +10:00