2034 Commits

Author SHA1 Message Date
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
ntr
64dc9001c7 v1.4.4 2019-09-14 19:47:04 +10:00
ntr
443d39725f shapes migration 2019-09-14 19:46:14 +10:00
ntr
fcd7a66880 shapes 2019-09-14 18:54:59 +10:00
ntr
de088b73c5 Merge tag '1.4.3' into develop
1.4.3
2019-09-14 18:54:40 +10:00
ntr
705959207f Merge branch 'release/1.4.3' 2019-09-14 18:54:35 +10:00
ntr
d1a8a52df3 1s ping 2019-09-13 22:54:35 +10:00
ntr
70c99f2aaf Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.3 2019-09-13 22:26:47 +10:00
Mashy
85f1a6bb33 ahhhhhhhhhhhhhhhhhhhh 2019-09-13 22:26:25 +10:00
ntr
45f55d5179 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.3 2019-09-13 22:25:44 +10:00
Mashy
0296d9907b actually fix anim bug 2019-09-13 22:25:07 +10:00
ntr
0af4190933 v1.4.3 2019-09-13 22:18:32 +10:00
ntr
7cb6fdf475 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-13 22:11:07 +10:00
ntr
b33eb4d106 upkeep bug 2019-09-13 22:11:02 +10:00
Mashy
6965bdb0e6 anim bug 2019-09-13 22:10:25 +10:00
ntr
7c7554dc8e Merge tag '1.4.2' into develop
1.4.2
2019-09-13 19:38:27 +10:00
ntr
c4b78734c8 Merge branch 'release/1.4.2' 2019-09-13 19:38:23 +10:00
ntr
6ac38c3e6d v1.4.2 2019-09-13 15:21:03 +10:00
ntr
24a8c5e06a button radii 2019-09-13 15:20:21 +10:00
ntr
2fa65c0e59 better window open 2019-09-13 15:15:11 +10:00
ntr
cc43eddf66 more fixes 2019-09-13 15:02:42 +10:00
ntr
61dbadb51f fixes 2019-09-13 14:57:57 +10:00
ntr
a878992358 abandon font size 2019-09-13 14:54:00 +10:00
ntr
75fe96b265 button madness 2019-09-13 14:52:16 +10:00
ntr
1fc23f424f border radius buttons 2019-09-13 13:23:06 +10:00
ntr
ae5f51f9c8 instance abandon finishes game 2019-09-13 13:15:22 +10:00
ntr
abdd612886 instance btn file 2019-09-13 13:05:47 +10:00
ntr
ba48123fbc move buttons out of game.ctrl 2019-09-13 12:36:32 +10:00
ntr
f894538c9b logo 2019-09-13 12:22:13 +10:00