e4e25e20c9
rebase
2021-02-27 01:42:45 -05:00
0dc8b2e482
rendering
2021-02-27 01:42:45 -05:00
ca3248cc93
new dungeon setups, new npcs, weapon specific loadouts, anims
2021-02-27 01:42:45 -05:00
ac16a8900d
bow
2021-02-27 01:42:45 -05:00
66664f3f89
the stabs
2021-02-27 01:42:45 -05:00
6a57dd25d0
wielding
2021-02-27 01:42:45 -05:00
31208e29ee
run anim tweaks
2021-02-27 01:42:45 -05:00
559ece5ede
More npcs work
2021-02-27 01:42:45 -05:00
6f18d16aa2
Add new quadmeds npcs with rough offsets
2021-02-27 01:42:44 -05:00
ebfb59f041
Trims skeletal attributes
2021-02-27 01:42:44 -05:00
f48fea57f4
Sahagin, Adlet npcs
2021-02-27 01:42:43 -05:00
7cf723bb9d
gnome
2021-02-27 01:42:43 -05:00
266986626d
biped_small setup
2021-02-27 01:42:43 -05:00
a99a78abdb
Merge branch 'sam/improve-aura-buffs' into 'master'
...
Auras now apply a buff only once, instead of applying a buff every second.
See merge request veloren/veloren!1824
2021-02-27 03:21:47 +00:00
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
64a809ee5b
Made comments more descriptive
2021-02-26 18:15:24 -05:00
45dd36be07
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
ded0cd0302
Merge branch 'xMAC94x/netfixF' into 'master'
...
Shutdown improvements
See merge request veloren/veloren!1822
2021-02-26 10:33:03 +00:00
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
fff194dfbf
coral and kelp, cargo fmt
2021-02-25 23:47:38 -05:00
02eb76416f
tweaking coral models and seagrass spawns
2021-02-25 23:39:41 -05:00
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
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
7d2e8f72eb
Add a coin item and make amounts visible on dropped items.
2021-02-25 21:31:30 -05:00
1d4b8d4d99
correcting formatting and removing commented out code that wasn't supposed to be there
2021-02-25 20:41:57 -05:00
2bab3cdced
Fixes weapons model and icon offsets
2021-02-26 02:37:59 +01:00
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
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
f39f5ab5d3
added coral reefs, kelp forests, and seagrass
2021-02-25 05:33:18 -05:00
017e037e69
Weapon offsets in humanoid manifest
2021-02-24 21:52:32 -05:00
b0b4a07b9e
Bows
2021-02-24 20:37:43 -05:00
84a5b3dcc5
Axes
2021-02-24 19:11:41 -05:00
ee5c9d78ca
Swords
2021-02-24 18:54:06 -05:00
d4e3a3f29f
#966 - Add setting to invert controller camera Y axis
2021-02-24 10:39:44 -06:00
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
e4f8a9ed6c
pt br trade updates
2021-02-23 23:21:30 +00:00
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
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
4e57678f34
Support modular weapon components made from a tagged material using the material as a multiplier.
2021-02-23 15:31:51 -05:00
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
3d57db9485
Test fix for torvus
2021-02-23 14:38:58 -05:00
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
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
4b1c033f6e
Added scopeguard to protect against unwind
2021-02-23 13:58:13 +01:00
74ec5c652a
Added safety section to the EcsAccessManager
2021-02-23 13:58:07 +01:00
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
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
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
c3ac8a1b51
Support modular weapon voxel meshes being made by assembling their components.
2021-02-23 00:45:26 +00:00
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
