Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,275 Commits 151 Branches 18 Tags
e770628d06
Commit Graph

4275 Commits

Author SHA1 Message Date
Redo11
e770628d06 Add waypoints 2020-06-28 20:41:22 -04:00
jshipsey
bf8b10d0f6 polish 2020-06-28 20:41:22 -04:00
Marcel
74c04503dd Merge branch 'xMAC94x/network-adj' into 'master' 
- switched participant to only error!() once a sec instead of every occurence...

See merge request
2020-06-28 23:10:15 +00:00
Forest Anderson
8eb984a133 Merge branch 'nwilder/add-brazilian-portugese-translation' into 'master' 
Nwilder/add brazilian portugese translation

See merge request
2020-06-28 21:29:08 +00:00
Forest Anderson
09d1cabc4e Merge branch 'wusyong/tchinese' into 'master' 
Add Traditional Chinese translation

See merge request
2020-06-28 21:23:57 +00:00
Forest Anderson
91cec1e0cd Merge branch 'nancok/add-spanish-translation' into 'master' 
Add Spanish translation

See merge request
2020-06-28 21:22:16 +00:00
Marcel Märtens
dc5cc593ff - 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
0d803bd20b Merge branch 'FixFromDarkness/fix-russian-translations' into 'master' 
Update ru_RU.ron: Fix typos

See merge request
2020-06-28 19:56:40 +00:00
Treeco
37a81f1f4c 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
d7253b6df5 Uploaded Spanish (Latin American) translation, 2020-06-28 14:50:42 -04:00
Luciano
72af7a4ce1 Upload Latin America Spanish translation 2020-06-28 14:50:42 -04:00
Forest Anderson
c948ff5959 Changed license name 2020-06-28 14:47:26 -04:00
Forest Anderson
3474222f07 Merge branch 'xvar/move-sfx-from-common-to-voxygen' into 'master' 
Moved sfx from common to voxygen

See merge request
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
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
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 

See merge request
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 () and the option for playing different sounds for picked up items

See merge request
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 ()

See merge request
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
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