2012 Commits

Author SHA1 Message Date
ntr
d6fb7986ef mobile styles init and font size 2019-09-18 13:09:35 +10:00
ntr
f38603c596 fix double hit anim 2019-09-17 15:46:27 +10:00
ntr
86aa6adcb4 Merge tag '1.4.6' into develop
1.4.6
2019-09-17 15:40:40 +10:00
ntr
3d301479ca Merge branch 'release/1.4.6' 2019-09-17 15:40:35 +10:00
ntr
27c410d63d they call me "pixar pete" 2019-09-17 15:37:34 +10:00
ntr
fb80f89214 v1.4.6 2019-09-17 14:36:15 +10:00
ntr
91686a012b Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-17 13:32:46 +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
ntr
2cedbb63f4 stop animations resizing constructs 2019-09-17 12:59:55 +10:00
ntr
8dc9d726aa remove styles that don't do anythin 2019-09-16 21:46:54 +10:00
ntr
c2731c1eea stop skills repainting 2019-09-16 21:43:25 +10:00
ntr
0f69121340 anims return rm 2019-09-16 21:32:01 +10:00
ntr
f9d36fce63 fix all the shit i broke 2019-09-16 20:49:46 +10:00
ntr
0659e121df anims 2019-09-16 20:03:24 +10:00
ntr
2876b24cb3 compiling" 2019-09-16 20:02:03 +10:00
ntr
48a3f75f0c width 2019-09-16 19:50:48 +10:00
ntr
7b51bc7ec8 praise it 2019-09-16 19:33:21 +10:00
ntr
0533cf2ca2 anim alignment 2019-09-16 18:45:17 +10:00
ntr
b6f6712444 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-16 18:31:48 +10:00
ntr
16a0a18905 new game styles 2019-09-16 18:31:45 +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
ntr
e1c8a1b507 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-16 15:26:50 +10:00
ntr
50f2afd657 strike stuff 2019-09-16 15:26:44 +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
ntr
0edfe55387 animations test fixes + new strike 2019-09-16 14:29:32 +10:00
ntr
d1b13ce092 targeting text 2019-09-16 14:22:57 +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
ntr
3cb15a8c1e remove self targeting 2019-09-15 17:27:00 +10:00
ntr
8cbaf2d597 Merge tag '1.4.5' into develop
1.4.5
2019-09-15 17:26:42 +10:00
ntr
1a41f95ed9 Merge branch 'release/1.4.5' 2019-09-15 17:26:37 +10:00
ntr
19bb128d51 Merge branch 'develop' into release/1.4.5 2019-09-15 16:41:08 +10:00
ntr
13354e33fd Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-15 16:40:56 +10:00
ntr
21170285c2 hide timer when instance not in progress 2019-09-15 16:00:24 +10:00
ntr
901f04ef40 v1.4.5 2019-09-15 15:44:10 +10:00
ntr
b85dade351 game invites 2019-09-15 15:42:47 +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
ntr
a22521b119 add tris and url parsing 2019-09-15 12:10:13 +10:00
ntr
a98f1d04af Merge tag '1.4.4' into develop
1.4.4
2019-09-15 12:09:37 +10:00
ntr
7f805fbd3e Merge branch 'release/1.4.4' 2019-09-15 12:09:32 +10:00
ntr
8b1ddbc57e fix shapes img 2019-09-14 23:51:29 +10:00
ntr
6b545fd2c5 worklog 2019-09-14 20:26:38 +10:00