Commit Graph

594 Commits

Author SHA1 Message Date
jshipsey
db64972e42 starting on trot, removing some warnings 2020-07-05 09:38:14 -04:00
Snowram
648e140be3 Add wolf, frostfang and mouflon npcs 2020-07-05 09:38:14 -04:00
Snowram
4acdc24df9 Add tarasque and grolgar improvements 2020-07-05 09:38:14 -04:00
Snowram
b1f4e4b9c1 Add new tusk ram model 2020-07-05 09:38:13 -04:00
Snowram
c22d543dd2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
1be42a8f85 Add tortoise mob 2020-07-05 09:38:13 -04:00
Snowram
016b05cf38 Add new grolgar model 2020-07-05 09:38:13 -04:00
Snowram
c7df12d2ea Set new lion model offsets, fix some jaws 2020-07-05 09:38:13 -04:00
unknown
4b493b196c Add asp mob 2020-07-05 09:38:13 -04:00
jshipsey
59777ee688 more quadmed run work 2020-07-05 09:38:13 -04:00
jshipsey
7d7ee11eef manifest, vox files 2020-07-05 09:38:13 -04:00
Snowram
1ffefde739 Run anim progress 2020-07-05 09:38:12 -04:00
Snowram
1f5e0216c4 Tiger offsets, lion new model 2020-07-05 09:38:12 -04:00
Snowram
390f516e13 Homogenizes quadmed bones names 2020-07-05 09:38:12 -04:00
Snowram
9fec5f3d14 Add tiger mob 2020-07-05 09:38:12 -04:00
jshipsey
6d9356d269 starting run anim 2020-07-05 09:38:12 -04:00
jshipsey
ccf939b4fd manifests, skeleton, basic placement 2020-07-05 09:38:12 -04:00
Snowram
c527484597 Add alligator, salamander and monitor npcs 2020-07-05 09:38:12 -04:00
Snowram
00b3301d6a Remove quad_low mobs from quad_medium 2020-07-05 09:38:12 -04:00
Snowram
fe1656931c Add legs to quadruped_medium 2020-07-05 09:38:12 -04:00
Snowram
72eb03ceb5 Add quadruped_low skeleton 2020-07-05 09:38:11 -04:00
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
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