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,180 Commits 151 Branches 18 Tags 2.1 GiB
0a47295466
Commit Graph

4180 Commits

Author SHA1 Message Date
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 

See merge request
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
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
2020-06-19 08:26:42 +00:00
Songtronix
722816753f fix(ci): pages document default features only 
related to
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
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 

See merge request
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  - clone_on_copy

See merge request
2020-06-18 21:52:40 +00:00
Ben Wallis
9508b7c3e7 Fixed suppressed clippy warnings for - 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 ()

See merge request
2020-06-18 20:24:49 +00:00
Ben Wallis
3aab38edef Server: Fixed panic on extremely high level character login due to exp overflow () 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
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 ()

See merge request
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 () 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
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
2020-06-17 08:30:50 +00:00
Justin Shipsey
d497e6febd Merge branch 'slipped/glidewield' into 'master' 
glidewield

See merge request
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
2020-06-15 20:51:35 +00:00
Monty Marz
f638c01dcb Merge branch 'WelshPixie/new-flora' into 'master' 
added new flora

See merge request
2020-06-15 16:39:22 +00:00
Delyth Williams
8b63fe7f15 added new flora 2020-06-15 16:39:21 +00:00
scott-c
61571a8e74 Adjust character state's energy regen 2020-06-15 18:13:47 +08:00
scott-c
4e0924368b Add changes to change log 2020-06-15 18:13:32 +08:00
scott-c
3ec8b7436d reset energy regen on ability use instead of wield 2020-06-15 18:12:30 +08:00
scott-c
ede5f6a48e automatically wield on secondary or ability3 2020-06-15 18:12:30 +08:00
Marcel
3fded3e7d1 Merge branch 'angel/add-testing' into 'master' 
Add slots tests and documentation

See merge request
2020-06-14 21:53:30 +00:00
Marcel
160fadad1b Merge branch 'shandley/roll-sfx-bug' into 'master' 
Fix run/roll sfx state

See merge request
2020-06-14 21:50:54 +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
Forest Anderson
d1dc5400d8 Added loadout replace test and documentation 
Finished documenting
 2020-06-14 16:16:53 -04:00
Forest Anderson
9716e0a5c8 Merge branch 'angel/fix-pages-pipeline-stage' into 'master' 
Fix pages stage to publish

See merge request
2020-06-14 18:45:26 +00:00
Forest Anderson
03b8adb3e2 Fix pages stage to publish 2020-06-14 14:03:26 -04:00
Forest Anderson
6deaae8d74 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Forest Anderson
4cd8902017 Add unequip tests 2020-06-14 13:56:17 -04:00
Imbris
bc98de9a6c Merge branch 'yusdacra/fix-nixshell' into 'master' 
Fix shell.nix build

See merge request
2020-06-14 17:28:26 +00:00
Forest Anderson
816b47b63c Merge branch 'angel/add-doc-gitlab-pages' into 'master' 
Add Veloren docs on Gitlab pages

See merge request
2020-06-14 17:08:17 +00:00