1221 Commits

Author SHA1 Message Date
Joshua Barretto
afcf72d7e9 Removed bomb timeout 2020-07-05 16:15:51 +01:00
Joshua Barretto
4da106aec1 Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
40ff4923dc Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
jshipsey
840d228a20 remove slowmo test mode 2020-07-05 10:00:44 -04:00
jshipsey
2bec9b418f clippy fixes 2020-07-05 09:39:56 -04:00
Joshua Barretto
188bdccd3c Velocity-corrected bezier pathfinding control, swimming control 2020-07-05 09:38:15 -04:00
jshipsey
b4acd76435 more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets 2020-07-05 09:38:15 -04:00
Joshua Barretto
fb8ab18346 Smoother pathfinding for fast animals 2020-07-05 09:38:14 -04:00
jshipsey
efad612497 remove warnings, rebase fix 2020-07-05 09:38:14 -04:00
Joshua Barretto
f55843c167 More tolerant pathfinding 2020-07-05 09:38:14 -04:00
Joshua Barretto
79d52c0662 Run tilting, per-species running speed 2020-07-05 09:38:14 -04:00
jshipsey
29181be268 pangolin and special pangolin variable 2020-07-05 09:38:14 -04:00
jshipsey
fc34209243 more run animation work, adjusting pivots 2020-07-05 09:38:14 -04:00
Snowram
7ea7629d2c Add wolf, frostfang and mouflon npcs 2020-07-05 09:38:14 -04:00
Snowram
a3a55f5bb2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
32ec72cc3a Add tortoise mob 2020-07-05 09:38:13 -04:00
unknown
02b6a57063 Add asp mob 2020-07-05 09:38:13 -04:00
Snowram
12ca502a1d Add tiger mob 2020-07-05 09:38:12 -04:00
Snowram
955e348a53 Add alligator, salamander and monitor npcs 2020-07-05 09:38:12 -04:00
Snowram
6e0e3d094f Remove quad_low mobs from quad_medium 2020-07-05 09:38:12 -04:00
Snowram
6b6e9d5c8d Add quadruped_low skeleton 2020-07-05 09:38:11 -04:00
Forest Anderson
b2528b01f6 Merge branch 'xvar/skills' into 'master'
Initial implementation of skills and skill groups

See merge request veloren/veloren!1135
2020-07-05 00:33:11 +00:00
Forest Anderson
4bc5fe9cf9 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
4d1acf8fe1 Added tests and documentation to skills.rs 2020-07-04 14:32:24 -04:00
Piotr Korgól
079a6094cb Correctly load the loot table 2020-07-04 18:40:23 +02:00
Ben Wallis
aadaf83126 Refactored Skills/SkillGroups structure and implemented JSON persistence 2020-07-04 15:25:21 +01:00
Ben Wallis
7bf9182768 Moved skills stuff to new skills.rs file 2020-07-04 15:25:20 +01:00
Ben Wallis
a26c9c78f0 Added Skills and Skill Groups for characters 2020-07-04 15:25:04 +01:00
Piotr Korgól
3b7e75fde3 Make chests and enemies use the basic loot table 2020-07-04 14:07:10 +02:00
Piotr Korgól
61071c4654 Implemented a lottery system 2020-07-04 12:40:27 +02:00
Forest Anderson
30d8f03e7b Added proper training dummy model 2020-07-03 16:53:04 -04:00
Forest Anderson
34e3cb5eb5 Added spawning test dummy 2020-07-03 16:53:04 -04:00
Marcel
93bba77b2e Merge branch 'xMAC94x/network-switch' into 'master'
xmac94x/network switch

See merge request veloren/veloren!1139
2020-07-03 17:13:58 +00:00
Samuel Keiffer
c745b3abfd 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
Marcel Märtens
a0c4ffcda1 simple fmt in order to make the replacement commit as simple as possible 2020-07-03 13:11:44 +02:00
Marcel Märtens
7ba36f6d42 doing a simple 1:1 swap out network coding
this is the part which prob has less Merge conflics and is easy to rebase
the next commit will have prob alot of merge conflics
followed by a fmt commit
2020-07-03 13:11:31 +02:00
Monty Marz
72d5013a54 Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
Marcel
3342e5293b Merge branch 'scott-c/daggers' into 'master'
Scott-c/1h-wielding #185

See merge request veloren/veloren!1095
2020-07-01 12:07:35 +00:00
scott-c
3d6a4ae462 Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Marcel Märtens
e9e8d48a6e fix clippy issues in tests and add it to CI 2020-07-01 00:37:15 +02:00
Marcel Märtens
df73cb2676 fix various clippy issues 2020-07-01 00:37:06 +02:00
Samuel Keiffer
1bd3fb55b5 Adds a command that allows a username to be added or removed from the whitelist 2020-06-30 12:21:36 +00:00
Forest Anderson
3474222f07 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
74f668f0b6 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
1abf25ca71 Moved sfx from common to voxygen 2020-06-28 18:16:22 +01: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 #217

See merge request veloren/veloren!1043
2020-06-28 14:35:39 +00:00
Joshua Barretto
7eeb22a7b3 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
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
Forest Anderson
cf186b865a Fixing errors after rebase 2020-06-27 19:12:12 -04:00