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,211 Commits 151 Branches 18 Tags
Commit Graph

4211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wallis
0b64af6d88 Fixed long mouse button names overflowing hotbar slots (#637) 2020-06-27 20:48:10 +01:00
Monty Marz
da5dd54bbb Merge branch 'WelshPixie/armour' into 'master' 
Welsh pixie/armour

See merge request veloren/veloren!1113
 2020-06-26 16:26:00 +00:00
Delyth Williams
c4c8235c6b Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Monty Marz
0ff533b149 Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master' 
Added fluffy jackalope slippers

See merge request veloren/veloren!1114
 2020-06-25 22:07:47 +00:00
Monty Marz
26dcd6657e Merge branch 'WelshPixie/NPCAttackedText' into 'master' 
Added text when NPCs attacked

See merge request veloren/veloren!1105
 2020-06-25 21:26:30 +00:00
Monty Marz
508d23c4db Merge branch 'WelshPixie/grassets' into 'master' 
Welsh pixie/grassets

See merge request veloren/veloren!1106
 2020-06-25 21:12:31 +00:00
Delyth Williams
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
Monty Marz
5505176baf Merge branch 'WelshPixie/spaulders' into 'master' 
added seven new shoulder armour types

See merge request veloren/veloren!1115
 2020-06-25 20:50:06 +00:00
WelshPixie
bdec773d29 Added fluffy jackalope slippers 2020-06-25 22:47:17 +02:00
WelshPixie
0fe8c2c6c1 Added text when NPCs attacked 2020-06-25 22:45:27 +02:00
Joshua Barretto
3ebb06bec2 Merge branch 'zesterer/vd-cap' into 'master' 
View distance cap, MOTD on login

See merge request veloren/veloren!1112
 2020-06-25 19:59:07 +00:00
Joshua Barretto
17c2ec9dde Fmt, fixed chat-cli problem 2020-06-25 19:50:04 +01:00
Joshua Barretto
f2eff640b3 Added settings editing, set_motd command 2020-06-25 18:57:29 +01:00
Joshua Barretto
2e5027c02b Updated changelog 2020-06-25 18:57:29 +01:00
Joshua Barretto
e64a71d34e Added MOTD on login, MOTD editing 2020-06-25 18:57:26 +01:00
Joshua Barretto
888ea1e895 Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
WelshPixie
126c93d72b added seven new shoulder armour types 2020-06-25 18:36:24 +02: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
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
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