1331 Commits

Author SHA1 Message Date
Jesus Bracho
6b1ba22d1f Implement stacking and splitting 2021-03-02 00:08:46 +00:00
jshipsey
8a82e1aa37 final asset corrections, fix glider anim 2021-03-01 17:37:47 -05:00
ccgauche
ad492d2343 Fixed clippy warning 2021-03-01 22:44:18 +01:00
ccgauche
43dfefe367 Separated the registration system into two files 2021-03-01 22:35:22 +01:00
ccgauche
32b16d71ce Adressed all comments 2021-03-01 22:24:02 +01:00
ccgauche
cc06cbce83 Fixed comments 2021-03-01 21:29:18 +01:00
ccgauche
612a507bc6 Updated CI + Changelog 2021-03-01 19:28:27 +01:00
ccgauche
927b2868ec Lots of improvement in pointer management (switched from i32 to u64) + New event implemented 2021-03-01 19:00:44 +01:00
Samuel Keiffer
c06e36fe6b Merge branch 'sam/invulnerability-buff' into 'master'
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Sam
0ec709bf17 Migration for armor re-organization. 2021-03-01 00:42:35 -05:00
jshipsey
f4a10912b0 more asset organization 2021-02-28 22:18:43 -05:00
Samuel Keiffer
a2c19cd047 Merge branch 'aweinstock/trade-requestitem' into 'master'
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
884e74cab8 Added command: '/safezone' 2021-02-28 18:14:59 -05:00
Sam
e582c2bdc6 Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command. 2021-02-28 15:02:03 -05:00
Avi Weinstock
1831efd8e4 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
Sam
fbba22ac2f Made changes to fix torvus 2021-02-27 22:42:11 -05:00
Sam
2aa332b5e2 Combo melee now checks combo 2021-02-27 18:24:28 -05:00
Sam
8003b5d570 Added combo component 2021-02-27 14:55:06 -05:00
jshipsey
8efc53fcef feedback adjustments 2021-02-27 01:42:47 -05:00
jshipsey
8f463921f8 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
jshipsey
7feb00f7e4 balance pass 2 2021-02-27 01:42:47 -05:00
jshipsey
9fdba83b03 initial balance 2021-02-27 01:42:47 -05:00
Snowram
ba18f1fab3 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
Sam
56acb6a5f0 Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
jshipsey
f8a6a48b41 BL improvements, various fixes 2021-02-27 01:42:45 -05:00
jshipsey
fbaaa60513 bow 2021-02-27 01:42:45 -05:00
Sam
714dc9106d Auras now apply a buff only once, instead of applying a buff every second.
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
2021-02-26 17:57:01 -05:00
Samuel Keiffer
a1ff097987 Merge branch 'aweinstock/coin-item' into 'master'
Add a coin item and make amounts visible on dropped items.

See merge request veloren/veloren!1821
2021-02-26 04:17:12 +00:00
Samuel Keiffer
d4e54217fc Merge branch 'add-gemu-models' into 'master'
Add sword and bow models from backlog

See merge request veloren/veloren!1818
2021-02-26 02:59:51 +00:00
Avi Weinstock
890aa6fbee Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
Sam
f4d25ff5c0 Bows 2021-02-24 20:37:43 -05:00
Sam
8dbdaa8759 Swords 2021-02-24 18:54:06 -05:00
Avi Weinstock
fa891ff74a Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers. 2021-02-23 15:49:34 -05:00
Snowram
af01c69456 Merge branch 'snowram/turret' into 'master'
Object animation, beam fixes, turret implementation

See merge request veloren/veloren!1805
2021-02-23 20:16:56 +00:00
ccgauche
4a460c2885 Retrieves added + New ECS memory layout for plugins 2021-02-22 23:59:32 +01:00
ccgauche
eb30572d29 Fixed the plugin compilation and added comments
TODO: Remove compilation errors on WASM side (while using common).
2021-02-22 23:59:25 +01:00
ccgauche
143d23beb9 added basic retreive 2021-02-22 23:59:11 +01:00
Marcel Märtens
b473bb9cbd Client::new can now resolve DNS requests, better networking error messages 2021-02-22 17:35:19 +01:00
Marcel Märtens
d3ef72e2b7 share tokio Runtime between Client and Server, name rayon Threadpool 2021-02-22 17:35:06 +01:00
Marcel Märtens
def5db54de Update Network Protocol
- now last digit version is compatible 0.6.0 will connect to 0.6.1
 - the TCP DATA Frames no longer contain START field, as it's not needed
 - the TCP OPENSTREAM Frames will now contain the BANDWIDTH field
 - MID is not Protocol internal

Update network
 - update API with Bandwidth

Update veloren
 - introduce better runtime and `async` things that are IO bound.
 - Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking`
 - remove futures_execute from client and server use tokio::runtime::Runtime instead
 - give threads a Name
2021-02-22 17:34:55 +01:00
Joshua Barretto
56bf0f6af0 Merge branch 'humanoid_ai_glide_when_falling' into 'master'
FIX #956: Humanoid ai glide when falling

See merge request veloren/veloren!1772
2021-02-22 00:57:25 +00:00
Overblob
4024f2d7e1 CI - Fix clippy errors
Fix trailing whitspace
2021-02-22 00:57:25 +00:00
Snowram
882c727514 Various fixes to object animation, cleanup 2021-02-21 19:56:46 +01:00
Sam
6deabe9e47 Removed duplicate possess stick 2021-02-20 17:12:27 -05:00
Avi Weinstock
44db4199b0 Implement persistence for modular weapons.
This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search.

Squahed fixes:

- Fix some constraint violations that occurred when swapping inventory items.
- Comment out recipes for modular weapons.
- Make update_item_at_slot_using_persistence_key and is_modular more idiomatic.
- Add changelog entry.
- Document `defer_foreign_keys` usage.
2021-02-20 14:31:46 -05:00
Snowram
9a02777d22 Allows some species to be immune to specific buffs 2021-02-20 14:03:15 +00:00
Sam
517abc79ab Factored out duplicate code into closures, consolidated ability handling logic to a single function. 2021-02-19 18:45:48 -05:00
Sam
16dcea0ecf Added hands field to all ron files of weapons.
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
2021-02-19 17:30:20 -05:00
Marcel Märtens
048fcf88f8 Stabelize Network again:
- completly switch to Bytes, even in api. speed up TCP by fak 2
 - improve benchmarks
 - speed up mpsc metrics
 - gracefully handle shutdown by interpreting Ok(0) as tokio::tcpstream closed now.
 - fix hotloop in participants by adding `Some(n)` to fix endless handing.
 - fix closing bug by closing streams after `recv_mgr` is shutdown even if now shutdown is triggered locally.
 - fix prometheus
 - no longer throw when a `Stream` is dropped while participant still receives a msg for it.
 - fix the bandwith handling, TCP network send speed is up to 1.5GiB/s while recv is 150MiB/s
 - add documentation
 - tmp require rt-multi-threaded in client for tokio, to not fail cargo check

this is prob stable, i tested over 1 hour.
after that some optimisations in priomgr.
and impl. propper bandwith.
Speed is up to 2GB/s write and 150MB/s recv on a single core

sync add documentation
2021-02-17 19:37:48 +01:00
Marcel Märtens
00386b6955 Great improvements to the codebase:
- better logging in network
 - we now notify the send of what happened in recv in participant.
 - works with veloren master servers
 - works in singleplayer, using a actual mid.
 - add `mpsc` in whole stack incl tests
 - speed up internal read/write with `Bytes` crate
 - use `prometheus-hyper` for metrics
 - use a metrics cache
2021-02-17 16:15:00 +01:00