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
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
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
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
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
2b5120319d
Character behavior system now uses immutable data struct
2021-02-22 15:30:53 -05:00
Snowram
684961b15c
Adds look_dir to anims, humanoid heads pivot fixes
2021-02-22 20:00:06 +01:00
Marcel Märtens
3f5c64bec0
Client::new can now resolve DNS requests, better networking error messages
2021-02-22 17:35:19 +01:00
steanne
838a0d8928
Update _manifest.ron for minor typos in villager statements
2021-02-22 00:04:02 +00:00
Snowram
4078eeb877
Various fixes to object animation, cleanup
2021-02-21 19:56:46 +01:00
Snowram
f25b2b1500
Various fixes to beam, body based interp
2021-02-21 19:17:56 +01:00
Snowram
e7bbf3981d
Object animation
2021-02-21 19:17:44 +01:00
Snowram
775224983b
Initial turret implementation
2021-02-21 18:23:54 +01:00
Sam
f5a74b4f33
Removed duplicate possess stick
2021-02-20 17:12:27 -05:00
Avi Weinstock
8bdbf4f7c9
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
479cf9fc4e
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
eaf3e02e39
Addressed comments
...
Fixed audio test
2021-02-19 19:55:23 -05:00
Sam
cfadd6da04
Added 1h swords.
2021-02-19 19:33:26 -05:00
Sam
d5ccc33abc
Factored out duplicate code into closures, consolidated ability handling logic to a single function.
2021-02-19 18:45:48 -05:00
Sam
bbfcde5e59
Re-deleted duplicate weapons that somehow reappeared.
2021-02-19 17:30:24 -05:00
Sam
411b4083b1
Added 1h hammers.
...
Fixed audio tests.
2021-02-19 17:30:24 -05:00
Sam
50cbe42b07
Added one-handed axes.
2021-02-19 17:30:23 -05:00
Sam
12545dd372
Added handedness to weapon tooltips.
2021-02-19 17:30:23 -05:00
Sam
8f0cca074d
Dual wielding now uses skillbar abilities from multiple weapons.
2021-02-19 17:30:22 -05:00
Sam
fc01e9ea68
Handedness of weapons affects power and speed.
2021-02-19 17:30:21 -05:00
Sam
582c3f8459
Check for prerequisite skill in using an ability is no longer hardcoded.
2021-02-19 17:30:21 -05:00
Sam
341affdae2
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
559ad7b7f5
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
7a29cc9eff
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
f10f88081d
Small chat message formatting changes and fixed missing player alias during admin entity possession
2021-02-17 02:15:45 +00:00
Felix Huettner
b8d5b812e1
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
03d28f7d93
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
abb5684883
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
e2b55e0706
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
e9b811b62b
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
250391656f
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
e54602c752
Merge branch 'Sarrakitty/gliders' into 'master'
...
Sarrakitty/gliders
See merge request veloren/veloren!1771
2021-02-12 09:49:53 +00:00
DaforLynx
ebbb06a400
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
8ac23ffcc2
fit models, adjusted drop rates
2021-02-11 09:29:26 -05:00
Sarra
7c23f97d89
tweaked a few things with the moth glider
2021-02-10 20:14:50 -05:00
Sarra
14b344469a
basic gliders
2021-02-10 19:02:36 -05:00
Sarra
0511563e35
moth glider
2021-02-10 19:02:36 -05:00
Imbris
3e98e18c46
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
Avi Weinstock
5d0c18efeb
Crafting UI: sort items lexicographically by craftability and then alphabetically.
2021-02-09 19:30:54 -05:00
Snowram
477bdfdfe7
Adresses some comments, various visual tweaks
2021-02-10 00:30:23 +01:00
Snowram
02f446fe4b
Adds lights to dungeons
2021-02-10 00:30:23 +01:00
Sarra Kitty
a956dad360
Sarrakitty/small fixes
2021-02-08 20:37:24 +00:00
Scott Williams
ae22a98167
Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops.
2021-02-07 19:04:20 +00:00
James Melkonian
1d8496ea21
Move agent system to server
2021-02-06 06:15:25 +00:00
Pascal Fuhrmann
9f7637ab21
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
Samuel Keiffer
c16cddb290
Merge branch 'azymohliad/update-uk' into 'master'
...
Update Ukrainian translation
See merge request veloren/veloren!1749
2021-02-03 16:18:50 +00:00
Andrii Zymohliad
7be836318b
Update Ukrainian translation
2021-02-03 16:18:49 +00:00
Sam
78a2459e6d
Changed knockback from an enum to a struct.
2021-02-02 13:06:30 -05:00
Pascal Fuhrmann
f4deb08a40
fixing #944 - LeapMelee fall damage fix & adjustments
2021-02-02 16:51:04 +00:00
James Melkonian
23b1df3cdd
Add basic NPC interaction and fix NPC chat spamming
2021-01-31 20:29:50 +00:00
Joshua Barretto
60c16e57b1
Added snow particles
2021-01-31 15:15:17 +00:00
Sam
e38ecafc17
Restored knockback to hammer.
2021-01-29 13:46:23 -05:00
Treeco
a1e56c69a4
Fix traveller backpack having all its slots removed
2021-01-29 12:47:30 +00:00
Marcel
b88f04215e
Merge branch 'DaforLynx/small-sound-fixes' into 'master'
...
Small audio fixes; addresses #939 and #940
Closes #940 and #939
See merge request veloren/veloren!1739
2021-01-29 11:37:10 +00:00
DaforLynx
c6e262c4ce
Small audio fixes; addresses #939 and #940
2021-01-29 11:37:10 +00:00
jiminycrick
a02444825d
Address some comments
...
Eliminated extra stagger state
Responding to more comments
Move poise character state changes to character behavior system
Move poise out of JoinTuple/Data
Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
jiminycrick
46c8c744fa
Add migration for starter gear
2021-01-28 17:22:39 -08:00
jiminycrick
152156d065
Fix rebase and scrub poise from UI
2021-01-28 17:22:39 -08:00
jiminycrick
661764f4aa
Some preliminary balancing
...
Fix rebase
2021-01-28 17:22:39 -08:00
jiminycrick
dd69b5f2bc
Poise stats
2021-01-28 17:22:35 -08:00
jiminycrick
c83296a4ec
Initial broken implementation of poise
...
Character movement no longer broken.
2021-01-28 17:22:33 -08:00
Entropy9s
1f6cf7e155
StaminaPlus buff, modifying stamina via buffs
...
trying to fix this, coming back to this later
please remember to change potion back future self!
this ALMOST works. maybe MR ready, kinda jank tho
so close, and yet so far...
IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO
did the same with health, ill fix this garbage l8r
think we're basically done here
whoops forgot to change the food back
fixing and cleaning up part 1
fixed everything part 2 now with buff images
ran clippy + fmt, fixed items that i modified
bracket bulldozing, boldly
hopefully this should be good?
need to rebase real quick
please let me be done
StaminaPlus buff, modifying stamina via buffs
trying to fix this, coming back to this later
please remember to change potion back future self!
this ALMOST works. maybe MR ready, kinda jank tho
so close, and yet so far...
IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO
did the same with health, ill fix this garbage l8r
think we're basically done here
whoops forgot to change the food back
fixing and cleaning up part 1
fixed everything part 2 now with buff images
ran clippy + fmt, fixed items that i modified
hopefully this should be good?
cargo clippy fmt stuff
deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
Scott Williams
0cde434e3b
All gems make a sound.
2021-01-25 22:53:23 +00:00
Sam
9b7edcf32f
Changed how beams determined the energy regen and energy cost.
2021-01-24 23:47:10 -05:00
Snowram
ad6cdcab71
Merge branch 'swilliams/gems' into 'master'
...
Adds 6 different gems and removes shiny gem.
See merge request veloren/veloren!1729
2021-01-25 01:25:40 +00:00
Scott Williams
efd953b4f4
Added other gems to crafting loot table.
2021-01-24 19:49:42 +00:00
Scott Williams
e50bd4dc6f
Changed some recipes to use other gems. Removed DELETE statements from migration.
2021-01-24 19:45:44 +00:00
Sam
6dd740feaa
Nerfed bow M1 and M2, slightly buffed bow skillbar ability.
2021-01-24 14:24:59 -05:00
Scott Williams
be311f8ff2
Added gem models for item_manifest
2021-01-24 18:20:10 +00:00
Scott Williams
157e56d8ca
Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds
2021-01-24 16:40:22 +00:00
Sam
314f0428fc
Rebalanced mindflayer.
2021-01-24 10:56:12 -05:00
Scott Williams
32bbdffc38
Added 6 gems, removed shiny gem from cave, replaced with diamond.
2021-01-24 14:00:49 +00:00
Monty
7cbf946a65
6 new sceptres, add DPS display to tooltips
2021-01-23 23:10:36 +01:00
Samuel Keiffer
39d1c9e885
Merge branch 'sam/skill-balancing-1' into 'master'
...
Skill balancing
See merge request veloren/veloren!1716
2021-01-23 21:12:35 +00:00
Rotsuoy
994677a4d0
Rotsuoy/savanna grass
2021-01-23 07:46:54 +00:00
Sam
5e4b6809ca
Sceptre nerfs.
2021-01-22 22:46:18 -05:00
Sam
b5a3b3442c
Addressed comments.
2021-01-21 17:45:03 -05:00
Snowram
8b06d844f7
Golem spinmelee anim
2021-01-21 01:23:10 +01:00
Sam
c888ec0535
Golems are now lactose tolerant.
2021-01-20 11:54:57 -05:00
Monty Marz
1eb7f78189
Revert "Added TR translations for deaths by debuffs."
...
This reverts commit 0817e45e13
2021-01-20 11:20:06 +00:00
jiminycrick
7dda25a66d
More footstep sfx based on distance
2021-01-19 19:51:19 -08:00
Sarra
f12e9f1665
small sfx fix, adding consume sfx for salads and lettuce
2021-01-19 16:24:44 -05:00
Acrimon
6f82ac352d
Merge branch 'acrimon/build-tip' into 'master'
...
Add a tip about the build command
See merge request veloren/veloren!1699
2021-01-19 20:45:26 +00:00
Sarra Kitty
e7d852835c
Sarrakitty/rotsys item sprites
2021-01-19 18:23:44 +00:00
Acrimon
21ecb15571
build tip
2021-01-19 19:02:41 +01:00
Monty Marz
ac60bf5794
Better visuals for skill button labels, don't show "0 EXP" in the SCT
...
Made functions that were called every frame significantly cheaper.
Final UI fixes.
2021-01-19 08:08:29 -05:00
Sam
eaa41c7dea
Skills are now factored into combat rating. New formula for exp scaling per SP.
...
Adjust lvl up msg fade
Add female humanoid names WIP
Changed text formatting when skill is max level. Added message to show you have 0 skill points available.
Addressed a lot of comments.
various changes to UI
- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon
Exp reward tweaks.
Fixed flamethrower range skill description.
2021-01-19 08:08:26 -05:00
jshipsey
5d1993009f
keyframed axe spin
...
Fixed error in converting FK to entity_id from character_id.
Giant match statements in persistence.
Tweaked roll.
Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-19 08:08:18 -05:00
Monty
5362000de4
adjusted potions, refined level up message animation
...
fixed incorrect translation used on axe double strike regen skill
Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
2021-01-19 08:08:14 -05:00
