 Mashy
|
2e1b298bbf
|
remove client from deciding event stages wip
|
2019-10-23 12:08:21 +10:00 |
|
|
Mashy
|
6371e02672
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-23 11:13:25 +10:00 |
|
|
Mashy
|
bd518e1613
|
fix background highlighted on dbl click
|
2019-10-23 11:13:09 +10:00 |
|
|
Mashy
|
9590f1668d
|
Plus -> + for specs
|
2019-10-23 09:06:49 +10:00 |
|
|
Mashy
|
8ac1b964b8
|
changelog
|
2019-10-23 08:39:40 +10:00 |
|
|
Mashy
|
1ec43cd6b0
|
add inventory tutorial step
|
2019-10-23 08:26:15 +10:00 |
|
|
Mashy
|
ec3a2a0ce5
|
highlight colours for noobs
|
2019-10-22 20:07:33 +10:00 |
|
|
Mashy
|
4edeb6d315
|
change win text
|
2019-10-22 14:24:30 +10:00 |
|
|
Mashy
|
21d55e27b0
|
add back overflow to body
|
2019-10-22 14:11:01 +10:00 |
|
|
Mashy
|
c522180366
|
faceoff text for start, win, lose
|
2019-10-22 13:15:57 +10:00 |
|
|
Mashy
|
c05ad8637f
|
stop idle construct movement causing overflow
|
2019-10-22 11:58:00 +10:00 |
|
|
Mashy
|
7dc22bca90
|
Merge branch 'home-page-change' of ssh://git.mnml.gg:40022/~/mnml into home-page-change
|
2019-10-22 11:12:48 +10:00 |
|
|
Mashy
|
56f3647025
|
clear mtxActive on nav and if you join game. put shop before reshape
|
2019-10-22 11:12:25 +10:00 |
|
|
Mashy
|
a304f003d0
|
added sub back to home, controls on reshape menu
|
2019-10-22 10:28:28 +10:00 |
|
|
Mashy
|
0c9c4a7692
|
add reshape tab, remove mtx from play page
|
2019-10-22 09:52:24 +10:00 |
|
|
Mashy
|
36c9236842
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-21 19:41:55 +10:00 |
|
|
Mashy
|
8e6048b912
|
fix tick speed bug with new application
|
2019-10-21 19:40:19 +10:00 |
|
|
Mashy
|
fa1135170b
|
worklog
|
2019-10-21 10:43:14 +10:00 |
|
|
Mashy
|
fe177df80a
|
improve copy link
|
2019-10-20 17:31:37 +10:00 |
|
|
Mashy
|
487bca473e
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-20 16:53:03 +10:00 |
|
|
Mashy
|
97f96a9fa2
|
misc log
|
2019-10-20 16:52:50 +10:00 |
|
|
Mashy
|
cf7c3d1ac7
|
logs
|
2019-10-20 15:54:45 +10:00 |
|
|
Mashy
|
53725e1522
|
proper combiner preview check, clear skill info on anim start
|
2019-10-20 12:57:56 +10:00 |
|
|
Mashy
|
8f99e07e81
|
flash quit / back button
|
2019-10-18 16:18:33 +10:00 |
|
|
Mashy
|
0dc272df96
|
changelog
|
2019-10-18 15:16:59 +10:00 |
|
|
Mashy
|
05855af04a
|
siphon & slay have green power scaling
|
2019-10-18 15:11:57 +10:00 |
|
|
Mashy
|
fb8b4a159c
|
changelog
|
2019-10-18 13:23:41 +10:00 |
|
|
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 |
|