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
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
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
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
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
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
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
cec54039bc
Character behavior system now uses immutable data struct
2021-02-22 15:30:53 -05:00
Snowram
246242b5a2
Adds look_dir to anims, humanoid heads pivot fixes
2021-02-22 20:00:06 +01:00
Marcel Märtens
b473bb9cbd
Client::new can now resolve DNS requests, better networking error messages
2021-02-22 17:35:19 +01:00
steanne
348f921212
Update _manifest.ron for minor typos in villager statements
2021-02-22 00:04:02 +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
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
Sam
6deabe9e47
Removed duplicate possess stick
2021-02-20 17:12:27 -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
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
