Marcel Märtens
fd5d1ffaf3
remove some unused deps Yuri found
2021-04-25 20:18:20 +02:00
Sam
c368883499
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
c59f11ef6e
Add i18n, change SCT Blocked col and string
2021-04-25 13:09:09 -04:00
Sam
6294b3c5ff
Initial SCT implementation to display blocks.
2021-04-25 13:09:09 -04:00
Sam
fdd2b58954
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
2d3d48e84c
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
5a759be5e3
Fixed the sounds since they were seemingly empty, as well as a new more organic wind sound
2021-04-25 13:09:06 -04:00
alfy
434d1353eb
block and parry sounds added
2021-04-25 13:09:06 -04:00
Sam
b028b647ca
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
d4d2f4e79a
anim
2021-04-25 13:08:43 -04:00
Sam
165603aa65
Parrying
2021-04-25 13:08:42 -04:00
Sam
c9e1b1d341
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Samuel Keiffer
005910dae8
Merge branch 'sam/remove-unwraps' into 'master'
...
Removed unwraps in buffs
See merge request veloren/veloren!2196
2021-04-25 16:36:10 +00:00
Sam
e074562735
Removed unwraps in buffs
2021-04-25 12:01:21 -04:00
Samuel Keiffer
eb86237922
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
3937740794
Update CHANGELOG
2021-04-25 15:51:39 +03:00
Ben Wallis
865ee8528e
Merge branch 'juliancoffee/refactor_localization' into 'master'
...
Update doc-strings in voxygen/i18n
See merge request veloren/veloren!2194
2021-04-25 09:32:39 +00:00
juliancoffee
4cfc1bfecf
Fix Bug with missing Burning icon
2021-04-25 10:44:22 +03:00
juliancoffee
6f5b7b8de7
Update doc-strings
2021-04-25 09:12:15 +03:00
Justin Shipsey
afeabfbccf
Merge branch 'snowram/bird-large' into 'master'
...
Large bird skeleton
See merge request veloren/veloren!2121
2021-04-25 03:34:12 +00:00
Snowram
abfb14626a
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
58300592ca
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
James Melkonian
7cfd8debed
Phoenix AI pass
2021-04-25 04:07:11 +02:00
Snowram
4249d0ddcc
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
738be81943
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
ff5d267535
Day period dependant wildlife spawns
2021-04-25 02:14:51 +02:00
Snowram
b0d617d91d
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
e58e56cb07
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
e930b5ee18
Idle, run, vel/ori aware fly anims
2021-04-25 02:14:49 +02:00
Snowram
5b8fbe9a23
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Samuel Keiffer
869f1f9501
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
Marcel
6926eb587a
Merge branch 'ada/english-fallback' into 'master'
...
Add option to load English string as fallback if string missing
See merge request veloren/veloren!1791
2021-04-24 14:39:35 +00:00
Ada Lovegirls
c7d6dde677
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
2251c91b1a
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
d0108fe32b
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
Justin Shipsey
73cce1a51f
Merge branch 'holychowders/fix_grammatical_error' into 'master'
...
Fix grammatical error in NPC message
See merge request veloren/veloren!2191
2021-04-24 06:12:42 +00:00
holychowders
e7bbe45a42
Fix grammatical error in NPC message
2021-04-23 22:43:37 -07:00
Ygor Souza
efa7a2599e
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
Samuel Keiffer
a6d1b5dd2d
Merge branch 'ygor/fix-staff-shockwave-infinite-range' into 'master'
...
Fix fire shockwave infinite vertical range
Closes #1038
See merge request veloren/veloren!2189
2021-04-24 01:38:14 +00:00
Ygor Souza
9b7c7bc69a
Add basic distance check to shockwave hit test
...
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.
This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
2021-04-24 03:09:45 +02:00
Marcel
45eee41693
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
update uk_UA localization
See merge request veloren/veloren!2186
2021-04-23 21:30:46 +00:00
Illia Denysenko
37ed8aa208
update uk_UA localization
2021-04-23 21:30:46 +00:00
Songtronix
fafdc8af3e
Merge branch 'xMAC94x/quickfix_for_airshipper' into 'master'
...
xMac94x/quickfix for airshipper
See merge request veloren/veloren!2188
2021-04-23 18:52:21 +00:00
Marcel Märtens
e157c81671
have a seperate stage for scheduled builds
2021-04-23 17:48:02 +02:00
Marcel
76a22c6607
Merge branch 'juliancoffee/fix_localization_tests' into 'master'
...
Fix off-by-one error in localization tests
See merge request veloren/veloren!2187
2021-04-23 11:42:00 +00:00
juliancoffee
65fbc5ea98
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
Justin Shipsey
8cfa6dfb2d
Merge branch 'update_pt_BR_20210422' into 'master'
...
update pt_br 20210422
See merge request veloren/veloren!2182
2021-04-23 01:00:41 +00:00
Nícolas Wildner
a04768a33e
update pt_br 20210422
2021-04-23 01:00:41 +00:00
Imbris
e41da7e778
Merge branch 'ygor/fix-arrow-outcome-loop' into 'master'
...
Skip physics pass for arrows stuck on surfaces
Closes #1094
See merge request veloren/veloren!2183
2021-04-22 22:30:36 +00:00
Ygor Souza
72167db397
Skip physics pass for arrows stuck on surfaces
...
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
2021-04-22 23:03:04 +02:00
