 Mashy
|
1a0f427715
|
worklog
|
2019-10-18 10:24:08 +10:00 |
|
|
Mashy
|
8753d97650
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-18 10:09:46 +10:00 |
|
|
Mashy
|
b54c394316
|
mobile description text
|
2019-10-18 10:09:02 +10:00 |
|
|
Mashy
|
06897e0e43
|
safety in case null combo (shouldn't happen anyway)
|
2019-10-18 09:37:58 +10:00 |
|
|
Mashy
|
85497bfbf2
|
preview combiner
|
2019-10-18 09:30:01 +10:00 |
|
|
Mashy
|
b71cc8fc0f
|
effect descriptions, skill speed in game info, fix block stages
|
2019-10-17 21:47:55 +10:00 |
|
|
Mashy
|
38899d31d0
|
disable hover info during anim
|
2019-10-17 17:44:05 +10:00 |
|
|
Mashy
|
b896a7ee42
|
skill info on hover in effect box
|
2019-10-17 16:25:31 +10:00 |
|
|
Mashy
|
b0537d758b
|
changelog
|
2019-10-17 11:30:00 +10:00 |
|
|
Mashy
|
245cb603fc
|
improve check
|
2019-10-17 09:33:26 +10:00 |
|
|
Mashy
|
ea5d908893
|
vbox highlight for combiner
|
2019-10-16 18:27:06 +10:00 |
|
|
Mashy
|
03a0953b46
|
background highlight equip slots
|
2019-10-16 17:26:03 +10:00 |
|
|
Mashy
|
c444ae7d78
|
Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours
|
2019-10-16 16:17:22 +10:00 |
|
|
Mashy
|
935d1d47ee
|
fix combo highlighting (some rare case like 2 green)
|
2019-10-16 16:17:02 +10:00 |
|
|
Mashy
|
62aa801692
|
Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours
|
2019-10-16 14:21:02 +10:00 |
|
|
Mashy
|
5dbdc3762f
|
highlight potential inv combos
|
2019-10-16 14:20:44 +10:00 |
|
|
Mashy
|
1abe4ed08e
|
button borders across the board
|
2019-10-15 22:06:41 +10:00 |
|
|
Mashy
|
b2e4570bfb
|
coloured border experiment
|
2019-10-15 16:05:58 +10:00 |
|
|
Mashy
|
8e03248844
|
worklog / changelog increase purge cd
|
2019-10-15 09:40:05 +10:00 |
|
|
Mashy
|
7d34b1b4ac
|
purge bug fix
|
2019-10-15 09:09:21 +10:00 |
|
|
Mashy
|
4b7eecd4f4
|
misc var
|
2019-10-10 13:41:17 +10:00 |
|
|
Mashy
|
2a84ea2caf
|
new tos
|
2019-10-10 08:33:29 +10:00 |
|
|
Mashy
|
d8ff256735
|
terms of service, pop up new html
|
2019-10-09 15:42:50 +10:00 |
|
|
Mashy
|
d339d19bb9
|
nerf recharge / absorb
|
2019-10-09 11:20:12 +10:00 |
|
|
Mashy
|
d3daa3c1f2
|
misc names
|
2019-10-08 13:47:02 +10:00 |
|
|
Mashy
|
6978a424d9
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-08 13:35:57 +10:00 |
|
|
Mashy
|
e93b56541f
|
timing sync fixes, block timer during animation, remove timeout for POST_ONLY
|
2019-10-08 13:35:39 +10:00 |
|
|
Mashy
|
14bc1819ed
|
Merge remote-tracking branch 'origin/pax' into develop
|
2019-10-08 11:08:26 +10:00 |
|
|
Mashy
|
5fb7f157b4
|
put animation skill into state
|
2019-10-05 13:14:44 +10:00 |
|
|
Mashy
|
c8dddcc094
|
targetting arrow fr size change
|
2019-10-03 15:44:05 +10:00 |
|
|
Mashy
|
0f1ae4d17a
|
background for active skills
|
2019-10-03 15:21:19 +10:00 |
|
|
Mashy
|
962b72b85f
|
fix recharge show current red / blue life during combat, skip if 0 recharge and apply css
|
2019-10-02 16:06:39 +10:00 |
|
|
Mashy
|
16d319c706
|
reflect no longer triggers on ticks
|
2019-10-02 14:39:36 +10:00 |
|
|
Mashy
|
85ec220511
|
fix electrocute reflect
|
2019-10-02 12:37:11 +10:00 |
|
|
Mashy
|
86b73fc71a
|
match electric buff check
|
2019-10-01 17:16:18 +10:00 |
|
|
Mashy
|
d44acdffd5
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-01 16:35:06 +10:00 |
|
|
Mashy
|
defcadbad2
|
remove double tick dots, lose electrify on application
|
2019-10-01 16:34:51 +10:00 |
|
|
Mashy
|
38e0a09a8a
|
catch null instance
|
2019-09-30 17:08:01 +10:00 |
|
|
Mashy
|
4da209fdc1
|
combat phase components
|
2019-09-30 16:38:36 +10:00 |
|
|
Mashy
|
1737f6de6c
|
show skill colour components during combat
|
2019-09-30 13:28:33 +10:00 |
|
|
Mashy
|
765d82bc62
|
skip co, remove absorb buff when you get absorption, don't trigger some effects when ko
|
2019-09-29 17:56:05 +10:00 |
|
|
Mashy
|
dab3b8da53
|
OSfrog tests
|
2019-09-25 20:22:53 +10:00 |
|
|
Mashy
|
124f144a2b
|
OSfrog Clap
|
2019-09-25 20:16:58 +10:00 |
|
|
Mashy
|
9af3fd3155
|
green power base, spec inconsistency
|
2019-09-24 13:34:01 +10:00 |
|
|
Mashy
|
58ff97a071
|
remove spec multi
|
2019-09-23 15:31:05 +10:00 |
|
|
Mashy
|
b57a076ac1
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-23 14:23:37 +10:00 |
|
|
Mashy
|
6997a7a7c9
|
item descriptions and worklog
|
2019-09-23 14:23:22 +10:00 |
|
|
Mashy
|
1d778ecc17
|
null animTarget bug
|
2019-09-20 16:44:14 +10:00 |
|
|
Mashy
|
7cd6a0979c
|
Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8
|
2019-09-20 15:41:09 +10:00 |
|
|
Mashy
|
67654cbbab
|
use server calc speeds
|
2019-09-20 15:40:53 +10:00 |
|
|
Mashy
|
2e366e2eca
|
speed fix, counter fix, client side anim fix
|
2019-09-20 15:34:09 +10:00 |
|
|
Mashy
|
40f6073977
|
use cd pub type
|
2019-09-20 13:06:37 +10:00 |
|
|
Mashy
|
6fba9d9f4d
|
show skill delay on info
|
2019-09-20 13:03:13 +10:00 |
|
|
Mashy
|
3ad679cb02
|
vbox show costs, penalty for combo sale
|
2019-09-20 12:22:48 +10:00 |
|
|
Mashy
|
783429b5cf
|
fix purge description and dot
|
2019-09-19 16:07:35 +10:00 |
|
|
Mashy
|
f78496e681
|
spec info update
|
2019-09-19 16:01:46 +10:00 |
|
|
Mashy
|
f04d179023
|
tennis scoring -> str8 b05
|
2019-09-19 15:07:16 +10:00 |
|
|
Mashy
|
948c62f9ef
|
misc
|
2019-09-18 17:55:53 +10:00 |
|
|
Mashy
|
7817d28dab
|
help txt
|
2019-09-18 17:49:55 +10:00 |
|
|
Mashy
|
7b40316d9b
|
text changes sry not sry
|
2019-09-18 17:35:38 +10:00 |
|
|
Mashy
|
dedada5b14
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-18 16:31:06 +10:00 |
|
|
Mashy
|
0cb5b8ccfa
|
banish rework
|
2019-09-18 16:30:52 +10:00 |
|
|
Mashy
|
d1b0072e63
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-17 13:05:01 +10:00 |
|
|
Mashy
|
aa3b9badef
|
rework counter & sustain, update logs and tests
|
2019-09-17 13:04:48 +10:00 |
|
|
Mashy
|
b52b6a5334
|
delete hex (wasn't actually in game)
|
2019-09-16 17:04:41 +10:00 |
|
|
Mashy
|
a512bcb76c
|
nerf purge -> flat (2 / 3 / 4)T no lockout scaling
|
2019-09-16 16:47:57 +10:00 |
|
|
Mashy
|
660607dc60
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-16 15:57:13 +10:00 |
|
|
Mashy
|
9ae7317f37
|
block skills ->> 1T duration / no cooldown
|
2019-09-16 15:56:21 +10:00 |
|
|
Mashy
|
6045a77bb6
|
link description & cleanup
|
2019-09-16 15:25:21 +10:00 |
|
|
Mashy
|
de17035ff7
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-16 14:49:43 +10:00 |
|
|
Mashy
|
0b62a392f5
|
link rework
|
2019-09-16 14:49:36 +10:00 |
|
|
Mashy
|
d4ae38e733
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-15 20:16:10 +10:00 |
|
|
Mashy
|
c027b2dec1
|
check for null objects
|
2019-09-15 17:56:51 +10:00 |
|
|
Mashy
|
21203ee06a
|
screen based translate for cast
|
2019-09-15 14:15:03 +10:00 |
|
|
Mashy
|
4558eeaee0
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-15 13:21:19 +10:00 |
|
|
Mashy
|
dbe38a8815
|
anim simplified and fixed hopefully
|
2019-09-15 13:21:04 +10:00 |
|
|
Mashy
|
85f1a6bb33
|
ahhhhhhhhhhhhhhhhhhhh
|
2019-09-13 22:26:25 +10:00 |
|
|
Mashy
|
0296d9907b
|
actually fix anim bug
|
2019-09-13 22:25:07 +10:00 |
|
|
Mashy
|
6965bdb0e6
|
anim bug
|
2019-09-13 22:10:25 +10:00 |
|
|
Mashy
|
b1e18f68f2
|
item description speeds
|
2019-09-12 16:17:13 +10:00 |
|
|
Mashy
|
70e66d1916
|
misc
|
2019-09-12 15:33:48 +10:00 |
|
|
Mashy
|
58fa6a5734
|
actually requesting account instances when game end
|
2019-09-12 15:32:57 +10:00 |
|
|
Mashy
|
c82fb404d1
|
request account state when instance finished, remove account instances from socket
|
2019-09-12 15:24:16 +10:00 |
|
|
Mashy
|
075880d5a7
|
fix slay bug
|
2019-09-12 14:25:52 +10:00 |
|
|
Mashy
|
e8e63e0943
|
confirm abandon
|
2019-09-12 14:05:36 +10:00 |
|
|
Mashy
|
c45cf59f29
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-12 13:25:27 +10:00 |
|
|
Mashy
|
2d16c8c91a
|
item base components for combo items
|
2019-09-12 13:25:11 +10:00 |
|
|
Mashy
|
2086badbdf
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-12 12:10:01 +10:00 |
|
|
Mashy
|
0e2525689f
|
fix speed stat info hover
|
2019-09-12 12:08:37 +10:00 |
|
|
Mashy
|
7f6df40ea7
|
misc
|
2019-09-11 16:20:49 +10:00 |
|
|
Mashy
|
a38c603ec9
|
disable during anim
|
2019-09-11 15:53:51 +10:00 |
|
|
Mashy
|
4a13656b9d
|
abandon game
|
2019-09-11 15:49:36 +10:00 |
|
|
Mashy
|
60bd7f65ba
|
abandon rpc
|
2019-09-11 15:29:52 +10:00 |
|
|
Mashy
|
9874334fc3
|
screen width % for anims
|
2019-09-11 11:55:48 +10:00 |
|
|
Mashy
|
2cea9fd8fa
|
clear skills
|
2019-09-09 16:03:33 +10:00 |
|
|
Mashy
|
b633820ca1
|
fix tests with stat change
|
2019-09-06 14:28:42 +10:00 |
|
|
Mashy
|
547127b9eb
|
inc base dmg, reduce health, specs bonuses are purely threshold from team colour
|
2019-09-06 13:40:29 +10:00 |
|
|
Mashy
|
849a89ac4e
|
non item skill +
|
2019-09-05 23:02:01 +10:00 |
|
|
Mashy
|
21f3a80752
|
more ++ fixes, shows + during anims
|
2019-09-05 22:41:36 +10:00 |
|
|
Mashy
|
b5e09ba343
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 17:06:58 +10:00 |
|