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,217 Commits 151 Branches 18 Tags 2.1 GiB
22315a6e1d
Commit Graph

4217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CapsizeGlimmer
22315a6e1d Added shortcut for chat commands /g=>/group, /s=>/say, /w=>/world, etc. 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
c984bdcdf1 Implement chat filtering for /say /region /group etc. 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
5cbecb29e6 Implement /join_group and /join_faction commands 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
289ef5d6b2 Move message processing and chat bubbles to the client 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
0b2a3ebe8b Re-implement names in chat. It is done client-side now and /alias changes are retroactive. 2020-06-27 16:42:25 -04:00
CapsizeGlimmer
b08d717eac Rework chat processing 2020-06-27 16:29:03 -04:00
CapsizeGlimmer
702a21302c Base implementation of /group /faction /say /region 2020-06-27 16:26:02 -04:00
Monty Marz
8e67782a49 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
94164b7839 Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Monty Marz
58bfa4f0ef 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
34aadd0eb9 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
c025b93501 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
9a79101f57 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
Monty Marz
7d9ef93140 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
2825b08bee Added fluffy jackalope slippers 2020-06-25 22:47:17 +02:00
WelshPixie
281ca44d3a Added text when NPCs attacked 2020-06-25 22:45:27 +02:00
Joshua Barretto
9e5f03e2f4 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
1cca7bf4a8 Fmt, fixed chat-cli problem 2020-06-25 19:50:04 +01:00
Joshua Barretto
d9cd37056d Added settings editing, set_motd command 2020-06-25 18:57:29 +01:00
Joshua Barretto
0ce7d6c876 Updated changelog 2020-06-25 18:57:29 +01:00
Joshua Barretto
83a96c24ec Added MOTD on login, MOTD editing 2020-06-25 18:57:26 +01:00
Joshua Barretto
b46e080ade Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
WelshPixie
9887e5d45d added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
Imbris
6501611372 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
2ca30653f6 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
f44df23935 feat: add server whitelist 2020-06-24 17:36:19 +02:00
Monty Marz
fc48d0ddec 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
32f6d42ed9 alpha disclaimer 2020-06-24 13:44:39 +00:00
Songtronix
81a72a9d07 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
750b9e198d fix: hot-anim feature 2020-06-24 14:35:52 +02:00
Songtronix
c8b708b2d3 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
d18b11d831 fix: do not store the password in the settings 2020-06-24 10:26:16 +02:00
Shane Handley
255ad97289 - 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
38b146d840 Add channel setup for persistence to move character operations off the 
main thread.
 2020-06-23 21:07:43 +10:00
Marcel
3628bfc2a6 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
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