jshipsey
d8eeffeacd
speedier weapons initial testing
2021-02-27 01:42:45 -05:00
jshipsey
f8a6a48b41
BL improvements, various fixes
2021-02-27 01:42:45 -05:00
jshipsey
6f49e0b94e
rebase
2021-02-27 01:42:45 -05:00
jshipsey
749fc13882
rendering
2021-02-27 01:42:45 -05:00
jshipsey
fc80fff924
new dungeon setups, new npcs, weapon specific loadouts, anims
2021-02-27 01:42:45 -05:00
jshipsey
fbaaa60513
bow
2021-02-27 01:42:45 -05:00
jshipsey
4e3bf62732
the stabs
2021-02-27 01:42:45 -05:00
jshipsey
36711e8885
wielding
2021-02-27 01:42:45 -05:00
jshipsey
2a908d5638
run anim tweaks
2021-02-27 01:42:45 -05:00
unknown
aa4f68d72b
More npcs work
2021-02-27 01:42:45 -05:00
unknown
917afb3f0d
Add new quadmeds npcs with rough offsets
2021-02-27 01:42:44 -05:00
Snowram
64617f1abe
Trims skeletal attributes
2021-02-27 01:42:44 -05:00
Snowram
39b76036b1
Sahagin, Adlet npcs
2021-02-27 01:42:43 -05:00
jshipsey
37a4bb4bef
gnome
2021-02-27 01:42:43 -05:00
jshipsey
fd96357775
biped_small setup
2021-02-27 01:42:43 -05:00
Samuel Keiffer
b88bf6bd21
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
Snowram
79d4ca6fae
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
Sam
4cb61a2e8d
Made comments more descriptive
2021-02-26 18:15:24 -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
Marcel
ee2ca23a85
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
aa88f90056
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
cc92fa9c7b
coral and kelp, cargo fmt
2021-02-25 23:47:38 -05:00
Sarra
73f966dc63
tweaking coral models and seagrass spawns
2021-02-25 23:39:41 -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
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
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
