Joshua Yanovski
3a96b73b2c
Move figure meshing to a background thread.
2020-08-28 05:25:31 +02:00
Joshua Barretto
50a85853e3
Fmt and clippy lints fixes
2020-08-12 21:16:14 +01:00
BottledByte
ab1c43be84
Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
...
Also fixed two wrong asset references and did some .ron formatting
2020-08-05 01:21:42 +02:00
Imbris
db36578f83
Merge branch 'Menko/utility_items_fix_issue_612' into 'master'
...
#612 Fixed utility items not being removed from inventory/hotbar
See merge request veloren/veloren!1123
2020-07-18 02:41:45 +00:00
Nemanja
5caa6a07b0
#612 Fixed utility items not being removed from inventory/hotbar
2020-07-18 02:41:45 +00:00
Samuel Keiffer
6cce09be85
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
2020-07-18 00:05:28 +00:00
Joshua Barretto
8d6b442193
Crafting
2020-07-14 20:11:39 +00:00
Marcel Märtens
c212de00c2
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
Imbris
c2d6d00b00
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 01:56:02 -04:00
Joshua Barretto
2f6a618d5a
Added bombs, throwable items, more block kinds, weaker explosions
2020-07-05 16:15:48 +01: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
Ben Wallis
c1c968f479
Globally suppressed clippy lint option_map_unit_fn for #587
2020-06-14 16:48:07 +00:00
Ben Wallis
950c62efc6
Suppressed all existing clippy warnings in preparation for fixes as part of #587
2020-06-10 22:01:42 +01:00
Ben Wallis
de37de7f45
Initial clippy fixes as discussed in #587
2020-06-08 21:27:51 +01:00
Monty Marz
b34da9b07b
More item drops
2020-06-03 17:59:09 +00:00
Monty Marz
ecb7963730
Pfau/0.6 bg
2020-05-16 12:48:29 +00:00
CapsizeGlimmer
4e7f8c686a
Equipped lanterns now provide an illumination effect.
2020-05-04 15:15:31 +00:00
Imbris
c1c09dce1b
Enable unequipping as well as equipping to specific slots
2020-04-12 18:41:06 +02:00
Imbris
f551c4a2c5
Move armor types to a new location, use a const for the moving cutoff in voxygen anims
2020-03-28 01:52:12 -04:00
timokoesters
99e7e1f785
Split staff into 3 abilities
2020-03-24 14:00:22 +01:00
timokoesters
43d4e8aad2
Better inventory counter
2020-03-24 00:38:00 +01:00
timokoesters
1c145e8d3a
Add inventory counter
2020-03-24 00:23:21 +01:00
Pfauenauge90
6094e4b017
added chest drops
2020-03-20 01:11:02 +01:00
Pfauenauge90
3145b26cd6
item images
2020-03-19 22:36:40 +01:00
Pfauenauge90
3c0e070ed0
stack numbers
2020-03-19 19:33:59 +01:00
timokoesters
449ae22730
Add inventory stacking
2020-03-19 14:32:17 +01:00
timokoesters
aa963b7686
Merge remote-tracking branch 'origin/master' into clientstates
2020-03-15 15:27:06 +01:00
timokoesters
fe19698d52
Make abilities depend on weapon
2020-03-14 16:40:29 +01:00
S Handley
bc692c0101
Add audio and chat message feedback when the player attempts to collect something while thier inventory is full.
2020-03-11 10:30:59 +00:00
S Handley
b2312a0487
Check that a targeted collectible is within a certain pickup range of the character before highlighting it
2020-03-10 20:50:04 +00:00
Adam Whitehurst
54a7112ad9
resolve conflicts merging master -> clientstates
2020-03-07 12:49:48 -08:00
S Handley
b0ca85069b
Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it.
2020-03-04 10:09:48 +00:00
Marcel Märtens
dae31ae5b6
apply new rustfmt - touching alot of files
2020-02-01 21:39:39 +01:00
Marcel Märtens
dd21235ff8
Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable,
...
especially enumerations and other source code in errosions file
2020-02-01 21:37:36 +01:00
Forest Anderson
5a73554aa1
Merge branch 'qwertycrackers' into 'master'
...
Add a `debug_items` chat command that gives all debug items.
See merge request veloren/veloren!641
2019-11-11 17:36:31 +00:00
Monty Marz
c38447a264
assets update
...
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
2019-11-09 13:42:42 +00:00
Joseph Gerardot
0a44e714b4
Cargo fmt
2019-11-06 20:57:05 -05:00
Joseph Gerardot
52020e4902
Don't use the actual multiline doc comment syntax.
2019-11-06 18:02:58 -05:00
Joseph Gerardot
e73884a1d4
Respond to MR feedback.
...
Mainly clean up code with better use of iterators, and rename the debug
command to be just `debug`.
2019-11-06 17:57:54 -05:00
Joseph Gerardot
7325757066
cargo fmt
the previous changes.
2019-11-05 15:57:08 -05:00
Joseph Gerardot
fab5377eed
Add interface to add stuff in bulk to inventory
...
Also includes inventory tests.
inventory API.
2019-11-05 15:57:08 -05:00
timokoesters
20248a4818
feat: store items as RON files
...
When a new item is created, a ron file will be used as a template
2019-10-24 23:47:26 +02:00
Monty Marz
fdfab6a807
refactor: create_projectile doesn't take a light
...
It returns a builder so the caller can just do it
2019-10-17 20:59:36 +00:00
Imbris
2f9d8ee2e6
Add new debug item
2019-10-11 19:32:46 -04:00
Monty Marz
d82ec6715a
Item icons, chests and more
2019-10-09 19:28:05 +00:00
timokoesters
d876215012
feat(combat): melee combat damage depends on power of the weapon
...
Normal NPCs have a weapon of power 5 so they do 5 damage if the attack
is not blocked. Bosses and players have power 10.
2019-10-04 21:02:44 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation
2019-10-04 21:02:39 +02:00
Joshua Barretto
a6d5b82ef5
Prevented pickups with full inventory
2019-09-26 00:15:07 +01:00
Joshua Barretto
a961a267f1
Added apple and mushroom collection
2019-09-26 00:15:07 +01:00
Imbris
52d84248ec
Remove all warnings
2019-09-04 19:03:49 -04:00