Commit Graph

Select branches

Hide Pull Requests

automnml

develop

main

master

Mono Color

• 4733704d48 v1.9.1 ntr 2019-11-21 12:47:18 +11:00
• cebf172024 changelog generated ntr 2019-11-21 12:45:58 +11:00
• 7d62f468cd Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-21 12:42:34 +11:00
• 35c74ee325 buycount bugfix Mashy 2019-11-21 11:41:08 +10:00
• b0a8684482 change tutorial text to show it's not over ntr 2019-11-21 12:39:36 +11:00
• a5d778475e fix buycount combo bug Mashy 2019-11-21 11:36:06 +10:00
• 7d0018c134 wl cleanup Mashy 2019-11-21 11:29:07 +10:00
• 5cb9f6ebd0 wl remove duplicate vbox hoverFn Mashy 2019-11-21 11:19:33 +10:00
• 917858174c delete "reclaim" & "vboxHighlight" state variables Mashy 2019-11-21 11:10:34 +10:00
• 26c1c49c4e reduce stash size Mashy 2019-11-21 10:57:46 +10:00
• 7dc4a3f4f4 vbox rearrange, rework reclaim Mashy 2019-11-21 10:42:15 +10:00
• c21d64e3e8 Merge tag '1.9.0' into develop ntr 2019-11-21 11:04:55 +11:00
• 816470e879 Merge branch 'release/1.9.0' ntr 2019-11-21 11:04:51 +11:00
• 00a7b7fb5b changelog ntr 2019-11-21 11:04:42 +11:00
• 7b008f9fea v1.9.0 ntr 2019-11-21 10:38:55 +11:00
• 1cf49fe7cd Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-21 10:37:51 +11:00
• 95c0dcba4d wl ntr 2019-11-21 10:35:23 +11:00
• 3dddf4b1a8 wip Mashy 2019-11-20 23:07:44 +10:00
• e53983db98 rearrange vbox wip Mashy 2019-11-20 21:47:19 +10:00
• b6c90661a7 wl Mashy 2019-11-20 20:44:24 +10:00
• eb35bea7c6 Merge branch 'vbox-combine' into develop Mashy 2019-11-20 18:47:55 +10:00
• b6553d89c4 tutorial text fix Mashy 2019-11-20 18:47:22 +10:00
• 19072926e6 bits check on combine Mashy 2019-11-20 16:42:10 +10:00
• 9ee1c166f3 don't set info to colours when combining Mashy 2019-11-20 16:38:28 +10:00
• ec8697aba1 combiner / single item buy cost preview Mashy 2019-11-20 16:31:25 +10:00
• eb3d42ea58 validVboxSelect for vbox and inventory Mashy 2019-11-20 15:59:03 +10:00
• e583d2a7ec wl ntr 2019-11-20 15:43:19 +11:00
• b570bfaad0 vbox selecting Mashy 2019-11-20 13:55:54 +10:00
• af99883ced remove combiner, vboxSelected fields "shopSelect & stashSelect" Mashy 2019-11-20 13:45:59 +10:00
• e35c688cff Combine vboxselect and combiner. Remove itemEquip and dblclick. Mashy 2019-11-20 13:24:57 +10:00
• 8e6561499a concede game round ntr 2019-11-20 12:39:09 +11:00
• 40ca99d185 ws gzip ntr 2019-11-20 12:14:37 +11:00
• 10d3f821e3 worklog Mashy 2019-11-20 09:13:17 +10:00
• 52d9367e3c don't clear vbox selected on inventory click Mashy 2019-11-19 23:11:18 +10:00
• 55f0ceeeec worklog Mashy 2019-11-19 23:01:09 +10:00
• 73b6d0f321 clear selected items on new selections, reclaim doesn't turn combine red Mashy 2019-11-19 22:13:00 +10:00
• 5c0a76b9a6 clear vboxselect and combiner on unequip select && highlight unequip Mashy 2019-11-19 21:40:14 +10:00
• 2a82666498 check for combine overflow Mashy 2019-11-19 13:17:33 +10:00
• 2ba8a63d81 buy/combine from vbox wip Mashy 2019-11-19 13:09:50 +10:00
• f2add9a836 vbox bits check Mashy 2019-11-19 12:08:52 +10:00
• 604a604c01 vbox selected more wip Mashy 2019-11-19 12:06:08 +10:00
• 33152e54d5 select vbox multiple wip Mashy 2019-11-19 11:35:30 +10:00
• 0d08536837 add vbox indicies as a combine param Mashy 2019-11-19 10:35:45 +10:00
• f850a8806b mouseover Mashy 2019-11-19 10:30:00 +10:00
• 2c14cfc494 lock info when vbox / inv items selected Mashy 2019-11-18 23:58:48 +10:00
• 5fdabc0f21 don't compile logger on windows Mashy 2019-11-18 23:00:58 +10:00
• f66be37f8a unselect vbox item Mashy 2019-11-17 22:00:08 +10:00
• 424c78b30d remove focus highlighting Mashy 2019-11-17 21:53:59 +10:00
• 21f66b105e worklog Mashy 2019-11-17 21:52:29 +10:00
• 3346d745e5 Merge tag '1.8.5' into develop Mashy 2019-11-16 17:07:17 +10:00
• 4d8ca375d1 Merge branch 'release/1.8.5' Mashy 2019-11-16 17:07:10 +10:00
• c799093a94 +x client Mashy 2019-11-16 17:06:45 +10:00
• 7ddfa2dcd2 1.8.5 Mashy 2019-11-16 16:56:44 +10:00
• f1072ec7c8 changelog Mashy 2019-11-16 16:55:48 +10:00
• fbae8f71eb only send ko event if theres damage Mashy 2019-11-15 11:22:05 +10:00
• 9acb2229a8 line endings Mashy 2019-11-14 23:31:09 +10:00
• 2b3b002a0e 1.8.4 html Mashy 2019-11-14 23:28:49 +10:00
• 8fab03650a changelog Mashy 2019-11-14 23:11:34 +10:00
• 6dd10f4777 Merge tag '1.8.4' into develop Mashy 2019-11-14 23:10:29 +10:00
• 9418e2cd41 Merge branch 'release/1.8.4' Mashy 2019-11-14 23:10:19 +10:00
• 2f9c608e6b changelog Mashy 2019-11-14 21:26:02 +10:00
• 3aafbefa7e changelog Mashy 2019-11-14 21:24:32 +10:00
• 94b6f6b18f 1.8.4 Mashy 2019-11-14 21:23:52 +10:00
• 496c57ea77 hotfix tutorial bits stage bug Mashy 2019-11-14 21:21:49 +10:00
• 44ae33d8ea log Mashy 2019-11-13 21:15:46 +10:00
• 3f18f3628a worklog ntr 2019-11-13 21:56:12 +11:00
• f502bb5756 Merge tag '1.8.3' into develop ntr 2019-11-13 21:52:00 +11:00
• ef790b2f73 Merge branch 'release/1.8.3' ntr 2019-11-13 21:51:55 +11:00
• 917b239647 fix double ready ntr 2019-11-13 21:37:53 +11:00
• 70f99a6ffd game cancelled ntr 2019-11-13 21:35:52 +11:00
• dfcc281416 Merge branch 'release/1.8.3' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.3 ntr 2019-11-13 20:51:46 +11:00
• 44f008740e auto ready for learn mode and remove upkeep warnings ntr 2019-11-13 20:51:30 +11:00
• 8aee7dc084 purified => pure ntr 2019-11-13 20:23:59 +11:00
• 576244a541 version Mashy 2019-11-13 19:10:54 +10:00
• 726981a8de changelog Mashy 2019-11-13 19:09:21 +10:00
• b6ce6a5277 post_resolve Mashy 2019-11-13 19:05:10 +10:00
• c99f189c69 better duplicate ko check Mashy 2019-11-13 19:04:25 +10:00
• 7d253ab65d changelog Mashy 2019-11-13 16:14:27 +10:00
• c560a347f4 v1.8.3 ntr 2019-11-13 17:12:36 +11:00
• 7e79e18107 Merge branch 'round-bits' into develop Mashy 2019-11-13 16:11:21 +10:00
• 729e48cee4 fix multiple ko event from cast Mashy 2019-11-13 16:08:24 +10:00
• bb765b86e6 add back line height, remove vbox lineheight Mashy 2019-11-13 13:46:41 +10:00
• 6305a96875 fix vbox banging around when you buy stuff / reclaim Mashy 2019-11-13 13:35:15 +10:00
• 6318e663e6 chain timestamped log to file ntr 2019-11-13 13:12:39 +11:00
• 8a654bcee4 write log to file for tail ntr 2019-11-13 13:12:06 +11:00
• 3c8aace660 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-13 12:12:17 +11:00
• 784c5910a1 update mnml service file for syslog ntr 2019-11-13 12:11:35 +11:00
• 7f8679171c debuff combo order Mashy 2019-11-13 11:09:34 +10:00
• 9da45e1bee 30 bits per round Mashy 2019-11-13 11:02:14 +10:00
• f5978e90bd changelog Mashy 2019-11-13 10:58:57 +10:00
• ddc75e6ff9 client +x ntr 2019-11-13 11:40:05 +11:00
• 42dcf4e2d3 syslog chain instead of json ntr 2019-11-13 11:35:58 +11:00
• ef4d3e57dc big info text, bring back hover Mashy 2019-11-12 22:29:59 +10:00
• e31acf96c6 group colours together in table, fix the vertical spacing issue Mashy 2019-11-12 22:01:56 +10:00
• abdaa5fd56 fix debuff combo ordering ntr 2019-11-12 22:00:34 +11:00
• 50b427d012 return bg to rotate prompt ntr 2019-11-12 21:02:47 +11:00
• 0c0d422dae Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop ntr 2019-11-12 19:55:00 +11:00
• 1e73dd920e combo order ntr 2019-11-12 19:54:54 +11:00
• d3a4f3e615 combo styles ntr 2019-11-12 19:49:07 +11:00
• 58dfc407a8 only highlight first open slot Mashy 2019-11-12 18:40:13 +10:00