6748 Commits

Author SHA1 Message Date
Avi Weinstock
890aa6fbee Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
Sarra
c965db4420 correcting formatting and removing commented out code that wasn't supposed to be there 2021-02-25 20:41:57 -05:00
Snowram
c77721e8c7 Fixes weapons model and icon offsets 2021-02-26 02:37:59 +01:00
Samuel Keiffer
f608ff9806 Merge branch 'aweinstock/modularforms' into 'master'
Support modular weapon components made from a tagged material using the material as a multiplier.

See merge request veloren/veloren!1815
2021-02-26 00:53:02 +00:00
Avi Weinstock
e58768bc37 Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips. 2021-02-25 15:26:49 -05:00
Sarra
07f34e11f9 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
Sam
2a5edb41ab Weapon offsets in humanoid manifest 2021-02-24 21:52:32 -05:00
Sam
f4d25ff5c0 Bows 2021-02-24 20:37:43 -05:00
Sam
8af4966ae1 Axes 2021-02-24 19:11:41 -05:00
Sam
8dbdaa8759 Swords 2021-02-24 18:54:06 -05:00
heydabop
102d8d2359 #966 - Add setting to invert controller camera Y axis 2021-02-24 10:39:44 -06:00
Snowram
8c1f8f6441 Merge branch 'nwildner/pt_BR_trade-updates' into 'master'
pt br trade updates

See merge request veloren/veloren!1810
2021-02-23 23:21:30 +00:00
Nícolas Wildner
3602c46327 pt br trade updates 2021-02-23 23:21:30 +00: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
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
Avi Weinstock
77aeb43247 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -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
Sam
ef3cc6e144 Test fix for torvus 2021-02-23 14:38:58 -05:00
Forest Anderson
0e26eb4ec5 Merge branch 'angel/add-contributor-count-to-readme' into 'master'
Added contributor count badge to readme

See merge request veloren/veloren!1792
2021-02-23 19:18:44 +00: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
Samuel Keiffer
48e2484f98 Merge branch 'aweinstock/quickfix-sword-spin-speed' into 'master'
Fix description for the sword spin speed skill tree upgrade (previously it was...

See merge request veloren/veloren!1814
2021-02-23 03:14:44 +00: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
Avi Weinstock
83d6931125 Fix description for the sword spin speed skill tree upgrade (previously it was a copy of damage's description). 2021-02-22 19:37:20 -05: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
Marcel
ec05d0c253 Merge branch 'xMAC94x/prot_improvements' into 'master'
xMAC94x/prot_improvements

See merge request veloren/veloren!1796
2021-02-22 22:47:43 +00:00
Justin Shipsey
7d9a8b27e3 Merge branch 'steanne-master-patch-91284' into 'master'
Update _manifest.ron for minor typos in villager statements

See merge request veloren/veloren!1807
2021-02-22 22:10:38 +00:00
Sam
284a42060d Changed naming from 'immutable data' to 'read data' 2021-02-22 16:02:37 -05:00
Justin Shipsey
d54d777f86 Merge branch 'snowram/look-dir-anims' into 'master'
Adds look_dir to anims, humanoid heads pivot fixes

See merge request veloren/veloren!1812
2021-02-22 20:55:18 +00:00
Sam
cec54039bc Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Marcel Märtens
7ce91665f8 cleanup ClientConnArgs 2021-02-22 21:07:20 +01: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
Snowram
246242b5a2 Adds look_dir to anims, humanoid heads pivot fixes 2021-02-22 20:00:06 +01:00
Sam
a2f4bc1b76 Beam system now uses immutable data struct 2021-02-22 13:57:56 -05:00