jshipsey
2c74a86170
skill adjustments, ori changes
2021-04-25 22:02:32 -04:00
Samuel Keiffer
3f451ef7b3
Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master'
...
Fix campfire heal buff description
See merge request veloren/veloren!2165
2021-04-25 23:06:48 +00:00
Illia Denysenko
efd54021a7
Fix campfire heal buff description
2021-04-25 23:06:47 +00:00
Marcel
35584d0344
Merge branch 'xMAC94x/reduce_deps' into 'master'
...
remove some unused deps Yuri found
See merge request veloren/veloren!2197
2021-04-25 20:22:31 +00:00
Marcel Märtens
1842b2d6eb
remove some unused deps Yuri found
2021-04-25 20:18:20 +02:00
Sam
6848851dc3
Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided.
2021-04-25 13:09:10 -04:00
Monty
2e24fcf165
Add i18n, change SCT Blocked col and string
2021-04-25 13:09:09 -04:00
Sam
372eff2a02
Initial SCT implementation to display blocks.
2021-04-25 13:09:09 -04:00
Sam
d2d8d43410
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
2021-04-25 13:09:07 -04:00
alfy
9f79c80072
block and parry sounds added
2021-04-25 13:09:06 -04:00
Sam
288a6f3a82
Blocking now works if no weapon is equipped in main hand.
...
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
jshipsey
fad31bd7ab
anim
2021-04-25 13:08:43 -04:00
Sam
91c6288213
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Samuel Keiffer
f31feff1aa
Merge branch 'juliancoffee/fix_buff_bar' into 'master'
...
Fix bug with missing Burning icon
See merge request veloren/veloren!2195
2021-04-25 15:55:43 +00:00
juliancoffee
94bfbe37ea
Fix Bug with missing Burning icon
2021-04-25 10:44:22 +03:00
juliancoffee
8fd1037bf3
Update doc-strings
2021-04-25 09:12:15 +03:00
Snowram
c16ec43938
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
0f6b902924
Idle, run, vel/ori aware fly anims
2021-04-25 02:14:49 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Samuel Keiffer
e4324a3481
Merge branch 'ygor/skillbar-account-for-skillset' into 'master'
...
Make skillbar buttons account for energy cost reduction
See merge request veloren/veloren!2185
2021-04-24 19:32:19 +00:00
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee
Merge branch 'xvar/server-version-check' into 'master'
...
Added client/server version mismatch warnings
See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f
Added client/server version mismatch message when a network error is encountered during client init.
...
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
Ygor Souza
4f71c621f4
Make skillbar buttons account for energy cost reduction
...
Previously, the buttons would compare the current energy to the base
cost of the ability, so they would sometimes be grayed out while the
ability was usable. Now they ajust the ability with the character
skillset before getting the energy cost for the purposes of setting
the skillbar icon color.
2021-04-24 03:45:58 +02:00
juliancoffee
dc8d306890
Fix off-by-one error in localization tests
...
BlameHunk lines start counting from 1, not 0. Comparing with `line + 1`
fix this.
2021-04-23 14:11:44 +03:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Joshua Barretto
f987f4d628
Fixed broken crafting sprite requirement
2021-04-22 12:30:48 +01:00
jshipsey
19ce4ad531
comments
2021-04-22 00:04:39 -04:00
jshipsey
2f523f5aa0
formatting
2021-04-22 00:04:39 -04:00
jshipsey
0962fe72f2
fix for 1h on back
2021-04-22 00:04:39 -04:00
jshipsey
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Imbris
1af4a04231
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223
Merge branch 'zesterer/lanterns' into 'master'
...
Made characters carry lanterns higher when possible
See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Joshua Barretto
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Joshua Barretto
2c95165c82
Improvements to lantern holding when sitting
2021-04-21 16:54:03 +01:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Imbris
fd672980c4
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Imbris
26222a0a2d
Rename common-sys to common-systems and rearrange common-state slightly
2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Joshua Barretto
70c345eee9
Made crafting UI check exact crafting sprite
2021-04-20 15:23:52 +01:00
Monty Marz
abacdfc719
clippy
2021-04-20 02:48:17 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Joshua Barretto
1a0f6f03ef
Prevent crafting without station
2021-04-20 02:46:05 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
