727 Commits

Author SHA1 Message Date
Songtronix
8745e3ca98 fix: use correct specs(-idvs) versions
related to torvus
2020-07-09 19:46:30 +02:00
Samuel Keiffer
44e6fe01f1 Different body types now have different health values and gain different amounts of healths on leveling. 2020-07-09 00:04:25 +00:00
Ben Wallis
599b1ec627 Added CharacterDataError when character list fails to load due to Loadout de-serialization error 2020-07-08 09:34:20 +01:00
Ben Wallis
240bd0639b Added migration to create a default inventory and loadout for characters without one 2020-07-08 09:09:48 +01:00
Ben Wallis
8b8c68a3b8 Removed de-serialization failure tolerance to prevent player inventory/loadout wipes 2020-07-08 09:09:47 +01:00
Marcel Märtens
a2a33ddd55 fix specs 2020-07-07 14:28:00 +02:00
Marcel Märtens
d71e9d0ee9 updated dependencies and fixed stuff
- replace serde_derive by feature of serde
   incl. source code modifications to compile
 - reduce futures-timer to "2.0" to be same as async_std
 - update notify
 - removed mio, bincode and lz4 compress in common as networking is now in own crate
   btw there is a better lz4 compress crate, which is newer than 2017
 - update prometheus to 0.9
 - can't update uvth yet due to usues
 - hashbrown to 7.2 to only need a single version
 - libsqlite3 update
 - image didn't change as there is a problem with `image 0.23`
 - switch old directories with newer directories-next
 - no num upgrade as we still depend on num 0.2 anyways
 - rodio and cpal upgrade
 - const-tewaker update
 - dispatch (untested) update
 - git2 update
 - iterations update
2020-07-07 09:43:49 +02:00
Joshua Barretto
9243ab8a52 Fixed animal loadouts and /spawn 2020-07-07 02:21:14 +01:00
Joshua Barretto
333d8c70b3 Updated changelog 2020-07-07 01:11:37 +01:00
Joshua Barretto
5b8234eb5a Prevented pet damage 2020-07-07 01:01:39 +01:00
Joshua Barretto
f2092233b7 Fixed view distance bug 2020-07-06 16:36:13 +01:00
Marcel
92e3e3bc27 Merge branch 'imbris/smaller-fixes' into 'master'
Stop spamming loadout, Update specs

See merge request veloren/veloren!1165
2020-07-06 09:50:46 +00:00
Songtronix
1c9ed3f470 fix: allow maximum view distance in singleplayer 2020-07-06 10:37:44 +02:00
Imbris
ba1b10bf40 Upgrade hashbrown 2020-07-06 03:15:06 -04:00
Imbris
09a949404f Add some code to count how many updates will be sent for each component type (commented out) 2020-07-06 02:25:29 -04:00
Imbris
c4f5dee34f point to github specs to access PairedStorage type, fix Loadout sync spam 2020-07-06 01:56:02 -04:00
Joshua Barretto
9b5e2d7551 Fixed multiple char select bug 2020-07-05 18:05:00 +01:00
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
a0b3c4e9a4 Made fluids block explosions 2020-07-05 16:15:51 +01:00
Joshua Barretto
d5e0a7d351 Added bombs to loot table 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
Marcel
79f5d3189c Merge branch 'network-lockless' into 'master'
Network lockless

See merge request veloren/veloren!1153
2020-07-05 09:17:29 +00: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
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
Piotr Korgól
3b7e75fde3 Make chests and enemies use the basic loot table 2020-07-04 14:07:10 +02:00
Marcel Märtens
c40997622a remove Mutex in server as Stream is now 'Sync' 2020-07-04 12:31:59 +02:00
Forest Anderson
30d8f03e7b Added proper training dummy model 2020-07-03 16:53:04 -04:00
Forest Anderson
8e2006c27e Prevent xp gain from training dummy kill 2020-07-03 16:53:04 -04:00
Forest Anderson
d2941fd54e Fixed clippy issues 2020-07-03 16:53:04 -04:00
Forest Anderson
34e3cb5eb5 Added spawning test dummy 2020-07-03 16:53:04 -04: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
c877fbe41b network layer switch, doing the stuff that might confict.
- mostly its the message handling put now in a async wrapper
 - add some fixes to pass without warnings and make clippy happy
 - some network error handling is ignored, this can be improved but is no blocker
2020-07-03 13:11:38 +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 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
Ben Wallis
b929e4499f Fixed inventory full message when pressing the pickup item key in quick succession (#651) 2020-06-29 07:48:44 +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
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
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
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