Commit Graph

4294 Commits

Author SHA1 Message Date
Monty Marz
0969c236d6 fix dark bubble tail not being displayed correctly 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
2d2aba3a5d Chat bubble text shadows. Fix panic when re-joining a group or faction 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
b04810cae5 misc chat mode changes 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
5ad212b7ed Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
Pfauenauge90
a497fb92d3 icons 2020-06-27 17:20:26 -04:00
Pfauenauge90
f83c58498f bubble colors 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
b7d7696d89 Implement MR!1043 changes suggested by Imbris 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
34acc4ddf3 Players are removed from social menu when logged out. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
aabf9d7b21 fix chat-cli name formatting. 2020-06-27 17:20:26 -04:00
Monty Marz
80fe64e2b6 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
Delyth Williams
6644375764 Fix sprites w/o models 2020-06-27 21:08:21 +00:00
CapsizeGlimmer
4117f2f2a8 cargo fmt; changelog 2020-06-27 17:03:55 -04:00
CapsizeGlimmer
2a0f0053d4 Added chat mode icons to speech bubbles 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
35ed03aa18 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04:00
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
Ben Wallis
8434957d01 Fixed long mouse button names overflowing hotbar slots (#637) 2020-06-27 20:48:10 +01: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
Yusuf Bera Ertan
f6bdc57f1b
nix: Add nixfmt package to shell.nix, update readme 2020-06-23 20:51:32 +03:00
Yusuf Bera Ertan
6cfa48e82e
nix: Switch to crate2nix, and niv for dependency management 2020-06-23 20:51:32 +03:00