Commit Graph

  • 9bcea878ec Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-11-12 16:42:47 +10:00
  • 66263be25f table layout wip Mashy 2019-11-12 16:42:33 +10:00
  • 1d699d1b62 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-12 16:32:28 +11:00
  • 3ee32b3ef2 pvp leave queue implemented ntr 2019-11-12 16:32:19 +11:00
  • 01fa0c5137 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-11-12 15:16:04 +10:00
  • af2f145d17 ready through tutorial face off faster Mashy 2019-11-12 15:15:29 +10:00
  • 9c4215ebba remove zombie skip code ntr 2019-11-12 15:54:08 +11:00
  • 3a498616fb additional setactive remove ntr 2019-11-12 15:52:45 +11:00
  • 1b5050a7bf fix auto ready and remove activeConstruct reducer ntr 2019-11-12 15:51:33 +11:00
  • db8e198817 fix info styles by removing grid ntr 2019-11-12 15:34:44 +11:00
  • de82a21baa fix account err text ntr 2019-11-12 15:21:37 +11:00
  • 1824363de1 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-12 15:20:25 +11:00
  • 87bc63e648 password changes, account name restrictions ntr 2019-11-12 15:20:02 +11:00
  • 6c0457f8fd preview combo when you've selected 3 items Mashy 2019-11-12 13:58:48 +10:00
  • 4e627fa34b client side disable shop purchase Mashy 2019-11-12 12:32:06 +10:00
  • c1d4dd3620 clear comboItem error handling Mashy 2019-11-12 12:03:17 +10:00
  • 27c562d41b preview item combos in table Mashy 2019-11-12 11:39:34 +10:00
  • 357c38e375 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-11 14:00:33 +11:00
  • 61a8db708b slamma jamma into instance when you first register ntr 2019-11-11 14:00:23 +11:00
  • d43d89adb2 changelog Mashy 2019-11-11 12:40:47 +10:00
  • eb51cad036 break line for speed description in game phase Mashy 2019-11-11 12:37:14 +10:00
  • 1a2d2995cc add "Purified" effect to Purify Mashy 2019-11-11 12:34:14 +10:00
  • 8eaa3dc1c0 amplify no longer increases green power Mashy 2019-11-11 12:09:33 +10:00
  • d77dd00e01 add skill to removal event Mashy 2019-11-11 12:07:15 +10:00
  • ab7625def0 purge / purify removes all effects Mashy 2019-11-11 11:58:29 +10:00
  • 6f453c45fc fix demo animation issue Mashy 2019-11-10 21:50:25 +10:00
  • 6fdff259ec host changelog Mashy 2019-11-10 11:21:50 +10:00
  • ae48b07da8 Merge tag '1.8.2' into develop Mashy 2019-11-10 08:25:39 +10:00
  • e7fe53e79f Merge branch 'release/1.8.2' Mashy 2019-11-10 08:25:17 +10:00
  • 19a1e799c5 changelog Mashy 2019-11-10 08:24:19 +10:00
  • 7acf060093 1.8.2 Mashy 2019-11-10 08:13:42 +10:00
  • 4c0a9088a1 fix reshape available mtx bug Mashy 2019-11-09 15:57:32 +10:00
  • dffb4e7221 Merge tag '1.8.1' into develop Mashy 2019-11-09 13:53:40 +10:00
  • 7e1a9d8585 Merge branch 'release/1.8.1' Mashy 2019-11-09 13:53:24 +10:00
  • 4101f1a7c7 fix button hovers: ntr 2019-11-09 14:06:56 +11:00
  • 0d727813d5 fix animations with stroke issues ntr 2019-11-09 13:32:25 +11:00
  • b268c2997e fix opacity % -> float ntr 2019-11-09 13:13:46 +11:00
  • 5db552c236 fix less imports ntr 2019-11-09 13:06:28 +11:00
  • fc4c3259a7 Merge branch 'develop' into release/1.8.1 ntr 2019-11-09 12:57:53 +11:00
  • 245c255adc remove extra colour imports ntr 2019-11-09 12:57:39 +11:00
  • b83627bb7d remove footer ntr 2019-11-09 12:57:32 +11:00
  • bc289e4e7c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.1 Mashy 2019-11-09 11:31:40 +10:00
  • 634ff99c7d v1.8.1 Mashy 2019-11-09 11:12:07 +10:00
  • 3f21c00a3e faceoff even sizes ntr 2019-11-09 11:48:46 +11:00
  • 99c1efc201 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-09 10:54:00 +11:00
  • e544ed2168 faceoff text alignment ntr 2019-11-09 10:53:57 +11:00
  • 86968e1076 changelog Mashy 2019-11-08 13:59:04 +10:00
  • 7b054340d4 add ko event back but doing it right Mashy 2019-11-08 13:01:28 +10:00
  • e540128a94 styling improvements for effect text, move down opp avatars on mobile Mashy 2019-11-08 12:09:16 +10:00
  • 35062db799 don't send immune events when targetko Mashy 2019-11-08 11:57:12 +10:00
  • 865abb2366 actually push cd fix Mashy 2019-11-08 10:58:32 +10:00
  • 0d39a84319 skills don't go on cd if they're not really *cast* Mashy 2019-11-08 10:57:59 +10:00
  • 34598178ca Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-11-08 10:33:07 +10:00
  • 879564ef02 removed before pax changelog mess, cdr line Mashy 2019-11-08 10:31:01 +10:00
  • cc79d4528b changelog ntr 2019-11-08 11:15:33 +11:00
  • bfff237e85 fix changelog formatting ntr 2019-11-08 11:09:44 +11:00
  • ba5627b36b Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-08 11:05:20 +11:00
  • 2cac373afe fixed cooldown bug by filtering all resolved skills and checking for cd ntr 2019-11-08 11:05:05 +11:00
  • 542a0916ef tidy up test Mashy 2019-11-08 10:04:26 +10:00
  • a4b0fc0c4f Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-11-08 09:59:21 +10:00
  • 905693a415 sleep test Mashy 2019-11-08 09:58:51 +10:00
  • 00b32b38a3 center alignment of resolving text ntr 2019-11-08 09:59:42 +11:00
  • ff8e3aaa71 more changelog Mashy 2019-11-07 19:11:32 +10:00
  • 84d00357c3 changelog Mashy 2019-11-07 19:06:17 +10:00
  • 4514d6c0c2 link rework, description bg Mashy 2019-11-07 19:03:36 +10:00
  • bbfeb22a3f fix reflect rotation Mashy 2019-11-07 18:15:21 +10:00
  • 51ca41b218 background color for resolving-skill Mashy 2019-11-07 17:52:07 +10:00
  • 4cbeab19df unlock game construct size Mashy 2019-11-07 17:44:27 +10:00
  • 1498c6677d Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-07 16:12:32 +11:00
  • d1b9882231 Merge tag '1.8.0' into develop ntr 2019-11-07 16:12:20 +11:00
  • 2ea86fd6b8 Merge branch 'release/1.8.0' ntr 2019-11-07 16:12:15 +11:00
  • bec998ae51 no more NoStages or '' event Mashy 2019-11-07 13:24:48 +10:00
  • 4173fb2385 descriptions, recharge invert fix Mashy 2019-11-07 13:06:19 +10:00
  • 558e3be124 invert recharge, fix recharge border Mashy 2019-11-07 12:25:13 +10:00
  • e01de8273e rework recharge return into vec Mashy 2019-11-07 11:34:19 +10:00
  • 241467ec48 cleaning up ugly recharge code Mashy 2019-11-07 11:23:08 +10:00
  • 2792061186 rearrange worklog Mashy 2019-11-07 10:32:29 +10:00
  • f7b86337d5 changelog Mashy 2019-11-07 10:17:31 +10:00
  • e90320cc30 Merge branch 'text-background' into develop Mashy 2019-11-07 10:09:32 +10:00
  • a220529ac7 Merge branch 'release/1.8.0' into develop Mashy 2019-11-07 10:09:24 +10:00
  • efcc437985 ruin deals dmg to each construct and reduce cd Mashy 2019-11-07 10:08:25 +10:00
  • e18356a554 text background Mashy 2019-11-06 19:02:15 +10:00
  • 8f428f15a3 expo connect backoff and reloading ntr 2019-11-06 19:05:28 +11:00
  • 787fd8ac90 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 ntr 2019-11-06 18:15:09 +11:00
  • c86183eb4a recharge rb animation text ntr 2019-11-06 18:15:06 +11:00
  • 4b6f3becd2 changelogs Mashy 2019-11-06 17:14:20 +10:00
  • 9e5bfea0ce remove decay cd, reduce banish cd Mashy 2019-11-06 17:11:44 +10:00
  • b4a52576d2 hastestrike / hybridblast + triggers (Attack no longer triggers) Mashy 2019-11-06 17:08:31 +10:00
  • b737d91f58 Amplify increases greenpower Mashy 2019-11-06 17:04:40 +10:00
  • 62b20bed18 fix vbox ntr 2019-11-06 17:27:48 +11:00
  • e86ef5c3dd Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 ntr 2019-11-06 17:20:40 +11:00
  • ec964de5f0 other key index Mashy 2019-11-06 16:20:22 +10:00
  • 6dfdbd5722 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 ntr 2019-11-06 17:20:08 +11:00
  • 493aee4df8 index bound fix Mashy 2019-11-06 16:14:03 +10:00
  • 9dd914a5d8 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 ntr 2019-11-06 17:06:23 +11:00
  • 1902c725ba Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 Mashy 2019-11-06 16:04:06 +10:00
  • 4cc42e305c combiner fixes Mashy 2019-11-06 16:03:39 +10:00
  • bdcb667a24 box -> d ntr 2019-11-06 17:02:54 +11:00
  • 79f1712864 fix vbox button flashing by adding key to mapped btns ntr 2019-11-06 16:25:29 +11:00
  • 8b4c616629 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 ntr 2019-11-06 14:48:04 +11:00