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
7,865 Commits 151 Branches 18 Tags 2.1 GiB
ccc22d4969
Commit Graph

7865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Keiffer
ccc22d4969 Merge branch 'sam/block-parry' into 'master' 
Blocking/Parrying

Closes #646 and #416

See merge request veloren/veloren!2153
 2021-04-25 18:25:24 +00: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
73cb6d19ff 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
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
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Samuel Keiffer
3cfc94af45 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
0170a38ebc Removed unwraps in buffs 2021-04-25 12:01:21 -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
3ab61fa231 Update CHANGELOG 2021-04-25 15:51:39 +03:00
Ben Wallis
3eb06c6971 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
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
Justin Shipsey
79cb7a5826 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
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
James Melkonian
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +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
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +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
Marcel
aa6145c9b5 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
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
Justin Shipsey
ff445d3306 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
516f2fec4a Fix grammatical error in NPC message 2021-04-23 22:43:37 -07: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
Samuel Keiffer
fef68ad2a1 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
71b8426592 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
4d0aa9c3ad 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
4e7aba5b3f update uk_UA localization 2021-04-23 21:30:46 +00:00
Songtronix
0f5d289ecb 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
a610db5cfc have a seperate stage for scheduled builds 2021-04-23 17:48:02 +02:00
Marcel
1489fccbe3 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
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
Justin Shipsey
8828691935 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
6188bb9e96 update pt_br 20210422 2021-04-23 01:00:41 +00:00
Imbris
c2a8153325 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
e59f1e8d28 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