Commit Graph
100 Commits
Author SHA1 Message Date
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
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
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
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
ntr b89b9a549a svt 2019-09-12 14:50:54 +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
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
ntr ed1a0ec5a6 fix alignment 2019-09-11 12:49:58 +10:00
ntr b2658d5150 fix styles 2019-09-11 12:29:09 +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
ntr 0f8164c774 anims? 2019-09-09 22:24:33 +10:00
ntr 1b8e565455 vbox phase done 2019-09-09 19:39:43 +10:00
ntr f1765af14e fix info stuff 2019-09-09 18:17:27 +10:00
ntr 0ff471f360 wording 2019-09-09 17:52:16 +10:00
ntr 7dbf8e2c89 better welcome 2019-09-09 17:47:57 +10:00
ntr 8c0b02e568 bout to fix welcome 2019-09-09 17:24:58 +10:00
ntr 65c69199b9 demo init 2019-09-09 16:49:52 +10:00
ntr 5874f040ad Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-09 16:46:48 +10:00
ntr fc7184de45 Merge tag '1.4.1' into develop
1.4.1
2019-09-09 16:46:38 +10:00
ntr 2d3d420ea1 Merge branch 'release/1.4.1' 2019-09-09 16:46:34 +10:00
ntr faf54dc3ae game finished find round 2019-09-09 16:46:26 +10:00
ntr 198711b3b2 version 1.4.1 2019-09-09 13:50:39 +10:00
ntr aa6272c77d fix game end bits 2019-09-09 13:50:12 +10:00
ntr 81a02421dd Merge tag '1.4.0' into develop
1.4.0
2019-09-08 20:47:22 +10:00
ntr f41c22af16 Merge branch 'release/1.4.0' 2019-09-08 20:47:12 +10:00
ntr 02e8ae1d33 v1.4.0 2019-09-08 20:32:41 +10:00
ntr ac3801ae38 player box 2019-09-08 19:48:48 +10:00
ntr a794705fbe Merge tag '1.3.2' into develop
1.3.2
2019-09-08 14:51:08 +10:00
ntr cc2606248d Merge branch 'release/1.3.2' 2019-09-08 14:51:04 +10:00
ntr 3c7816fb16 version bump 2019-09-08 14:42:14 +10:00
ntr 44ef34c6eb menu styles 2019-09-08 14:33:58 +10:00
ntr c4fd68a47f better register messages and stripe payments fix 2019-09-08 14:01:03 +10:00
ntr e69764d294 version 1.3.1 2019-09-08 13:00:47 +10:00
ntr e44dc84a4c info and constants 2019-09-08 13:00:35 +10:00
ntr 76a8db35e0 Merge tag '1.3.0' into develop
1.3.0
2019-09-06 17:45:22 +10:00
ntr 1b95e171a8 Merge branch 'release/1.3.0' 2019-09-06 17:45:17 +10:00
ntr 9358d0a99f update info 2019-09-06 17:44:29 +10:00
ntr c22c09a87b greatly simplify recipes 2019-09-06 17:29:09 +10:00
ntr fe04c0d2db fix purge 2019-09-06 17:21:43 +10:00
ntr 6b84fe92d7 create and write construct skeletons 2019-09-06 16:40:03 +10:00
ntr 8a771240b1 fix welcome tabs sorta 2019-09-06 15:35:31 +10:00
ntr c6cc7ddfe1 version bump 2019-09-06 15:21:16 +10:00
ntr 5da9c217d4 Merge branch 'menu-tabs' into develop 2019-09-06 15:20:48 +10:00
ntr 727c3ee6dc delete unused components 2019-09-06 15:15:03 +10:00
ntr a429f21367 tabbed menu 2019-09-06 15:13:10 +10:00
ntr 7af81c5252 woah 2019-09-06 12:13:54 +10:00
ntr 60d9ea5198 better vbox touches 2019-09-04 21:20:05 +10:00
ntr db377ff7b2 Merge branch 'develop' into menu-tabs 2019-09-04 20:16:37 +10:00
ntr 968d0a01aa icon svg info 2019-09-04 17:44:15 +10:00
ntr 2e37dc55ac instance lobby timeout fixes 2019-09-04 17:37:54 +10:00
ntr f9ccfb1fc2 Merge tag '1.2.0' into develop
1.2.0
2019-09-04 17:02:54 +10:00
ntr 9c395bf825 Merge branch 'release/1.2.0' 2019-09-04 17:02:49 +10:00
ntr 70eb982aca Merge branch 'develop' into release/1.2.0 2019-09-04 16:45:37 +10:00
ntr 23b4fd7f76 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 16:45:31 +10:00
ntr 0ca193421e version bump 2019-09-04 16:39:07 +10:00
ntr d643884b2c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 16:38:14 +10:00
ntr b910f99f89 improve pvp queue 2019-09-04 16:38:03 +10:00
ntr a16369085c do not kill listener threads on error 2019-09-04 15:23:35 +10:00
ntr 7a7b75a698 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 15:15:23 +10:00
ntr f0a6743238 remove title 2019-09-04 15:15:16 +10:00
ntr b8c1380f88 Merge branch 'develop' into menu-tabs 2019-09-03 17:02:18 +10:00
ntr 31f353153b worklog dones 2019-09-03 17:01:59 +10:00
ntr c83172ca3d pvp queue join messages 2019-09-03 16:15:40 +10:00
ntr e4a952ecbb Merge tag '1.1.0' into develop
1.1.0
2019-09-03 16:15:03 +10:00
ntr c25cdbe9e4 Merge branch 'release/1.1.0' 2019-09-03 16:14:50 +10:00
ntr 3056d08e71 version bump and version bin 2019-09-03 12:51:00 +10:00
ntr 7603497372 dev stripe checks 2019-09-03 11:29:05 +10:00
ntr fbb7e58f3c make socket url dynamic 2019-09-03 10:57:57 +10:00
ntr 2728be796e fix pvp instance state push notification 2019-09-03 10:02:32 +10:00
ntr 3a382eb97d Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-02 19:09:23 +10:00