2062 Commits

Author SHA1 Message Date
Sam
8dbdaa8759 Swords 2021-02-24 18:54:06 -05:00
Marcel
b305a3f5e0 Merge branch 'sam/torvus-fix-test' into 'master'
Fix for torvus

See merge request veloren/veloren!1816
2021-02-23 20:51:14 +00: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
Sam
ef3cc6e144 Test fix for torvus 2021-02-23 14:38:58 -05:00
Imbris
7b4450d858 Merge branch 'ccgauche/plugin-retreive' into 'master'
ccgauche/plugin retreive

See merge request veloren/veloren!1788
2021-02-23 16:36:05 +00:00
ccgauche
15e101c957 Added scopeguard to protect against unwind 2021-02-23 13:58:13 +01:00
ccgauche
4080152b56 Added safety section to the EcsAccessManager 2021-02-23 13:58:07 +01:00
Marcel
2fa374a32a Merge branch 'xMAC94x/physics_followup' into 'master'
physics followup, fix arrow problems

See merge request veloren/veloren!1811
2021-02-23 02:00:40 +00:00
Imbris
0d3a990931 Merge branch 'aweinstock/modular-weapon-rigging' into 'master'
Support modular weapon voxel meshes being made by assembling their components.

See merge request veloren/veloren!1806
2021-02-23 00:45:26 +00:00
Avi Weinstock
a25ad7f205 Support modular weapon voxel meshes being made by assembling their components. 2021-02-23 00:45:26 +00:00
Marcel
b83703c1c5 Merge branch 'sam/ecs-sys-struct' into 'master'
Sam/ecs sys struct

See merge request veloren/veloren!1813
2021-02-23 00:08:09 +00:00
ccgauche
a673c1a132 Fixed turbofish issues 2021-02-23 00:03:29 +01:00
ccgauche
bb0ab44e88 Removed the unwrap to ensure the WASM instance can't crash the host 2021-02-23 00:03:27 +01:00
ccgauche
4bd02c9a03 Change invalid message in examples and cleanup
Updated changelog + Removed hello plugin from plugins folder
2021-02-23 00:02:58 +01:00
ccgauche
ba8cf8437c Changed to less restrictive memory ordering 2021-02-23 00:02:51 +01:00
ccgauche
9e137b0738 Finalized Retrieve API 2021-02-22 23:59:41 +01: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
9832139e4e New cleaner safer version 2021-02-22 23:59:15 +01:00
ccgauche
143d23beb9 added basic retreive 2021-02-22 23:59:11 +01:00
Marcel Märtens
bd0178a1b2 physics followup, fix arrow problems by adding the vel_dt to the collision boundry 2021-02-22 23:51:01 +01:00
Sam
284a42060d Changed naming from 'immutable data' to 'read data' 2021-02-22 16:02:37 -05:00
Sam
cec54039bc Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Sam
d7808a4bf0 Controller system now uses immutable data struct 2021-02-22 14:33:54 -05:00
Sam
92394bb1b1 Stats system now uses immutable data struct 2021-02-22 14:27:34 -05:00
Sam
aa8068b021 Aura system now uses immutable data struct 2021-02-22 14:14:10 -05:00
Sam
f88d98790f Buff system now uses immutable data struct 2021-02-22 14:03:18 -05:00
Sam
a2f4bc1b76 Beam system now uses immutable data struct 2021-02-22 13:57:56 -05:00
Sam
0f33d79ed0 Shockwave system now uses immutable data struct 2021-02-22 13:49:56 -05:00
Sam
57a54731df Projectile system now uses immutable data struct 2021-02-22 13:37:42 -05:00
Sam
ae361bdea4 Melee system now uses immutable data struct 2021-02-22 13:25:21 -05:00
Marcel Märtens
d3ef72e2b7 share tokio Runtime between Client and Server, name rayon Threadpool 2021-02-22 17:35:06 +01:00
Vincent Glize
8e6d7cee71 Optimize Entity <> Entity collision check by calculating a entity via sphere. 2021-02-22 12:36:42 +01:00
Justin Shipsey
f4576de079 fix glider crash 2021-02-22 06:31:12 +00: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
Snowram
be17e607b1 Various fixes to beam, body based interp 2021-02-21 19:17:56 +01:00
Sam
87e6c692b2 Beam particles now determined from beam segment rather than character state. 2021-02-21 19:17:56 +01:00
Snowram
e889e516d4 Object animation 2021-02-21 19:17:44 +01:00
Snowram
3f39afcd84 Initial turret implementation 2021-02-21 18:23:54 +01:00
Samuel Keiffer
b8283e6243 Merge branch 'aweinstock/speed-floor-quickfix' into 'master'
Change the speed floor to `0.1` (avoiding a division by zero in modular...

See merge request veloren/veloren!1804
2021-02-21 02:49:57 +00:00
Avi Weinstock
14166acb46 Change the speed floor to 0.1 (avoiding a division by zero in modular weapons accidentally buffed the Twitching Root). 2021-02-20 19:19:26 -05:00
Sam
b0c26317b5 Added functionality for buffs queueing. Saturation now queues. 2021-02-20 17:13:17 -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
Avi Weinstock
2e1ee28949 Implement modular weapons.
- Add ItemKind::ModularComponent, Item::components.
- Add tool::StatKind::{Direct,Modular} for the modular weapons themselves.
- Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account.
- Crafting stores into the components field.
- Components/recipes/placeholders are created dynamically.
- Show which components a modular weapon contains in the tooltip in voxygen.

Squashed fixes:
- `Item::duplicate` components in `Item::new_from_item_def`.
- Speed of 1.0 for now.
2021-02-20 14:30:39 -05:00
Snowram
9a02777d22 Allows some species to be immune to specific buffs 2021-02-20 14:03:15 +00:00
Samuel Keiffer
f64d4e555c Merge branch 'sam/dual-wielding' into 'master'
Dual wielding backend

See merge request veloren/veloren!1787
2021-02-20 05:12:17 +00:00
Sam
77a8612e87 Addressed comments
Fixed audio test
2021-02-19 19:55:23 -05: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