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
3,479 Commits 151 Branches 18 Tags
Commit Graph

3479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AdamWhitehurst
1a239ad035 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-29 13:40:08 -07:00
AdamWhitehurst
1b2b0786e6 remove unused timed_combo 2020-03-29 13:40:03 -07:00
jshipsey
f0eb63f18b fireball damage tweaks/staff shooting anim 2020-03-29 14:00:05 -04:00
jshipsey
504814674b cleanup, tweak to triplestrike stage 1 2020-03-29 03:53:52 -04:00
AdamWhitehurst
46e8658525 triple_strike orientation 2020-03-28 13:50:42 -07:00
comfymattress
c5c6d1d3db Fixed Flowers and Grass items 2020-03-28 14:13:55 -05:00
Imbris
309e1df1e2 fix debug item rons 2020-03-28 14:50:05 -04:00
Pfauenauge90
a1c342edf0 small fix 2020-03-28 18:06:00 +01:00
Imbris
26c4341b97 Remove None variant fromm armor types 2020-03-28 03:51:24 -04:00
Imbris
8a71452135 Move armor types to a new location, use a const for the moving cutoff in voxygen anims 2020-03-28 01:52:12 -04:00
jshipsey
83dd70af26 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 23:59:45 -04:00
jshipsey
2924d6dd6b proper bow animation 2020-03-27 23:59:05 -04:00
Imbris
4f3bb291a1 Combine dir and force in KnockUp and ApplyForce events 2020-03-27 22:19:23 -04:00
Imbris
94f44b0b32 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
Imbris
8edbea5587 split toggle events 2020-03-27 21:32:30 -04:00
Pfauenauge90
7e81d34dba Update headband-0.vox 2020-03-27 20:00:16 +01:00
AdamWhitehurst
94ec0cab41 prevent transition if pressing too early & timed 2020-03-27 11:17:34 -07:00
AdamWhitehurst
a4cdafc6f5 prevent holding to time combo 2020-03-27 11:08:10 -07:00
AdamWhitehurst
53c01a8572 Undo mistake, axe ability corrected. 
Axe m2 cost 0 -> 100
Axe m2 dmg 8 -> 12
 2020-03-27 11:07:21 -07:00
AdamWhitehurst
5f2ac7885d Axe m2 dmg 10 -> 15 
Axe m2 cost 0 -> 50
 2020-03-27 11:03:07 -07:00
AdamWhitehurst
298e28b7d9 Add triple_strike anims for axe and hammer 2020-03-27 11:00:58 -07:00
AdamWhitehurst
07c35765f0 Add timing window duration to triple strike 2020-03-27 10:43:18 -07:00
AdamWhitehurst
ecbadc3ba9 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 10:40:19 -07:00
AdamWhitehurst
e0f567dbb7 add triple strike timing 2020-03-27 10:40:15 -07:00
timokoesters
14b3d8970a Increase movement speed, make npcs slower than players 2020-03-27 18:39:26 +01:00
Pfauenauge90
38eae21ade fire bolt visuals 2020-03-27 18:31:45 +01:00
timokoesters
d32ec6ea40 Fix char selection not showing tools 2020-03-27 18:17:41 +01:00
timokoesters
3b572aeb65 Make apples great again 2020-03-27 17:51:35 +01:00
Pfauenauge90
369e58d807 update help screen 2020-03-27 17:50:34 +01:00
timokoesters
431bc8a069 Projectile hits regenerate energy 2020-03-27 17:07:19 +01:00
AdamWhitehurst
f2fdb028a7 triples strike knockback 15.0 -> 16.0 2020-03-27 08:26:53 -07:00
AdamWhitehurst
08040aa3bd triple_strike knockback 20.0 -> 15.0 2020-03-27 08:17:17 -07:00
Pfauenauge90
7de2fdcf09 remapped default look key, removed unused keys 2020-03-27 16:09:51 +01:00
Pfauenauge90
88826c9b1d asset cleanup 2020-03-27 15:27:42 +01:00
AdamWhitehurst
fc3005847c make triple strike continue without hits again 2020-03-27 07:03:26 -07:00
jshipsey
d3cfd120f7 third attack for triple strike 2020-03-27 01:57:30 -04:00
jshipsey
06d65ac72b small animation tweaks 2020-03-26 23:51:55 -04:00
Pfauenauge90
51ce452e92 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
Shane Handley
8d6a3ae82d SFX and unit test fixes. 2020-03-27 12:06:25 +11:00
timokoesters
82af4766cc Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
timokoesters
2e6f85c554 Fix triplestrike bug 2020-03-26 23:29:12 +01:00
jshipsey
aca7e46bf5 fixed wield feet while jumping, tweaked charge anim 2020-03-26 18:26:23 -04:00
timokoesters
5124d3f413 Balancing, make fireball not holdable, arrow knockback 2020-03-26 22:56:33 +01:00
timokoesters
b22d383564 Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants 2020-03-26 22:56:33 +01:00
timokoesters
afcfeda5d3 Better glider physics 2020-03-26 22:56:33 +01:00
timokoesters
7039197b83 Balancing 2020-03-26 22:56:33 +01:00
AdamWhitehurst
a66d6322e6 ore responsive oreintating 2020-03-26 14:48:51 -07:00
AdamWhitehurst
7b3a203b2a Prevent transition if failed hit 2020-03-26 14:44:39 -07:00
Imbris
8ac42c396b Merge branch 'capucho/free_look' into 'master' 
Implement #505

Closes #505

See merge request veloren/veloren!854
 2020-03-26 21:22:21 +00:00
Capucho
a8673cd5e4 Implement #505 2020-03-26 21:22:21 +00:00