Forest Anderson
0d803bd20b
Merge branch 'FixFromDarkness/fix-russian-translations' into 'master'
...
Update ru_RU.ron: Fix typos
See merge request veloren/veloren!1126
2020-06-28 19:56:40 +00:00
Forest Anderson
3474222f07
Merge branch 'xvar/move-sfx-from-common-to-voxygen' into 'master'
...
Moved sfx from common to voxygen
See merge request veloren/veloren!1125
2020-06-28 18:38:25 +00:00
Forest Anderson
74f668f0b6
Merge branch 'yusdacra/crate2nix' into 'master'
...
nix: Switch to crate2nix for building, and niv for dependency management
See merge request veloren/veloren!1090
2020-06-28 18:28:29 +00:00
Ben Wallis
1abf25ca71
Moved sfx from common to voxygen
2020-06-28 18:16:22 +01:00
Forest Anderson
fac39d4705
Merge branch 'angel/fix-chattype-error' into 'master'
...
Fixed meta chattype error on master
See merge request veloren/veloren!1124
2020-06-28 17:10:01 +00:00
Forest Anderson
0f0e2fadbe
Fixed meta chattype error on master
2020-06-28 17:10:01 +00:00
Forest Anderson
719f9680e3
Merge branch 'CapsizeGlimmer/chat_modes' into 'master'
...
Capsize glimmer/chat modes
Closes #217
See merge request veloren/veloren!1043
2020-06-28 14:35:39 +00:00
Monty Marz
cee6e1ae75
changed message type for motd
2020-06-28 16:04:55 +02:00
Forest Anderson
a11c69ec31
Fixed double login message
2020-06-28 09:47:48 -04:00
Monty Marz
533891939d
remove unnecessary conversions to make clippy happy
2020-06-28 15:15:00 +02:00
Joshua Barretto
7eeb22a7b3
Merge branch 'xvar/loot-pickup-msgs' into 'master'
...
Implemented loot pickup chat messages (#616 ) and the option for playing different sounds for picked up items
See merge request veloren/veloren!1118
2020-06-28 12:34:58 +00:00
Ben Wallis
3c9745787e
Implemented loot pickup chat messages and the option for playing different sounds for picked up items
...
* Added chat message when an item is picked up
* Changed InventoryUpdateEvent::Collected to InventoryUpdateEvent::Collected(Item) to facilitate the client being aware of what was picked up
* Added SfxInventoryEvent enum to allow different sounds to be used based on the item type. The RON mapping/de-serialization doesn't support matching on structs so we have to give it fixed enum values which are determined in TryFrom<&InventoryUpdateEvent> for SfxEvent
* Refactored InventoryManip::Pickup arm of match in inventory_manip::handle_inventory for clarity/better warning messages
* Fixed a bug that prevented the CollectFailed event from being raised when a player's inventory is full
* Added a panic for the situation where an item is pushed into the players inventory and then the deletion of the entity fails as this would indicate an item dupe bug - this could potentially be reworked to pull the item back from the player's inventory but this seems like there's be a more correct transactional way to do this.
* Added two temporary sounds to prove the per-item sound functionality (pickup sounds for Swords and Staffs)
2020-06-28 13:05:28 +01:00
Joshua Barretto
2c1c00a7be
Merge branch 'xvar/mouse-button-names' into 'master'
...
Fixed long mouse button names overflowing hotbar slots (#637 )
See merge request veloren/veloren!1120
2020-06-28 11:11:29 +00:00
Forest Anderson
cf186b865a
Fixing errors after rebase
2020-06-27 19:12:12 -04:00
CapsizeGlimmer
ca0c7c0531
cargo fmt
2020-06-27 17:43:46 -04:00
CapsizeGlimmer
85d666c6e2
Add setting for displaying character names in chat. Placate cargo clippy.
2020-06-27 17:43:46 -04:00
CapsizeGlimmer
550ad20ade
Admin status added when registering; cargo fmt
2020-06-27 17:43:45 -04:00
CapsizeGlimmer
b985531e59
Added option to disable speech bubble icons. Aligned settings>gameplay menu again.
2020-06-27 17:40:03 -04:00
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
Monty Marz
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
Delyth Williams
87d81c42fe
Fix sprites w/o models
2020-06-27 21:08:21 +00: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
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
