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,306 Commits 151 Branches 18 Tags 2.1 GiB
a673352ab9
Commit Graph

648 Commits

Author SHA1 Message Date
Monty Marz
72d5013a54 Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
scott-c
3d6a4ae462 Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Forest Anderson
cf33db9e6b Merge branch 'Swedneck/add-veloren-swedish-translation' into 'master' 
Add swedish translation

See merge request
2020-06-29 01:55:18 +00:00
Forest Anderson
4edd2151cf Fixed Veloren spelling 2020-06-28 20:41:22 -04:00
Patro
63da271d79 final tweaks in translation 2020-06-28 20:41:22 -04:00
Patro
21fc5bd5b5 Fixed some spelling errors and retranslated some sentences to make them sound better 2020-06-28 20:41:22 -04:00
Redo11
0e24597d98 Change uncanny valley to wildness as merged in 
6c4e3eb00a (be21cb369b4dfb9d7a565ddff0161533680a3583)
 2020-06-28 20:41:22 -04:00
Redo11
88c5c9726e Add translated comments and add back opensans as default font, as special characters still aren't supported. 2020-06-28 20:41:22 -04:00
Redo11
e770628d06 Add waypoints 2020-06-28 20:41:22 -04:00
jshipsey
bf8b10d0f6 polish 2020-06-28 20:41:22 -04:00
Tim Stahel
3074ce839d add swedish translation 2020-06-28 20:37:27 -04: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
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
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
719f9680e3 Merge branch 'CapsizeGlimmer/chat_modes' into 'master' 
Capsize glimmer/chat modes

Closes 

See merge request
2020-06-28 14:35:39 +00: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
CapsizeGlimmer
85d666c6e2 Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -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
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
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
Delyth Williams
87d81c42fe Fix sprites w/o models 2020-06-27 21:08:21 +00:00
CapsizeGlimmer
86969c8992 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04: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
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
2020-06-25 21:26:30 +00:00
Monty Marz
508d23c4db Merge branch 'WelshPixie/grassets' into 'master' 
Welsh pixie/grassets

See merge request
2020-06-25 21:12:31 +00:00
Delyth Williams
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +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
WelshPixie
126c93d72b added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
Songtronix
ce5b2b9ffc feat: add server whitelist 2020-06-24 17:36:19 +02:00
Delyth Williams
8b63fe7f15 added new flora 2020-06-15 16:39:21 +00:00
Forest Anderson
6deaae8d74 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Justin Shipsey
509ea38739 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Monty Marz
46e42cf8f2 fix broken main menu 2020-06-14 02:11:31 +02:00
Yusuf Bera Ertan
f1dab26f67 Add missing strings, fix a few translations 2020-06-08 21:47:30 +00:00
S Handley
c7c336e588 Replace audio files 2020-06-08 16:26:48 +00:00
Shane Handley
4714f8ddc7 Docs, make adding event mappers easier for sfx, remove placeholder 
sounds.
 2020-06-09 00:41:46 +10:00
Invisible Fox
7e2113fd4b Update ru_RU.ron: Fix typos 2020-06-08 10:31:29 +00:00
Shane Handley
337c277a6b Handle TripleStrike stages individually. 2020-06-08 10:19:42 +10:00
Shane Handley
016ebc7f71 Introduce a ToolCategory so we can ignore the specific type of weapon 
when deciding on the SFX to play when wielding/attacking.
 2020-06-08 10:19:42 +10:00
Shane Handley
97e8a96586 Target the specific attack types, to handle TripeStrike etc... 
Removed the Axe sfx until the animations show the swing
 2020-06-08 10:19:41 +10:00
Shane Handley
b543a9855a Add swoosh sounds for additional weapons. 2020-06-08 10:19:41 +10:00