4231 Commits

Author SHA1 Message Date
Monty Marz
edaf32b393 fix 2020-06-27 17:40:03 -04:00
Monty Marz
142a92fca8 icon frame 2020-06-27 17:40:03 -04:00
Monty Marz
69cb03a6be fix dark bubble tail not being displayed correctly 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
e25c149955 Chat bubble text shadows. Fix panic when re-joining a group or faction 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
908c7a2bd5 misc chat mode changes 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
0969e33086 Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
Pfauenauge90
aaf8aaca13 icons 2020-06-27 17:20:26 -04:00
Pfauenauge90
8be76d0dd9 bubble colors 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
c07759f3a1 Implement MR!1043 changes suggested by Imbris 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
5fc26b5921 Players are removed from social menu when logged out. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
01e7438d66 fix chat-cli name formatting. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
3a65b76547 cargo fmt; changelog 2020-06-27 17:03:55 -04:00
CapsizeGlimmer
f7be000e39 Added chat mode icons to speech bubbles 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
86969c8992 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
f7e4d92679 Added shortcut for chat commands /g=>/group, /s=>/say, /w=>/world, etc. 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
5f8907b5a7 Implement chat filtering for /say /region /group etc. 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
54a3f7e442 Implement /join_group and /join_faction commands 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
3742128186 Move message processing and chat bubbles to the client 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
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
CapsizeGlimmer
3f43880dc7 Rework chat processing 2020-06-27 16:29:03 -04:00
CapsizeGlimmer
aaf9af16df Base implementation of /group /faction /say /region 2020-06-27 16:26:02 -04: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