Commit Graph

Select branches

Hide Pull Requests

automnml

develop

main

master

Mono Color

• 6c1c411092 Merge tag '1.10.0' into develop ntr 2019-11-29 14:24:41 +10:00
• e847ebb177 Merge branch 'release/1.10.0' ntr 2019-11-29 14:24:34 +10:00
• 39987d0c9d fix esc actions ntr 2019-11-29 13:49:48 +10:00
• 980f03abf6 v1.10.0 ntr 2019-11-29 13:06:01 +10:00
• 3d34d3bbe2 keep item fadeout while full combo is selected Mashy 2019-11-29 12:55:01 +10:00
• 798b68cff1 text cleanup Mashy 2019-11-29 09:41:09 +10:00
• 75a1c1b3c4 duplicate events on same construct won't move Mashy 2019-11-29 00:06:42 +10:00
• 84e3e776ca fixt tutorial Mashy 2019-11-28 23:46:07 +10:00
• 500584ab10 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop Mashy 2019-11-28 17:49:10 +10:00
• 11ec807ae2 fix highlighting issues ntr 2019-11-28 17:30:06 +10:00
• 63028fe297 wip experimenting with values Mashy 2019-11-28 16:54:37 +10:00
• 91c82324e2 clean up equipping api ntr 2019-11-28 16:31:37 +10:00
• 18126c1b0c change names ntr 2019-11-28 16:01:44 +10:00
• e78a502a40 PogU Mashy 2019-11-28 15:54:37 +10:00
• 24951c1442 costs ntr 2019-11-28 15:51:42 +10:00
• 4920821ec2 rm free and bound ntr 2019-11-28 15:48:31 +10:00
• 33ad4db8f5 server ntr 2019-11-28 15:43:48 +10:00
• 51edec11fd fixed recharge event Mashy 2019-11-28 14:54:35 +10:00
• 5e1b63108c move skill into combat text Mashy 2019-11-28 12:01:05 +10:00
• d1dd2b30b6 combat text init Mashy 2019-11-27 17:00:40 +10:00
• d276edab14 return of the combo preview Mashy 2019-11-26 17:30:52 +10:00
• 79f5845e48 comments Mashy 2019-11-26 13:32:23 +10:00
• 5153ed07b0 add back shouldComponentUpdates =\ Mashy 2019-11-26 13:27:50 +10:00
• 8312b44b2b change info / combos back to functional components with passed down props Mashy 2019-11-26 12:03:31 +10:00
• d1649c986b vbox css fix Mashy 2019-11-26 11:43:53 +10:00
• f03317da54 wl Mashy 2019-11-26 10:49:40 +10:00
• e2444cc988 wl Mashy 2019-11-26 10:49:14 +10:00
• c10b68949c should comp update for info / combos Mashy 2019-11-26 10:42:06 +10:00
• 86a84cbcea duplicate line Mashy 2019-11-25 22:19:48 +10:00
• a50d10185f click clear, match default refund border width Mashy 2019-11-25 22:18:04 +10:00
• f4a7ba65eb unlock info size from store/stash divider Mashy 2019-11-25 21:46:54 +10:00
• 4dbbb4f38d mobile game styling fix Mashy 2019-11-25 20:11:48 +10:00
• 490216fb01 refactoring FeelsAmazingMan Mashy 2019-11-25 16:54:51 +10:00
• e3b27ae6b2 Merge branch 'construct-box-rework' into develop ntr 2019-11-24 23:41:08 +11:00
• ec10d7f890 fix rotate size ntr 2019-11-24 23:38:31 +11:00
• 8a2e8dbab1 that'll do ntr 2019-11-24 23:34:43 +11:00
• 4df4f3a785 fix remaining px borders ntr 2019-11-24 23:08:35 +11:00
• 8b7003fb32 mobile styles ntr 2019-11-24 22:41:14 +11:00
• 046c065bbd big btn ntr 2019-11-24 22:23:22 +11:00
• bbdc89ed7f remove fns ntr 2019-11-24 22:19:39 +11:00
• 734132974b info back ntr 2019-11-24 22:17:06 +11:00
• 64fc508ae6 combos wip ntr 2019-11-24 22:00:53 +11:00
• c76212b285 combiner ntr 2019-11-24 21:47:29 +11:00
• f1170c6c43 combiner out ntr 2019-11-24 21:39:28 +11:00
• c03a687bba move avatar to middle ntr 2019-11-24 19:14:09 +11:00
• 2b1843ddb7 styles ntr 2019-11-24 19:02:22 +11:00
• 5f4659b6db Merge branch 'new-vbox-combiner' into new-vbox-resize ntr 2019-11-24 18:20:33 +11:00
• 308165b33a Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize ntr 2019-11-24 18:00:14 +11:00
• 735df33056 mobile styles ntr 2019-11-24 18:00:05 +11:00
• 74f47e7cb5 Merge branch 'vbox-layout' into new-vbox-combiner Mashy 2019-11-24 15:50:26 +10:00
• a9faec1d4e group info and combiner css together Mashy 2019-11-24 13:08:28 +10:00
• 6ce43884c9 clear vbox state variables on game leave Mashy 2019-11-24 12:42:27 +10:00
• aa2f34c64b tone down highlighted item intensity white -> silver Mashy 2019-11-24 12:36:31 +10:00
• 775d902184 always show itemUnequip in info pane Mashy 2019-11-24 12:36:22 +10:00
• 4e9edd241c unselect equipped skills & specs Mashy 2019-11-24 12:14:56 +10:00
• 1b760a2893 fade invalid combo selections Mashy 2019-11-24 11:51:02 +10:00
• 024637c65d disable store drag Mashy 2019-11-24 10:49:57 +10:00
• e702e3fdd1 vbox border width Mashy 2019-11-23 21:17:56 +10:00
• 16af4da249 move combiner into info (clear buy/combine) on combo hover Mashy 2019-11-23 21:05:17 +10:00
• 754f3e0025 length clarify Mashy 2019-11-23 20:27:11 +10:00
• f0ea19940f stash length fix (buy 3 item full combo from vbox) Mashy 2019-11-23 20:26:45 +10:00
• 8641e74f9b fix combo preview Mashy 2019-11-23 20:24:15 +10:00
• b9e4eca8cf vbox info always what selected prio full combo > bases > colour Mashy 2019-11-23 19:53:06 +10:00
• 9b6bf4442e default button styling 60% width Mashy 2019-11-23 17:20:43 +10:00
• 34f790caa3 moved combiner wip Mashy 2019-11-23 17:03:04 +10:00
• cfeac949e0 Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize Mashy 2019-11-22 15:57:57 +10:00
• bdf3244f58 border width 0.2 -> 0.1 Mashy 2019-11-22 15:57:15 +10:00
• 9ad0f97e51 sweet delicious yellow ntr 2019-11-22 16:52:01 +11:00
• b42c4e76e7 Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize Mashy 2019-11-22 15:47:46 +10:00
• 637d3e5be8 combiner new line Mashy 2019-11-22 15:46:49 +10:00
• f0aba62e6d big btns for big bois ntr 2019-11-22 16:37:11 +11:00
• 3a0692a2a5 resize stuff ntr 2019-11-22 16:36:11 +11:00
• 2d3c6cd18c SIX size stash ntr 2019-11-22 16:26:43 +11:00
• b5ab43a18a fix game phase for small phones Mashy 2019-11-22 15:19:22 +10:00
• af803efe4f targetting arrows for mobile Mashy 2019-11-22 15:02:42 +10:00
• 8e73dcd92c game bottom margin, targetting arrow start / end hotfix Mashy 2019-11-22 14:34:48 +10:00
• 5f2ee673b2 mobile avatar Mashy 2019-11-22 12:52:23 +10:00
• d4f2f9623f wi ntr 2019-11-22 12:47:46 +11:00
• 672644514d 1150px text size breakpoint Mashy 2019-11-22 10:35:17 +10:00
• 69be938e76 shop / vbox -> store Mashy 2019-11-22 10:34:50 +10:00
• fba4627bf1 fixed combo list width Mashy 2019-11-22 10:14:36 +10:00
• a353dcca95 inventory -> stash Mashy 2019-11-22 10:06:39 +10:00
• 945f0828c1 combo mouseover event Mashy 2019-11-22 09:59:35 +10:00
• b5ade7f012 combo preview styling Mashy 2019-11-22 09:56:29 +10:00
• 843c1c6bbe combo preview wip Mashy 2019-11-22 01:17:45 +10:00
• 9cd656a99f skill button size Mashy 2019-11-22 00:39:35 +10:00
• c650b74ec9 skill button size Mashy 2019-11-22 00:39:22 +10:00
• 28585487c6 game phase cooldown new line, mobile styling Mashy 2019-11-22 00:23:53 +10:00
• 0722b194b0 misc styling (actual commit) Mashy 2019-11-22 00:18:17 +10:00
• 4d3a837d47 misc styling Mashy 2019-11-22 00:17:50 +10:00
• a3376fb8d2 fix mobile game phase Mashy 2019-11-21 18:05:46 +10:00
• 8e83d0aa0b instance cleanup Mashy 2019-11-21 16:55:04 +10:00
• 05112fbf7e remove instance mobile style file Mashy 2019-11-21 16:31:19 +10:00
• 54743c67ba styling Mashy 2019-11-21 15:57:25 +10:00
• 85592b1516 breakout combiner / inv / store into separate files Mashy 2019-11-21 15:02:07 +10:00
• 33420e4231 default button padding (was 6px default) on chrome Mashy 2019-11-21 14:22:05 +10:00
• 1735087321 mobile styling Mashy 2019-11-21 14:03:59 +10:00
• ef9ef0b604 new layout combiner bottom Mashy 2019-11-21 13:19:07 +10:00
• bdc7aa6338 Merge tag '1.9.1' into develop ntr 2019-11-21 12:59:05 +11:00
• 5fa63ca597 Merge branch 'release/1.9.1' ntr 2019-11-21 12:58:59 +11:00