Commit graph

830 commits

Author SHA1 Message Date
circle-gon
24c00d7e42
Merge pull request #12 from someoneWasTaken94/day-20-factory
Day 20 Factory
2022-12-23 21:41:54 -05:00
someoneWasTaken94
7fe120ddaf attempt at catalysts 2022-12-24 02:38:49 +00:00
someoneWasTaken94
20271f880a Merge branch 'day-20-factory' of https://github.com/someoneWasTaken94/Advent-Incremental-1 into day-20-factory 2022-12-24 02:13:00 +00:00
someoneWasTaken94
b9f304b656 some new content 2022-12-24 02:12:28 +00:00
someoneWasTaken94
91ce82b728
Merge branch 'thepaperpilot:day-20-factory' into day-20-factory 2022-12-23 21:12:15 -05:00
Chunkybanana
0ad95c08ba
Box maker 2022-12-24 11:01:57 +13:00
someoneWasTaken94
529eabbcd0 stuff 2022-12-23 16:36:13 +00:00
someoneWasTaken94
5cf9f4571f Merge branch 'day-20-factory' of https://github.com/someoneWasTaken94/Advent-Incremental-1 into day-20-factory 2022-12-23 16:35:21 +00:00
ducdat0507
428ca75b12 Fix bow maker's hotkey 2022-12-23 21:35:00 +07:00
ducdat0507
8941789899 Fix bow maker's name 2022-12-23 21:34:01 +07:00
ducdat0507
3313609acf Presents buildings 2022-12-23 21:32:30 +07:00
ducdat0507
ec71587eab NaNi? 2022-12-23 20:40:31 +07:00
ducdat0507
d1a02cd394 Automatically generate factory component desciptions 2022-12-23 18:52:03 +07:00
ducdat0507
f005b3a39f Merge branch 'day-20-factory' 2022-12-23 16:44:37 +07:00
ducdat0507
72d13db963 2022-12-23 16:29:17 +07:00
Chunkybanana
08434d44be Added a little padding to the component list 2022-12-23 08:41:52 +00:00
Chunkybanana
d2d397e4fc Fixed persistent ref issues 2022-12-23 08:32:10 +00:00
64394c7f7c Fix sprites being offset on even amounts of factory size 2022-12-22 23:41:35 -06:00
83bf790945 Ribbons can't cost white dye 2022-12-22 23:38:31 -06:00
unsoftcapped3
135b7b151b
no day 20 yet 2022-12-22 21:31:20 -08:00
9e42512908 Merge branch 'main' into day-20-factory 2022-12-22 22:57:55 -06:00
c4abf0cd5a Fix typing cycle 2022-12-22 22:54:02 -06:00
unsoftcapped3
5cae3ea040
Merge pull request #11 from thepaperpilot/day-19-factory
Day 19 factory
2022-12-22 20:44:46 -08:00
unsoftcapped3
957658d72a finish balancing 2022-12-23 04:44:22 +00:00
unsoftcapped3
b102e720d5 balance 2022-12-23 04:42:26 +00:00
4fb2e4dc22 Fixed typo for hotkeys 2022-12-22 22:40:47 -06:00
64022416b6 Fixed offsets on even factory sizes 2022-12-22 22:34:28 -06:00
unsoftcapped3
17aa5b1c59 fix bucket 2022-12-23 04:32:32 +00:00
unsoftcapped3
32709cfd78 remove the .value 2022-12-23 04:17:59 +00:00
unsoftcapped3
b8f61a1e7a reduce scaling more 2022-12-23 04:06:57 +00:00
unsoftcapped3
96a211aa64 reduce scalings by a lot 2022-12-23 03:47:26 +00:00
unsoftcapped3
3b386f5909 implement row 3 upg effects 2022-12-23 03:32:05 +00:00
unsoftcapped3
59d5c46b74 upg row 2 effects 2022-12-23 03:22:38 +00:00
unsoftcapped3
e462a2ae61 first row upg effects 2022-12-23 03:19:44 +00:00
71fbb319bc Merge branch 'day-19-factory' into day-20-factory 2022-12-22 21:15:43 -06:00
Chunkybanana
6be44c3a0a
Add some present images 2022-12-23 13:13:13 +10:00
unsoftcapped3
97ece7bb07 Merge branch 'day-19-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-19-factory 2022-12-23 03:10:00 +00:00
unsoftcapped3
b958da2b69 4 new upgrades 2022-12-23 03:09:58 +00:00
9df82505fe Implemented emanresu's images 2022-12-22 21:09:03 -06:00
unsoftcapped3
c9667ee249 upgrade #8 also changed scalings 2022-12-23 03:05:06 +00:00
6357d66ba2 Fix subtabs not scrolling 2022-12-22 21:03:42 -06:00
1a4cda25d9 Fix subtabs not scrolling 2022-12-22 21:03:22 -06:00
unsoftcapped3
91e3c2703d hide upgrade grid until day 19 2022-12-23 02:58:14 +00:00
Chunkybanana
e5946739e5
Day 19 stuff 2022-12-23 12:38:30 +10:00
unsoftcapped3
2d2e521034 Merge branch 'day-19-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-19-factory 2022-12-23 02:05:00 +00:00
unsoftcapped3
1d42d8ea5f fix grid 2022-12-23 02:04:58 +00:00
unsoftcapped3
6ab03b64b1
Merge pull request #10 from thepaperpilot/day-19-factory
trying to merge the other way
2022-12-22 18:03:55 -08:00
unsoftcapped3
ed22c51d24
Merge branch 'main' into day-19-factory 2022-12-22 18:03:46 -08:00
circle-gon
255ecea3e1
adds efficency display 2022-12-22 20:33:33 -05:00
someoneWasTaken94
bf94a5b1a7 Merge branch 'day-20-factory' of https://github.com/someoneWasTaken94/Advent-Incremental-1 into day-20-factory 2022-12-23 01:08:56 +00:00