Commit Graph

4936 Commits

Author SHA1 Message Date
01e7438d66 fix chat-cli name formatting. 2020-06-27 17:20:26 -04:00
c9ea3f28b8 Merge branch 'fix_sprites_w/o_models' into 'master'
Fix sprites w/o models

See merge request veloren/veloren!1121
2020-06-27 21:08:21 +00:00
87d81c42fe Fix sprites w/o models 2020-06-27 21:08:21 +00:00
3a65b76547 cargo fmt; changelog 2020-06-27 17:03:55 -04:00
f7be000e39 Added chat mode icons to speech bubbles 2020-06-27 17:03:30 -04:00
86969c8992 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04:00
f7e4d92679 Added shortcut for chat commands /g=>/group, /s=>/say, /w=>/world, etc. 2020-06-27 17:03:30 -04:00
5f8907b5a7 Implement chat filtering for /say /region /group etc. 2020-06-27 17:03:30 -04:00
54a3f7e442 Implement /join_group and /join_faction commands 2020-06-27 16:42:26 -04:00
3742128186 Move message processing and chat bubbles to the client 2020-06-27 16:42:26 -04:00
5086a309e8 Re-implement names in chat. It is done client-side now and /alias changes are retroactive. 2020-06-27 16:42:25 -04:00
3f43880dc7 Rework chat processing 2020-06-27 16:29:03 -04:00
aaf9af16df Base implementation of /group /faction /say /region 2020-06-27 16:26:02 -04:00
0b64af6d88 Fixed long mouse button names overflowing hotbar slots (#637) 2020-06-27 20:48:10 +01:00
da5dd54bbb Merge branch 'WelshPixie/armour' into 'master'
Welsh pixie/armour

See merge request veloren/veloren!1113
2020-06-26 16:26:00 +00:00
c4c8235c6b Welsh pixie/armour 2020-06-26 16:26:00 +00:00
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
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
508d23c4db Merge branch 'WelshPixie/grassets' into 'master'
Welsh pixie/grassets

See merge request veloren/veloren!1106
2020-06-25 21:12:31 +00:00
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
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
bdec773d29 Added fluffy jackalope slippers 2020-06-25 22:47:17 +02:00
0fe8c2c6c1 Added text when NPCs attacked 2020-06-25 22:45:27 +02:00
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
17c2ec9dde Fmt, fixed chat-cli problem 2020-06-25 19:50:04 +01:00
f2eff640b3 Added settings editing, set_motd command 2020-06-25 18:57:29 +01:00
2e5027c02b Updated changelog 2020-06-25 18:57:29 +01:00
e64a71d34e Added MOTD on login, MOTD editing 2020-06-25 18:57:26 +01:00
888ea1e895 Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
126c93d72b added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
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
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
ce5b2b9ffc feat: add server whitelist 2020-06-24 17:36:19 +02:00
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
455be836a6 alpha disclaimer 2020-06-24 13:44:39 +00:00
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
a3fbea3ac4 fix: hot-anim feature 2020-06-24 14:35:52 +02:00
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
5b0ef9da47 fix: do not store the password in the settings 2020-06-24 10:26:16 +02:00
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
d367511b77 nix: Add nixfmt package to shell.nix, update readme 2020-06-23 20:51:32 +03:00
bddbe51a1d nix: Switch to crate2nix, and niv for dependency management 2020-06-23 20:51:32 +03:00
16573fde41 Add channel setup for persistence to move character operations off the
main thread.
2020-06-23 21:07:43 +10:00
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
db3833a04e Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
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
0a47295466 update toolchain to nightly-2020-06-22 2020-06-22 18:37:24 +02:00
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
79feb6dceb switch log behavior for env variable and removed gfx spam by default 2020-06-22 16:49:40 +02:00
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