Commit graph

305 commits

Author SHA1 Message Date
Chunkybanana
a8e52bba9e argh merge conflicts 2022-12-13 22:18:50 +00:00
Chunkybanana
5dbbac819c begin wrapping paper 2022-12-13 22:17:06 +00:00
unsoftcapped3
5541ce835b
add missing )s 2022-12-13 14:15:34 -08:00
unsoftcapped3
169b5f5bfb
hardcap tree buyables at 1 million levels 2022-12-13 14:12:48 -08:00
2292900acf Kill auto-pause 2022-12-13 16:07:09 -06:00
circle-gon
939488bf5b
makes it clear there is a school limit 2022-12-13 15:43:46 -05:00
unsoftcapped3
f33bf6d28f
Update management.tsx 2022-12-13 12:36:05 -08:00
Seth Posner
fc01f5571d Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-13 10:58:42 -08:00
Seth Posner
b0f076b44f Added passthrough style for MainDisplay 2022-12-13 10:58:32 -08:00
unsoftcapped3
6b3b851791
fix 200% milestone applying to the wrong thing 2022-12-13 10:53:51 -08:00
bc69ffecfb forgot images 2022-12-13 11:28:41 -06:00
4f0b764244 Make school 4 not purchasable before day 13 2022-12-13 11:22:34 -06:00
ab89c2de09 Update scene 2022-12-13 11:22:19 -06:00
cbeff79be4 Toned down wood cost scaling 2022-12-13 10:42:26 -06:00
9b4428d42f Fixed mangement progress bar after completing day 12 2022-12-13 10:11:08 -06:00
unsoftcapped3
8b0194ae02
add missing () 2022-12-13 07:52:32 -08:00
1b577bc497 Fixed workshop 200% 2022-12-13 09:27:38 -06:00
99cadd3f2f UpdateFix day 12 not completing 2022-12-13 09:19:12 -06:00
ducdat0507
efa33770f0 Custom scrollbars
Because I can
2022-12-13 22:05:03 +07:00
circle-gon
957de9c298
fixes type error 2022-12-13 08:26:17 -05:00
circle-gon
aec06a6b26
some minor fixes 2022-12-13 08:04:55 -05:00
ducdat0507
3bdf33a4b6 Settings update 2022-12-13 19:53:15 +07:00
ducdat0507
f193d0f4b3 Align modifiers 2022-12-13 17:58:09 +07:00
ducdat0507
52f86e00dc Fix box gain modifier view 2022-12-13 16:29:55 +07:00
ducdat0507
12c1b8694e There's only one focus bar 2022-12-13 14:58:20 +07:00
ducdat0507
2edc63888d Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-13 14:58:12 +07:00
ducdat0507
8be07310e9 Make focus time clearer 2022-12-13 14:55:27 +07:00
f01b7e139c balances and tweaks and fixes 2022-12-13 01:44:47 -06:00
78a2d8fe7d Add minimized displays for every layer's main resource 2022-12-13 00:07:37 -06:00
8f9297e162 Add minimizedDisplay 2022-12-13 00:07:37 -06:00
unsoftcapped3
40ff736e65
reduce xp scaling 2022-12-12 22:05:45 -08:00
e904e9da5c Fix build error 2022-12-12 23:44:52 -06:00
944329a271 Updated management progress display 2022-12-12 23:41:44 -06:00
327dac3129 Re-did joy's lv 1 milestone 2022-12-12 23:29:58 -06:00
7071206450 Revert "add some .value's"
This reverts commit 39dfe97599.
2022-12-12 23:13:27 -06:00
8162180017 Removing more information 2022-12-12 23:13:10 -06:00
6a00574a78 Fixed some management issues 2022-12-12 23:13:10 -06:00
unsoftcapped3
39dfe97599
add some .value's 2022-12-12 21:01:13 -08:00
10a03eab18 Fix classroom effect 2022-12-12 22:58:41 -06:00
02062856f6 Classic off-by-one error 2022-12-12 22:56:48 -06:00
7c8d31c3e8 Boxes 2022-12-12 22:49:36 -06:00
e3b3167003 Cleanup 2022-12-12 22:32:22 -06:00
49198eb746 Noel lv5 2022-12-12 22:28:01 -06:00
e181b2b533 Jack and Mary lv4-5 and Noel lv4 2022-12-12 22:28:01 -06:00
unsoftcapped3
55ecd21d55 balance up to all milestone 1s 2022-12-13 04:17:35 +00:00
unsoftcapped3
6eaf6b69de Did a bit of balancing 2022-12-13 03:16:32 +00:00
unsoftcapped3
cdb987059e
Merge branch 'main' into main 2022-12-12 18:34:09 -08:00
unsoftcapped3
3572898b75 uh things maybe idk 2022-12-13 02:31:50 +00:00
circle-gon
efbe9ab9c9 changes most things to be DecimalSource not number 2022-12-13 02:08:18 +00:00
circle-gon
8d6fd36e90 more clarifications 2022-12-13 02:01:07 +00:00