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
12,890 Commits 151 Branches 18 Tags 2.1 GiB
0ba5558d7f
Commit Graph

12890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
da21e1cb02 Removed air slash stance and abilities 2022-10-27 20:06:40 -04:00
Sam
67fa03dc23 Fixed unintentional recovery from preceding strikes 2022-10-27 20:06:40 -04:00
jshipsey
1ae230c194 anim testing 2022-10-27 20:06:39 -04:00
Sam
4f2b1d37f8 Fixed consecutive strikes carrying animation over 2022-10-27 20:06:39 -04:00
Sam
c4987c3c48 Animations should use the state from the previous strike 2022-10-27 20:06:38 -04:00
jshipsey
0c054837f9 animation setup 2022-10-27 20:06:38 -04:00
Sam
ea287136cf Hot anim fix 2022-10-27 20:06:37 -04:00
Sam
2116842d30 Bin program to generate dot files for skill trees 2022-10-27 20:06:37 -04:00
Sam
eacbdefb75 Skill point prerequisites and costs 2022-10-27 20:06:37 -04:00
Sam
5d5fbde291 Minor tweaks 2022-10-27 20:06:36 -04:00
IsseW
20dea211d1 Riposte anim 2022-10-27 20:06:36 -04:00
Sam
2fcd876e3f Air slash abilities 2022-10-27 20:06:35 -04:00
Sam
7a8653e8f8 Reaching abilities 2022-10-27 20:06:35 -04:00
Sam
5d643f430a Mobility abilities 2022-10-27 20:06:35 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6 Parrying abilities 2022-10-27 20:06:34 -04:00
Sam
d99eddb483 Defensive abilities 2022-10-27 20:06:33 -04:00
Sam
ec03bd7032 Cleaving abilities 2022-10-27 20:06:33 -04:00
Sam
a4d3de4833 Crippling abilities 2022-10-27 20:06:32 -04:00
Sam
2051d45d2f Offensive abilities 2022-10-27 20:06:32 -04:00
Sam
c37925d1e2 Changed logic for entering combo melee state depending on whether or not it was a stance 2022-10-27 20:06:31 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
Sam
014a8cce61 Combo melee can now optionally not function as a stance 2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc Balanced abilities and insert ability id into animations. 2022-10-27 20:06:30 -04:00
Sam
aea4a43b65 Placeholder abilities 2022-10-27 20:06:30 -04:00
Sam
38094b6ba2 Finisher melee 2022-10-27 20:06:29 -04:00
Sam
057b1a4ad6 Added capability for attacks to be interrupted by dodging or blocking 2022-10-27 20:06:29 -04:00
Sam
c09e858cba Single target melee attacks now hit the closest target instead of a random target. 2022-10-27 20:06:28 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
7b27b63122 Melee attacks now only hit a single target by default 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Isse
38c9d87624 Merge branch 'fix_soundtrack' into 'master' 
fix soundtrack

See merge request veloren/veloren!3676
 2022-10-27 17:40:51 +00:00
flo
42ffb54fd7 fix soundtrack 2022-10-27 17:40:51 +00:00
Joshua Barretto
ab8d61afc8 Merge branch 'fix_facegourd_name' into 'master' 
fix facegourd item name

See merge request veloren/veloren!3674
 2022-10-27 13:49:07 +00:00
flo
34eae80253 fix facegourd item name 2022-10-27 13:49:06 +00:00
Joshua Barretto
5634d63759 Fixed window scale reset bug 2022-10-27 13:31:32 +01:00
Marcel
5d5a2d5ff8 Merge branch 'DaforLynx/halloween-soundtrack' into 'master' 
Halloween soundtrack with automatic functionality

See merge request veloren/veloren!3672
 2022-10-27 06:56:39 +00:00
DaforLynx
926c1bc533 Halloween soundtrack with automatic functionality 2022-10-27 06:56:39 +00:00
Samuel Keiffer
7eaae7eb51 Merge branch 'zesterer/fxupscale' into 'master' 
Added FxUpscale and graphics presets

See merge request veloren/veloren!3673
 2022-10-27 00:40:08 +00:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Joshua Barretto
4db88bb22c Better sampling of noisy regions 2022-10-27 01:15:21 +01:00
Joshua Barretto
589f59b771 Improve FxUpscale quality for distant objects 2022-10-27 01:15:21 +01:00
Joshua Barretto
f29b1da583 Implemented FxUpscale 2022-10-27 01:15:20 +01:00
Marcel
779cccd238 Merge branch 'kevinsmia1939/thai-translate' into 'master' 
Improve and fix Thai translation.

See merge request veloren/veloren!3666
 2022-10-25 21:37:58 +00:00
Kavin Teenakul
40c949c274 Improve and fix Thai translation. 2022-10-25 21:37:58 +00:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master' 
Halloween event

See merge request veloren/veloren!3668
 2022-10-25 21:37:34 +00:00
Samuel Keiffer
f676e732f6 Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master' 
ActionState extensions to allow for multiple concurrent state variables And More Complex AI

See merge request veloren/veloren!3659
 2022-10-25 03:21:46 +00:00
Timothy Finnegan
1922d69154 Ran Cargo fmt 2022-10-24 19:52:37 -07:00