Commit Graph
1313 Commits
Author SHA1 Message Date
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
ntr 3cb15a8c1e remove self targeting 2019-09-15 17:27:00 +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 64dc9001c7 v1.4.4 2019-09-14 19:47:04 +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
Mashy 6965bdb0e6 anim bug 2019-09-13 22:10:25 +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 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
ntr d873c80e92 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-12 16:19:28 +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
ntr 7accf581d1 sleep centre 2019-09-12 12:45:47 +10:00
ntr 5eed253c8d remove xtra divs 2019-09-12 12:45:35 +10:00
ntr 78853943f2 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-12 12:39:39 +10:00
ntr d8a85b93c5 remove code 2019-09-12 12:39:33 +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
ntr 9a70c1f34e remove code, fix animation reset 2019-09-12 11:41:53 +10:00
ntr 1f5d57a276 Merge branch 'demo-orig' into develop 2019-09-12 11:35:18 +10:00
Mashy 7f6df40ea7 misc 2019-09-11 16:20:49 +10:00