Snowram
1172c2f2c3
Merge branch 'Sarrakitty/OceanFlora' into 'master'
...
added coral reefs, kelp forests, and seagrass
See merge request veloren/veloren!1819
2021-02-27 01:52:33 +00:00
Marcel
ded0cd0302
Merge branch 'xMAC94x/netfixF' into 'master'
...
Shutdown improvements
See merge request veloren/veloren!1822
2021-02-26 10:33:03 +00:00
Marcel Märtens
44817870ee
Shutdown improvements
...
- Timeout for Participant::drop, it will stop eventually
- Detect tokio runtime in Participant::drop and no longer use std::sleep in that case (it could hang the thread that is actually doing the shutdown work and deadlock
- Parallel Shutdown in Scheduler: Instead of a slow shutdown locking up everything we can now shutdown participants in parallel, this should reduces `WARN` part took long for shutdown dramatically
2021-02-26 10:50:30 +01:00
Sarra
fff194dfbf
coral and kelp, cargo fmt
2021-02-25 23:47:38 -05:00
Sarra
02eb76416f
tweaking coral models and seagrass spawns
2021-02-25 23:39:41 -05:00
Samuel Keiffer
8e07174c1d
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
6af9e58965
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
7d2e8f72eb
Add a coin item and make amounts visible on dropped items.
2021-02-25 21:31:30 -05:00
Sarra
1d4b8d4d99
correcting formatting and removing commented out code that wasn't supposed to be there
2021-02-25 20:41:57 -05:00
Snowram
2bab3cdced
Fixes weapons model and icon offsets
2021-02-26 02:37:59 +01:00
Samuel Keiffer
00937a4e8b
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
e1484c28c0
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
f39f5ab5d3
added coral reefs, kelp forests, and seagrass
2021-02-25 05:33:18 -05:00
Sam
017e037e69
Weapon offsets in humanoid manifest
2021-02-24 21:52:32 -05:00
Sam
b0b4a07b9e
Bows
2021-02-24 20:37:43 -05:00
Sam
84a5b3dcc5
Axes
2021-02-24 19:11:41 -05:00
Sam
ee5c9d78ca
Swords
2021-02-24 18:54:06 -05:00
Snowram
914266c705
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
e4f8a9ed6c
pt br trade updates
2021-02-23 23:21:30 +00:00
Marcel
553e8c2195
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
78014d7d3b
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
4e57678f34
Support modular weapon components made from a tagged material using the material as a multiplier.
2021-02-23 15:31:51 -05:00
Snowram
14c252d8b2
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
3d57db9485
Test fix for torvus
2021-02-23 14:38:58 -05:00
Forest Anderson
dd42738503
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
da3edf54fb
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
4b1c033f6e
Added scopeguard to protect against unwind
2021-02-23 13:58:13 +01:00
ccgauche
74ec5c652a
Added safety section to the EcsAccessManager
2021-02-23 13:58:07 +01:00
Samuel Keiffer
e1be8dbcd9
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
2fbd382c91
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
f33d3873b4
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
c3ac8a1b51
Support modular weapon voxel meshes being made by assembling their components.
2021-02-23 00:45:26 +00:00
Avi Weinstock
ada4ca39f7
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
6081ebbe15
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
f85e79af07
Fixed turbofish issues
2021-02-23 00:03:29 +01:00
ccgauche
a12e554266
Removed the unwrap to ensure the WASM instance can't crash the host
2021-02-23 00:03:27 +01:00
ccgauche
387daf8aea
Change invalid message in examples and cleanup
...
Updated changelog + Removed hello plugin from plugins folder
2021-02-23 00:02:58 +01:00
ccgauche
6c991cc2cd
Changed to less restrictive memory ordering
2021-02-23 00:02:51 +01:00
ccgauche
267e7d8b4c
Finalized Retrieve API
2021-02-22 23:59:41 +01:00
ccgauche
06aa7ab70c
Retrieves added + New ECS memory layout for plugins
2021-02-22 23:59:32 +01:00
ccgauche
1597fcc79e
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
8a693d9fde
New cleaner safer version
2021-02-22 23:59:15 +01:00
ccgauche
a067a20b69
added basic retreive
2021-02-22 23:59:11 +01:00
Marcel Märtens
6008109413
physics followup, fix arrow problems by adding the vel_dt to the collision boundry
2021-02-22 23:51:01 +01:00
Marcel
72bd0f42fc
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
56f8e66d5d
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
3f467a32e6
Changed naming from 'immutable data' to 'read data'
2021-02-22 16:02:37 -05:00
Justin Shipsey
fb9b7ce986
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
2b5120319d
Character behavior system now uses immutable data struct
2021-02-22 15:30:53 -05:00
Marcel Märtens
e3ef4422b6
cleanup ClientConnArgs
2021-02-22 21:07:20 +01:00
