ntr
|
8e8a6a3673
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-23 19:09:30 +10:00 |
|
ntr
|
bce277d28b
|
worklog and vbox circles
|
2019-07-23 19:04:20 +10:00 |
|
Mashy
|
441cf3bc47
|
fix buff and debuff
|
2019-07-23 18:29:19 +10:00 |
|
Mashy
|
2dc929de40
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-07-23 18:07:39 +10:00 |
|
Mashy
|
4c68d11a28
|
aoe targetting fixed
|
2019-07-23 18:04:33 +10:00 |
|
ntr
|
12ff5aec66
|
add break cb
|
2019-07-23 17:18:56 +10:00 |
|
ntr
|
420b3b71e9
|
actually fix cb
|
2019-07-23 17:08:12 +10:00 |
|
ntr
|
c248ab40f9
|
fix cb
|
2019-07-23 17:05:45 +10:00 |
|
ntr
|
5baffffd69
|
icon stuff
|
2019-07-23 17:01:43 +10:00 |
|
ntr
|
7c8f724209
|
Merge branch 'develop' into line-anims
|
2019-07-23 16:42:11 +10:00 |
|
ntr
|
341f4dda09
|
blast and text colours
|
2019-07-23 16:40:40 +10:00 |
|
ntr
|
eef880e052
|
attak
|
2019-07-23 16:01:07 +10:00 |
|
Mashy
|
ef11d14752
|
fix cb for banish/invert
|
2019-07-23 15:57:50 +10:00 |
|
Mashy
|
d03eec1423
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-23 15:05:19 +10:00 |
|
Mashy
|
a816e75554
|
return cb from anim componentWillUnmount()
|
2019-07-23 15:05:03 +10:00 |
|
ntr
|
4c6ee01b5d
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-23 14:21:09 +10:00 |
|
ntr
|
10369dee17
|
less
|
2019-07-23 14:17:46 +10:00 |
|
ntr
|
90a60ebd65
|
construct buttons
|
2019-07-23 14:17:41 +10:00 |
|
ntr
|
711a83ba56
|
better icons
|
2019-07-23 13:52:00 +10:00 |
|
ntr
|
5c35c2d195
|
icons wip
|
2019-07-23 13:42:23 +10:00 |
|
Mashy
|
314b34be19
|
unfocus all constructs between resolutions
|
2019-07-23 12:01:58 +10:00 |
|
ntr
|
e14cf22b2f
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-23 11:56:54 +10:00 |
|
ntr
|
aa3bb65907
|
names
|
2019-07-23 11:56:05 +10:00 |
|
Mashy
|
dd98016e2a
|
remove log
|
2019-07-22 19:58:08 +10:00 |
|
Mashy
|
8a60a181d1
|
fixed bots
|
2019-07-22 19:55:57 +10:00 |
|
Mashy
|
36ce1385da
|
wip
|
2019-07-22 18:31:26 +10:00 |
|
ntr
|
71b3ecb2df
|
worklog
|
2019-07-22 16:23:22 +10:00 |
|
ntr
|
f9650f748f
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-22 16:22:21 +10:00 |
|
ntr
|
ca16090555
|
fix blocking mesasges
|
2019-07-22 16:21:43 +10:00 |
|
Mashy
|
10dc04b73d
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-22 15:31:53 +10:00 |
|
Mashy
|
64896cfb3a
|
no longer set resolution, everything from event loop
|
2019-07-22 15:30:46 +10:00 |
|
ntr
|
5275c26ac8
|
shapes
|
2019-07-22 13:29:12 +10:00 |
|
ntr
|
b1aa559fee
|
pubsub logging
|
2019-07-22 13:16:48 +10:00 |
|
ntr
|
b04ae8a8d4
|
styles
|
2019-07-22 11:33:05 +10:00 |
|
ntr
|
c8c2d08522
|
rename III -> ++
|
2019-07-22 11:05:21 +10:00 |
|
ntr
|
627653924b
|
put ping back
|
2019-07-21 20:41:41 +10:00 |
|
ntr
|
e63d946e60
|
specs to 3
|
2019-07-21 20:39:12 +10:00 |
|
ntr
|
e95d559edd
|
wht
|
2019-07-21 20:38:01 +10:00 |
|
ntr
|
3088d104da
|
Merge branch 'vbox-rework' into develop
|
2019-07-21 20:12:12 +10:00 |
|
ntr
|
5e5cb1a7b0
|
Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop
|
2019-07-21 20:11:54 +10:00 |
|
ntr
|
19d1118cc4
|
yew
|
2019-07-21 20:10:52 +10:00 |
|
ntr
|
4ab8e99f1d
|
fix boolean 0 check bullshit
|
2019-07-20 22:44:36 +10:00 |
|
ntr
|
c69182b94e
|
new combiner
|
2019-07-20 22:30:03 +10:00 |
|
ntr
|
ffc043d526
|
vbox stuff
|
2019-07-20 21:46:54 +10:00 |
|
ntr
|
145f8e6a35
|
wip"
|
2019-07-20 18:04:08 +10:00 |
|
Mashy
|
938d53048e
|
misc
|
2019-07-20 11:18:25 +10:00 |
|
Mashy
|
4db44e0b59
|
great victory
|
2019-07-20 11:15:47 +10:00 |
|
Mashy
|
c44cd44933
|
register account proper err handling
|
2019-07-20 01:04:02 +10:00 |
|
Mashy
|
b289ed92de
|
tidying fns
|
2019-07-19 21:01:12 +10:00 |
|
ntr
|
3f1367172d
|
fix construct img reloads
|
2019-07-19 20:46:38 +10:00 |
|