 Mashy
|
d55e1fecf3
|
added clutch
|
2019-07-04 18:30:16 +10:00 |
|
|
Mashy
|
16d22fca0b
|
Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
|
2019-07-04 15:16:09 +10:00 |
|
|
Mashy
|
af4efd43b8
|
filter name
|
2019-07-04 15:15:38 +10:00 |
|
|
Mashy
|
4061ffb640
|
Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
|
2019-07-04 13:50:54 +10:00 |
|
|
Mashy
|
686a346c9a
|
added sleep
|
2019-07-04 13:50:27 +10:00 |
|
|
Mashy
|
d455c68415
|
purify
|
2019-07-04 11:49:58 +10:00 |
|
|
Mashy
|
7bdbdd2fd4
|
Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
|
2019-07-03 00:02:23 +10:00 |
|
|
Mashy
|
6b3a159988
|
fk discord
|
2019-07-03 00:00:55 +10:00 |
|
|
Mashy
|
0938187f7b
|
Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
|
2019-07-02 23:14:34 +10:00 |
|
|
Mashy
|
cd3634a692
|
Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
|
2019-07-02 23:14:10 +10:00 |
|
|
Mashy
|
3b115f82a4
|
fixed parry, added all skills to anims callback
|
2019-07-02 23:11:48 +10:00 |
|
|
Mashy
|
3eb55463e6
|
fixed slay
|
2019-07-02 21:55:10 +10:00 |
|
|
Mashy
|
7ed13aa9db
|
anim fixes
|
2019-07-02 16:46:02 +10:00 |
|
|
Mashy
|
870940957f
|
Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
|
2019-07-02 15:17:31 +10:00 |
|
|
Mashy
|
c646c76e91
|
remove fade constants
|
2019-07-02 15:14:46 +10:00 |
|
|
Mashy
|
311457d99b
|
Merge branch 'anims-fixed' into anims-change
|
2019-07-02 00:48:51 +10:00 |
|
|
Mashy
|
baeb90f91a
|
keep anims going during post skill text
|
2019-07-02 00:47:24 +10:00 |
|
|
Mashy
|
3e8634e6c7
|
move combat text
|
2019-07-01 23:10:04 +10:00 |
|
|
Mashy
|
9e5a612739
|
misc fixes
|
2019-07-01 21:23:13 +10:00 |
|
|
Mashy
|
81970f5abf
|
Merge branch 'anims-change' into anims-fixed
|
2019-07-01 20:24:57 +10:00 |
|
|
Mashy
|
0e19156f3a
|
added stages back in
|
2019-07-01 18:36:44 +10:00 |
|
|
Mashy
|
96a0d3f30c
|
Merge branch 'animations-test' into develop
|
2019-06-28 11:42:21 +10:00 |
|
|
Mashy
|
a53b55e7ab
|
added siphon tick
|
2019-06-25 15:30:28 +10:00 |
|
|
Mashy
|
40a3b2d162
|
add siphon
|
2019-06-25 14:15:08 +10:00 |
|
|
Mashy
|
93a915646a
|
anim colour changes
|
2019-06-24 22:34:56 +10:00 |
|
|
Mashy
|
0e1098fa55
|
added slay
|
2019-06-24 15:09:53 +10:00 |
|
|
Mashy
|
b1b37fc0b6
|
added chaos and heal
|
2019-06-24 12:35:14 +10:00 |
|
|
Mashy
|
d9184dea0a
|
laser anim for attack and strike
|
2019-06-21 13:18:30 +10:00 |
|
|
Mashy
|
bd750be110
|
blast anim, improved random point util
|
2019-06-20 16:25:03 +10:00 |
|
|
Mashy
|
d232402c49
|
remove tiers from skill anim
|
2019-06-19 16:58:05 +10:00 |
|
|
Mashy
|
0310b1b3df
|
charge attacks
|
2019-06-19 15:29:33 +10:00 |
|
|
Mashy
|
ae481d54bf
|
charge svg, space out randomly generated points
|
2019-06-19 14:01:34 +10:00 |
|
|
Mashy
|
c4c3c415b9
|
wip testing more anim stuff
|
2019-06-18 17:02:15 +10:00 |
|
|
Mashy
|
13405c9444
|
attack dagger animation test
|
2019-06-14 21:26:22 +10:00 |
|
|
Mashy
|
b0faf0c33b
|
messing with anims full Pepega
|
2019-06-14 00:10:51 +10:00 |
|
|
Mashy
|
23083dc0f5
|
skill text in targetting area during resos
|
2019-06-12 23:51:52 +10:00 |
|
|
Mashy
|
ee40f82f24
|
Merge remote-tracking branch 'origin/animations-test' into animations-test
|
2019-06-12 18:56:21 +10:00 |
|
|
Mashy
|
28a4c259bb
|
basic attack animation
|
2019-06-12 18:55:40 +10:00 |
|
|
Mashy
|
cd6f815092
|
Merge remote-tracking branch 'origin/animations-test' into animations-test
|
2019-06-11 17:56:46 +10:00 |
|
|
Mashy
|
09868b42d5
|
tripping with triangles
|
2019-06-11 17:52:33 +10:00 |
|
|
Mashy
|
b858904c2e
|
added tier 2 and 3 specs
|
2019-06-10 16:36:19 +10:00 |
|
|
Mashy
|
94c7833b34
|
Merge branch 'master' of ssh://mnml.gg:40022/~/mnml
|
2019-06-06 11:53:21 +10:00 |
|
|
Mashy
|
9e32822036
|
Merge branch 'master' of ssh://mnml.gg:40022/~/mnml
|
2019-06-06 11:53:01 +10:00 |
|
|
Mashy
|
4077067394
|
win bonus changes, more moneys
|
2019-06-06 11:46:44 +10:00 |
|
|
Mashy
|
1f4d1a6405
|
Merge branch 'reso_stages'
|
2019-05-31 20:10:30 +10:00 |
|
|
Mashy
|
b10c4f988c
|
add u8 to resolution struct for breaking up resolution parts
|
2019-05-31 16:20:33 +10:00 |
|
|
Mashy
|
c7ee7361dd
|
Merge remote-tracking branch 'origin/master'
|
2019-05-31 13:27:47 +10:00 |
|
|
Mashy
|
6295d8888e
|
update effects during combat anim loop
|
2019-05-31 13:27:23 +10:00 |
|
|
Mashy
|
6d9e13598c
|
removed life conditional checks, assign reso life to state construct
|
2019-05-31 13:03:50 +10:00 |
|
|
Mashy
|
0601006504
|
Merge remote-tracking branch 'origin/master'
|
2019-05-31 11:59:29 +10:00 |
|
|
Mashy
|
23e9870d8f
|
rework damage calculation between resolutions
|
2019-05-31 11:52:30 +10:00 |
|
|
Mashy
|
43b1ce837f
|
Merge branch 'master' of ssh://mnml.gg:40022/~/mnml
|
2019-05-30 16:55:24 +10:00 |
|
|
Mashy
|
934ead830a
|
fixed description, remove first().unwrap()
|
2019-05-30 16:55:08 +10:00 |
|
|
Mashy
|
b8abd7f973
|
Merge branch 'master' of ssh://mnml.gg:40022/~/mnml
|
2019-05-29 16:17:50 +10:00 |
|
|
Mashy
|
53adf5a2d9
|
speed rework
|
2019-05-29 16:17:28 +10:00 |
|
|
Mashy
|
ab5a38f86f
|
rework spec calculation system
|
2019-05-29 13:15:56 +10:00 |
|
|
Mashy
|
fc07bffb93
|
Merge branch 'master' of ssh://mnml.gg:40022/~/mnml
|
2019-05-29 11:50:15 +10:00 |
|
|
Mashy
|
c32154e06e
|
all skills have item conversion, tidy spec calcs
|
2019-05-29 11:49:58 +10:00 |
|
|
Mashy
|
cc05e97473
|
reworked spec calculation structure
|
2019-05-28 14:20:48 +10:00 |
|
|
Mashy
|
0b7473382b
|
Merge branch 'skilltiers'
|
2019-05-28 12:25:47 +10:00 |
|
|
Mashy
|
6d20644bcc
|
catch all multiplier meta cases
|
2019-05-28 12:25:09 +10:00 |
|
|
Mashy
|
d2f2c2bb67
|
added impurity / haste, all t2/t3s in
|
2019-05-27 18:28:49 +10:00 |
|
|
Mashy
|
7d0b66ca3d
|
hostility
|
2019-05-27 16:58:09 +10:00 |
|
|
Mashy
|
0971c3a2e2
|
corruption t2/t3, chaos is now 0-30% MORE
|
2019-05-27 16:03:59 +10:00 |
|
|
Mashy
|
7d2ad82800
|
Merge remote-tracking branch 'origin' into skilltiers
|
2019-05-27 15:16:22 +10:00 |
|
|
Mashy
|
fab2d8caf1
|
Merge branch 'master' into skilltiers
|
2019-05-27 14:30:15 +10:00 |
|
|
Mashy
|
88c3e97bc1
|
parry and other T2/T3
|
2019-05-27 14:21:01 +10:00 |
|
|
Mashy
|
9aa6346be6
|
tick tiers and formatting
|
2019-05-27 12:11:14 +10:00 |
|
|
Mashy
|
b0eb9a8a51
|
more wip
|
2019-05-27 10:41:36 +10:00 |
|
|
Mashy
|
6bbf8d0e34
|
more tier 2/3 wip
|
2019-05-25 18:53:10 +10:00 |
|
|
Mashy
|
2da21ca5bc
|
wip add hex
|
2019-05-24 16:49:34 +10:00 |
|
|
Mashy
|
4ac0146b39
|
wip
|
2019-05-24 15:06:29 +10:00 |
|
|
Mashy
|
3f37667c2a
|
roadmap
|
2019-05-23 13:25:41 +10:00 |
|
|
Mashy
|
62c6e4bc42
|
hostility fix
|
2019-05-22 22:59:39 +10:00 |
|
|
Mashy
|
2384be897e
|
all descrip info comes from skill
|
2019-05-22 22:50:54 +10:00 |
|
|
Mashy
|
479cd5a423
|
RIP Secondary Duration
|
2019-05-22 22:25:36 +10:00 |
|
|
Mashy
|
59b5f92f42
|
Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories
|
2019-05-22 22:07:57 +10:00 |
|
|
Mashy
|
60b3445f84
|
Converted mostly to Cryp Effects
|
2019-05-22 22:07:41 +10:00 |
|
|
Mashy
|
5f4a0b708e
|
Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories
|
2019-05-22 17:37:33 +10:00 |
|
|
Mashy
|
921eac87dc
|
effects into vec init
|
2019-05-22 17:36:27 +10:00 |
|
|
Mashy
|
ddfe40d7c1
|
SkillEffect -> CrypEffect
|
2019-05-22 15:03:31 +10:00 |
|
|
Mashy
|
bcd89e24d0
|
starting to add disables
|
2019-05-22 13:50:57 +10:00 |
|
|
Mashy
|
9cac638d59
|
Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories
|
2019-05-22 13:35:38 +10:00 |
|
|
Mashy
|
17e8407385
|
Reworked application of effects
|
2019-05-22 13:34:08 +10:00 |
|
|
Mashy
|
a052bbc4eb
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-05-21 16:13:19 +10:00 |
|
|
Mashy
|
0e107e16a2
|
Particle animations with SCSS
|
2019-05-21 16:09:26 +10:00 |
|
|
Mashy
|
0baa222fa8
|
Skill descriptions
|
2019-05-20 21:34:57 +10:00 |
|
|
Mashy
|
ab0341d1cd
|
Merge branch 'horizontal-vbox'
|
2019-05-19 22:05:24 +10:00 |
|
|
Mashy
|
83eb2733ad
|
moved cryp health changes into async loop
|
2019-05-19 22:04:51 +10:00 |
|
|
Mashy
|
dcf7ef6f15
|
misc fixes
|
2019-05-18 00:11:15 +10:00 |
|
|
Mashy
|
90fd71ede7
|
mostly working
|
2019-05-17 23:48:37 +10:00 |
|
|
Mashy
|
0b026a2cdc
|
toggle workign wip
|
2019-05-17 21:23:04 +10:00 |
|
|
Mashy
|
fe4880b77f
|
wip
|
2019-05-17 19:35:50 +10:00 |
|
|
Mashy
|
2dabf8e53f
|
juicy css mobile nav toggle
|
2019-05-17 16:14:26 +10:00 |
|
|
Mashy
|
00b0dd023b
|
fast unequip items
|
2019-05-17 12:25:35 +10:00 |
|
|
Mashy
|
dfb372d8d2
|
Merge branch 'css-grid' of ssh://cryps.gg:40022/~/cryps into css-grid
|
2019-05-15 17:54:39 +10:00 |
|
|
Mashy
|
ddb10ca531
|
vbox spacing fixes
|
2019-05-15 17:54:27 +10:00 |
|
|
Mashy
|
12f2fb2546
|
icon fixes
|
2019-05-15 15:05:12 +10:00 |
|
|
Mashy
|
3eeb5985f7
|
Stat icons auto scale
|
2019-05-15 14:48:58 +10:00 |
|
|
Mashy
|
2318ff3974
|
Highlight spec on spec equip click
|
2019-05-14 11:18:19 +10:00 |
|