jshipsey
622fa88b41
polish
2020-06-28 20:41:22 -04:00
Marcel
04b7837340
Merge branch 'xMAC94x/network-adj' into 'master'
...
- switched participant to only error!() once a sec instead of every occurence...
See merge request veloren/veloren!1129
2020-06-28 23:10:15 +00:00
Forest Anderson
07298cdbeb
Merge branch 'nwilder/add-brazilian-portugese-translation' into 'master'
...
Nwilder/add brazilian portugese translation
See merge request veloren/veloren!1128
2020-06-28 21:29:08 +00:00
Forest Anderson
985b0e2bfd
Merge branch 'wusyong/tchinese' into 'master'
...
Add Traditional Chinese translation
See merge request veloren/veloren!885
2020-06-28 21:23:57 +00:00
Forest Anderson
f5cede6a90
Merge branch 'nancok/add-spanish-translation' into 'master'
...
Add Spanish translation
See merge request veloren/veloren!822
2020-06-28 21:22:16 +00:00
Marcel Märtens
57453291e4
- switched participant to only error!() once a sec instead of every occurence in order to not spam error
...
- switched the behavior of prio to keep the order of a stream, EVEN if messages of different length are used!
This needs to be addresses to fulfill PROMISES_ORDERED
I think we need to make thoughs if PRIO needs to handle this, or we add additional meta info and handle it on receiver site
2020-06-28 22:29:42 +02:00
Forest Anderson
cda757f96c
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
Treeco
4098d69a69
Fixed up a few things
...
Added fonts section to translation file required by changes to
translation system
Removed unneeded copy of translation file
2020-06-28 14:50:42 -04:00
Luciano
948db32ba8
Uploaded Spanish (Latin American) translation,
2020-06-28 14:50:42 -04:00
Luciano
9e33fd5131
Upload Latin America Spanish translation
2020-06-28 14:50:42 -04:00
Forest Anderson
9166969c37
Changed license name
2020-06-28 14:47:26 -04:00
Forest Anderson
635c0d06f0
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
a3eafe9b70
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
dc1844b489
Moved sfx from common to voxygen
2020-06-28 18:16:22 +01:00
Forest Anderson
2b2e24be5e
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
201f513737
Fixed meta chattype error on master
2020-06-28 17:10:01 +00:00
Forest Anderson
9246e34c1b
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
f3a84e07a7
changed message type for motd
2020-06-28 16:04:55 +02:00
Forest Anderson
48f70bd088
Fixed double login message
2020-06-28 09:47:48 -04:00
Monty Marz
670d9e8736
remove unnecessary conversions to make clippy happy
2020-06-28 15:15:00 +02:00
Joshua Barretto
1d06df9d79
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
a9d3f984f0
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
41b03208cb
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
2665159790
Fixing errors after rebase
2020-06-27 19:12:12 -04:00
CapsizeGlimmer
883d9acf30
cargo fmt
2020-06-27 17:43:46 -04:00
CapsizeGlimmer
3d29c3254a
Add setting for displaying character names in chat. Placate cargo clippy.
2020-06-27 17:43:46 -04:00
CapsizeGlimmer
59db2fcd3b
Admin status added when registering; cargo fmt
2020-06-27 17:43:45 -04:00
CapsizeGlimmer
92127292d4
Added option to disable speech bubble icons. Aligned settings>gameplay menu again.
2020-06-27 17:40:03 -04:00
Monty Marz
a204072e78
fix
2020-06-27 17:40:03 -04:00
Monty Marz
3ed646b512
icon frame
2020-06-27 17:40:03 -04:00
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
