Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,638 Commits 151 Branches 18 Tags
Commit Graph

1295 Commits

Author SHA1 Message Date
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
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
Sam
2d9887f9f9 Added 1h swords. 2021-02-19 19:33:26 -05:00
Sam
517abc79ab Factored out duplicate code into closures, consolidated ability handling logic to a single function. 2021-02-19 18:45:48 -05:00
Sam
7be14eef30 Re-deleted duplicate weapons that somehow reappeared. 2021-02-19 17:30:24 -05:00
Sam
b934023169 Added 1h hammers. 
Fixed audio tests.
 2021-02-19 17:30:24 -05:00
Sam
35f106c184 Added one-handed axes. 2021-02-19 17:30:23 -05:00
Sam
1b7d4b95b8 Added handedness to weapon tooltips. 2021-02-19 17:30:23 -05:00
Sam
c2cf3b890e Dual wielding now uses skillbar abilities from multiple weapons. 2021-02-19 17:30:22 -05:00
Sam
d94595423c Handedness of weapons affects power and speed. 2021-02-19 17:30:21 -05:00
Sam
a32c14a78b Check for prerequisite skill in using an ability is no longer hardcoded. 2021-02-19 17:30:21 -05:00
Sam
16dcea0ecf Added hands field to all ron files of weapons. 
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
 2021-02-19 17:30:20 -05:00
Avi Weinstock
d44565d6cc Client-side trade improvements. 
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
 2021-02-19 15:20:27 -05:00
Nícolas Wildner
0e697432b2 creating char_selection.ron plus minor portuguese fixes for better formal language (like olhos - eyes and not olho) 2021-02-17 08:28:04 +00:00
TheThirdSpartan
6b236cbc30 Small chat message formatting changes and fixed missing player alias during admin entity possession 2021-02-17 02:15:45 +00:00
Felix Huettner
e9e709758a Allow minimap to always face north 
Some players prefer their minimap to always face north for better
orientation.
 2021-02-16 19:57:19 +01:00
Avi Weinstock
d4907197b3 Implement tags for items, allowing a crafting recipe to take any item with that tag as input. 
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
 2021-02-16 01:05:54 +00:00
Avi Weinstock
e0f4bb3dc6 Trade implementation progress. 
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
 2021-02-12 18:43:10 -05:00
Avi Weinstock
2b9129d290 Implement enough of a trade UI that dragging & dropping items into it round-trips between clients. 2021-02-12 18:43:09 -05:00
Avi Weinstock
94ef4a6917 Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Avi Weinstock
9c62289cad Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key). 2021-02-12 18:43:09 -05:00
Snowram
5f1b8b1c50 Merge branch 'Sarrakitty/gliders' into 'master' 
Sarrakitty/gliders

See merge request veloren/veloren!1771
 2021-02-12 09:49:53 +00:00
DaforLynx
2d71ca0f41 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
Sarra
084acf6bf7 fit models, adjusted drop rates 2021-02-11 09:29:26 -05:00
Sarra
895679a128 tweaked a few things with the moth glider 2021-02-10 20:14:50 -05:00
Sarra
5942611db9 basic gliders 2021-02-10 19:02:36 -05:00
Sarra
331d9bf1c0 moth glider 2021-02-10 19:02:36 -05:00
Imbris
93da46e1c1 Merge branch 'aweinstock/sort-crafting' into 'master' 
Crafting UI: sort items lexicographically by craftability and then alphabetically.

See merge request veloren/veloren!1767
 2021-02-10 04:04:42 +00:00