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,232 Commits 151 Branches 18 Tags 2.1 GiB
92127292d4
Commit Graph

4232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Handley
304e06cbce Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
Marcel
260484bc64 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
4d47cf5a88 update toolchain to nightly-2020-06-22 2020-06-22 18:37:24 +02:00
Marcel
018116af18 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
15fc5787e4 switch log behavior for env variable and removed gfx spam by default 2020-06-22 16:49:40 +02:00
Marcel Märtens
9485b45e70 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
589254e4ab 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
af3af6c169 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
525b84ff9d 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
38af64df51 Expand on documentation 2020-06-19 21:13:00 -04:00
Songtronix
aabf68eddb 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
44d68d27da fix(ci): pages document default features only 
related to !1094
 2020-06-19 09:39:53 +02:00
Songtronix
362338876a 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
78bb801216 Fix cargo test failing 2020-06-19 01:46:20 -04:00
jshipsey
838eadda4e add hotloads to all anims 2020-06-19 00:48:19 -04:00
Imbris
124ed52554 Windows is weird, cargo is weird..... (also tidy up a few things) 2020-06-19 00:48:19 -04:00
Imbris
18e6b59966 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
01923d1580 Use debug, try to fix windows path 2020-06-19 00:48:19 -04:00
Imbris
d00e88b804 Hotreload animations using libloading 2020-06-19 00:48:19 -04:00
Imbris
a67ea3ec5c 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
19c2bf1181 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
2835303de5 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
6da7a11d33 Fixed suppressed clippy warnings for #587 - clone_on_copy 2020-06-18 22:25:48 +01:00
Marcel
babf452686 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
54de646bb3 Server: Fixed panic on extremely high level character login due to exp overflow (#597) 2020-06-18 20:45:37 +01:00
Justin Shipsey
eeb73fd534 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
d2f8372447 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
88d68df2c0 Remove wield requirement to swap loadout 2020-06-17 21:34:58 +08:00
Ben Wallis
4a4a106232 Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588) 2020-06-17 12:40:11 +01:00
Marcel
71a49b0e22 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
0d34c2a10b first rule evaluated to never, switched that 2020-06-17 10:41:17 +02:00
Marcel
06a2e006b7 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
86d7fc3f7c Merge branch 'slipped/glidewield' into 'master' 
glidewield

See merge request veloren/veloren!1033
 2020-06-16 21:32:40 +00:00
Justin Shipsey
2f896849d4 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
b9344ffeb7 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
c22f9530e4 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
Monty Marz
175bb54de0 Merge branch 'WelshPixie/new-flora' into 'master' 
added new flora

See merge request veloren/veloren!1074
 2020-06-15 16:39:22 +00:00
Delyth Williams
b73da5507e added new flora 2020-06-15 16:39:21 +00:00
scott-c
b2cbf3ee8f Adjust character state's energy regen 2020-06-15 18:13:47 +08:00
scott-c
0b9cae84de Add changes to change log 2020-06-15 18:13:32 +08:00
scott-c
f2f79a1b3c reset energy regen on ability use instead of wield 2020-06-15 18:12:30 +08:00
scott-c
8bcafa6f19 automatically wield on secondary or ability3 2020-06-15 18:12:30 +08:00
Marcel
44da25729c Merge branch 'angel/add-testing' into 'master' 
Add slots tests and documentation

See merge request veloren/veloren!1058
 2020-06-14 21:53:30 +00:00
Marcel
48d0e22f44 Merge branch 'shandley/roll-sfx-bug' into 'master' 
Fix run/roll sfx state

See merge request veloren/veloren!1084
 2020-06-14 21:50:54 +00:00
Shane Handley
825cf98a00 Fixes a bug where run sfx were being played during a roll. 2020-06-15 06:53:50 +10:00
Forest Anderson
361952077e Added loadout replace test and documentation 
Finished documenting
 2020-06-14 16:16:53 -04:00
Forest Anderson
697c7d734a Merge branch 'angel/fix-pages-pipeline-stage' into 'master' 
Fix pages stage to publish

See merge request veloren/veloren!1082
 2020-06-14 18:45:26 +00:00
Forest Anderson
053721ba40 Fix pages stage to publish 2020-06-14 14:03:26 -04:00
Forest Anderson
c2beeef600 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Forest Anderson
1649eadcdd Add unequip tests 2020-06-14 13:56:17 -04:00