ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • c522180366 faceoff text for start, win, lose Mashy 2019-10-22 13:15:57 +10:00
  • c05ad8637f stop idle construct movement causing overflow Mashy 2019-10-22 11:58:00 +10:00
  • 7dc22bca90 Merge branch 'home-page-change' of ssh://git.mnml.gg:40022/~/mnml into home-page-change Mashy 2019-10-22 11:12:48 +10:00
  • 56f3647025 clear mtxActive on nav and if you join game. put shop before reshape Mashy 2019-10-22 11:12:25 +10:00
  • e3f906ef19 fix siphon anim ntr 2019-10-22 11:46:14 +11:00
  • a304f003d0 added sub back to home, controls on reshape menu Mashy 2019-10-22 10:28:28 +10:00
  • 0c9c4a7692 add reshape tab, remove mtx from play page Mashy 2019-10-22 09:52:24 +10:00
  • 36c9236842 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-10-21 19:41:55 +10:00
  • 8e6048b912 fix tick speed bug with new application Mashy 2019-10-21 19:40:19 +10:00
  • 6a0d03c49d 'fix' play ctrl styles ntr 2019-10-21 17:03:53 +11:00
  • 68eb2fa1b4 wip ntr 2019-10-21 17:01:10 +11:00
  • 44df93b028 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-10-21 15:17:56 +11:00
  • 25cda59773 workog ntr 2019-10-21 12:55:10 +11:00
  • fa1135170b worklog Mashy 2019-10-21 10:43:14 +10:00
  • fe177df80a improve copy link Mashy 2019-10-20 17:31:37 +10:00
  • 487bca473e Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-10-20 16:53:03 +10:00
  • 97f96a9fa2 misc log Mashy 2019-10-20 16:52:50 +10:00
  • 7799b2d9a4 Merge tag '1.6.2' into develop ntr 2019-10-20 17:44:26 +11:00
  • 34a039f456 Merge branch 'release/1.6.2' ntr 2019-10-20 17:44:22 +11:00
  • ded1a4cc06 Changelog ntr 2019-10-20 17:44:14 +11:00
  • fb3fa6eaca v1.6.2 ntr 2019-10-20 17:09:40 +11:00
  • 936bc7ac94 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-10-20 17:08:49 +11:00
  • 2d0e564752 Merge tag '1.6.1' into develop ntr 2019-10-20 17:08:09 +11:00
  • f398b6c925 Merge branch 'release/1.6.1' ntr 2019-10-20 17:06:50 +11:00
  • d6487cdb07 don't reconnect ntr 2019-10-20 17:06:39 +11:00
  • cf7c3d1ac7 logs Mashy 2019-10-20 15:54:45 +10:00
  • 79add6bf67 v1.6.1 ntr 2019-10-20 16:05:51 +11:00
  • 2a14fbd3f5 update ctrls and add try catch for socket send ntr 2019-10-20 16:05:40 +11:00
  • 53725e1522 proper combiner preview check, clear skill info on anim start Mashy 2019-10-20 12:57:56 +10:00
  • c111cfe2b8 Merge tag '1.6.0' into develop ntr 2019-10-18 17:40:37 +11:00
  • 0b55484c14 Merge branch 'release/1.6.0' ntr 2019-10-18 17:40:31 +11:00
  • 525ad57707 changelog ntr 2019-10-18 17:40:18 +11:00
  • d1866a4fda only send chat clear after a msg ntr 2019-10-18 17:21:01 +11:00
  • ff48288ae2 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.6.0 ntr 2019-10-18 17:19:05 +11:00
  • 8f99e07e81 flash quit / back button Mashy 2019-10-18 16:18:33 +10:00
  • 0ee39111cb fix random broken styles ntr 2019-10-18 17:14:11 +11:00
  • a2547f87b8 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.6.0 ntr 2019-10-18 16:17:49 +11:00
  • 0dc272df96 changelog Mashy 2019-10-18 15:16:59 +10:00
  • 05855af04a siphon & slay have green power scaling Mashy 2019-10-18 15:11:57 +10:00
  • c0be03f0e3 don't internal error msg spam ntr 2019-10-18 16:08:05 +11:00
  • 65bc2ac729 v1.6.0 ntr 2019-10-18 15:53:46 +11:00
  • aa5b76551f fix game btns ntr 2019-10-18 15:51:45 +11:00
  • daa1b6214b Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-10-18 15:43:19 +11:00
  • 4b216775cd game btns ntr 2019-10-18 15:43:08 +11:00
  • ddca205f0c chat wheelu ntr 2019-10-18 15:38:40 +11:00
  • fb8b4a159c changelog Mashy 2019-10-18 13:23:41 +10:00
  • 1a0f427715 worklog Mashy 2019-10-18 10:24:08 +10:00
  • 8753d97650 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-10-18 10:09:46 +10:00
  • b54c394316 mobile description text Mashy 2019-10-18 10:09:02 +10:00
  • 06897e0e43 safety in case null combo (shouldn't happen anyway) Mashy 2019-10-18 09:37:58 +10:00
  • 85497bfbf2 preview combiner Mashy 2019-10-18 09:30:01 +10:00
  • 189d1023c6 remove nav ntr 2019-10-18 10:16:20 +11:00
  • b71cc8fc0f effect descriptions, skill speed in game info, fix block stages Mashy 2019-10-17 21:47:55 +10:00
  • 38899d31d0 disable hover info during anim Mashy 2019-10-17 17:44:05 +10:00
  • b896a7ee42 skill info on hover in effect box Mashy 2019-10-17 16:25:31 +10:00
  • 3104c841df chat wip ntr 2019-10-17 15:14:38 +11:00
  • 057ea9b528 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-10-17 13:54:46 +11:00
  • dd1085a6d4 redact game and instance states ntr 2019-10-17 13:54:30 +11:00
  • b0537d758b changelog Mashy 2019-10-17 11:30:00 +10:00
  • 924a7d40ac Merge tag '1.5.6' into develop ntr 2019-10-17 11:56:03 +11:00
  • cf39e006cd Merge branch 'release/1.5.6' ntr 2019-10-17 11:55:47 +11:00
  • 47d060432c v1.5.6 ntr 2019-10-17 11:24:29 +11:00
  • 245cb603fc improve check Mashy 2019-10-17 09:33:26 +10:00
  • ea5d908893 vbox highlight for combiner Mashy 2019-10-16 18:27:06 +10:00
  • 03a0953b46 background highlight equip slots Mashy 2019-10-16 17:26:03 +10:00
  • c444ae7d78 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours Mashy 2019-10-16 16:17:22 +10:00
  • 935d1d47ee fix combo highlighting (some rare case like 2 green) Mashy 2019-10-16 16:17:02 +10:00
  • f2ae3e5212 fade to gray to prevent rainbowing ntr 2019-10-16 16:18:24 +11:00
  • f167ff82bb don't double up combo highlight check and make backgrounds so you can always see colours ntr 2019-10-16 16:16:17 +11:00
  • 62aa801692 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours Mashy 2019-10-16 14:21:02 +10:00
  • 5dbdc3762f highlight potential inv combos Mashy 2019-10-16 14:20:44 +10:00
  • 4ed8be2fc0 disable animations on disabled buttons ntr 2019-10-16 12:10:38 +11:00
  • 66f80629cd pimp siphon ntr 2019-10-16 12:06:22 +11:00
  • 972923a0c9 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours ntr 2019-10-16 11:16:18 +11:00
  • 15cde076de chaos filters ntr 2019-10-16 11:14:31 +11:00
  • 1abe4ed08e button borders across the board Mashy 2019-10-15 22:06:41 +10:00
  • 85e13c5922 expo ntr 2019-10-15 17:53:22 +11:00
  • b386057326 animate borders ntr 2019-10-15 17:44:05 +11:00
  • b2e4570bfb coloured border experiment Mashy 2019-10-15 16:05:58 +10:00
  • 1c611c31e9 Merge tag '1.5.5' into develop ntr 2019-10-15 12:52:59 +11:00
  • 0ebe13f2c3 Merge branch 'release/1.5.5' ntr 2019-10-15 12:52:55 +11:00
  • b98ab4a6e3 worklog ntr 2019-10-15 12:52:30 +11:00
  • cd784a2091 changelog ntr 2019-10-15 12:38:18 +11:00
  • 27840ea53f v1.5.5 ntr 2019-10-15 11:58:54 +11:00
  • 7cab0a6f18 combo counts ntr 2019-10-15 11:57:57 +11:00
  • 26054eca73 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.5.5 ntr 2019-10-15 11:45:14 +11:00
  • eaf50c3a26 combiner fixes ntr 2019-10-15 11:36:15 +11:00
  • 8e03248844 worklog / changelog increase purge cd Mashy 2019-10-15 09:40:05 +10:00
  • 7d34b1b4ac purge bug fix Mashy 2019-10-15 09:09:21 +10:00
  • f2a516b5f0 fix few bugs ntr 2019-10-15 10:00:42 +11:00
  • 349c74c08e Merge tag '1.5.4' into develop ntr 2019-10-10 18:33:49 +11:00
  • 74f16bc25c Merge branch 'release/1.5.4' ntr 2019-10-10 18:33:41 +11:00
  • b86c85476f Merge branch 'develop' into release/1.5.4 ntr 2019-10-10 18:25:18 +11:00
  • bc203daa69 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-10-10 18:24:54 +11:00
  • dc7e8a91e6 better styles for effects and skills ntr 2019-10-10 18:19:36 +11:00
  • d134bc8cf3 better demo ntr 2019-10-10 18:04:25 +11:00
  • c9abbf61cf nginx staging auth ntr 2019-10-10 16:49:40 +11:00
  • d8adff0203 Merge branch 'tos' into release/1.5.4 ntr 2019-10-10 15:33:24 +11:00
  • 7c81fd1e32 tos html file" ntr 2019-10-10 15:33:18 +11:00
  • 91f01ff799 update tos html ntr 2019-10-10 15:33:12 +11:00