2201 Commits

Author SHA1 Message Date
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
ntr
d873c80e92 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-12 16:19:28 +10:00
ntr
7b27f8d51f svt 2019-09-12 16:17:59 +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
ntr
b89b9a549a svt 2019-09-12 14:50:54 +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
937fdae92e Merge branch 'develop' into svt 2019-09-12 12:47:19 +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
Mashy
a38c603ec9 disable during anim 2019-09-11 15:53:51 +10:00
Mashy
4a13656b9d abandon game 2019-09-11 15:49:36 +10:00
Mashy
60bd7f65ba abandon rpc 2019-09-11 15:29:52 +10:00
ntr
ed1a0ec5a6 fix alignment 2019-09-11 12:49:58 +10:00
ntr
b2658d5150 fix styles 2019-09-11 12:29:09 +10:00
Mashy
9874334fc3 screen width % for anims 2019-09-11 11:55:48 +10:00
ntr
c4e99fd027 svt init 2019-09-10 16:44:36 +10:00
ntr
c853299c46 finished object json writes 2019-09-10 12:38:20 +10:00
ntr
759ac868dd return time controls 2019-09-10 11:58:55 +10:00
ntr
f002e9e283 fix forfeit waiting on game phase timeout 2019-09-10 11:56:09 +10:00
ntr
73ae1e083d demo state 2019-09-10 10:35:25 +10:00
ntr
2c9cba31f3 anims 2019-09-09 22:29:59 +10:00