Commit Graph

657 Commits

Author SHA1 Message Date
Forest Anderson
3e830aa0ca Merge branch 'angel/add-spawn-training-dummy' into 'master'
Added spawning test dummy

See merge request veloren/veloren!1142
2020-07-04 19:24:02 +00:00
Piotr Korgól
aefa7e2f11 Make chests and enemies use the basic loot table 2020-07-04 14:07:10 +02:00
unknown
9968398ea8 Added stuff to loot table 2020-07-04 12:40:28 +02:00
Piotr Korgól
d101d7f132 Implemented a lottery system 2020-07-04 12:40:27 +02:00
Forest Anderson
c7ffe3dbeb Merge branch 'nancok/fix-es-translations' into 'master'
Update es_la.ron

See merge request veloren/veloren!1151
2020-07-04 03:54:55 +00:00
Forest Anderson
954a4857c4 Added proper training dummy model 2020-07-03 16:53:04 -04:00
Samuel Keiffer
85d1d4b3ff Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap. 2020-07-03 15:40:12 +00:00
Monty Marz
95a799cf85 fix artifacts, cleanup 2020-07-03 12:17:55 +02:00
Monty Marz
89400264dc Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
scott-c
d53b51954b Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Luciano
4a8443f743 Update es_la.ron 2020-06-29 14:19:12 +00:00
Forest Anderson
be6d139e26 Merge branch 'Swedneck/add-veloren-swedish-translation' into 'master'
Add swedish translation

See merge request veloren/veloren!824
2020-06-29 01:55:18 +00:00
Forest Anderson
c50a2c8ac2 Fixed Veloren spelling 2020-06-28 20:41:22 -04:00
Patro
4bfe195336 final tweaks in translation 2020-06-28 20:41:22 -04:00
Patro
b37ed5f3a4 Fixed some spelling errors and retranslated some sentences to make them sound better 2020-06-28 20:41:22 -04:00
Redo11
54babe6615 Change uncanny valley to wildness as merged in
6c4e3eb00a (be21cb369b4dfb9d7a565ddff0161533680a3583)
2020-06-28 20:41:22 -04:00
Redo11
ecca666521 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
2c17ecbc99 Add waypoints 2020-06-28 20:41:22 -04:00
jshipsey
622fa88b41 polish 2020-06-28 20:41:22 -04:00
Tim Stahel
3b246dee42 add swedish translation 2020-06-28 20:37:27 -04: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
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
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
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
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
CapsizeGlimmer
3d29c3254a Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -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
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
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
Delyth Williams
6644375764 Fix sprites w/o models 2020-06-27 21:08:21 +00:00
CapsizeGlimmer
35ed03aa18 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04: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
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
WelshPixie
9887e5d45d added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
Songtronix
f44df23935 feat: add server whitelist 2020-06-24 17:36:19 +02:00
Delyth Williams
b73da5507e added new flora 2020-06-15 16:39:21 +00:00
Forest Anderson
c2beeef600 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Justin Shipsey
688f917308 asset
missing fix
2020-06-14 09:22:21 +00:00