Commit graph

860 commits

Author SHA1 Message Date
53e8669061 Potential fix for some tab weirdness 2022-12-23 23:34:49 -06:00
0bcd920f4d Art! 2022-12-23 23:29:52 -06:00
e4f5032632 Balancing 2022-12-23 22:55:12 -06:00
f861787a27 Fixed trying to write to computed ref 2022-12-23 22:30:37 -06:00
a9daaa3ac3 Merge branch 'main' into day-21-reindeer 2022-12-23 22:28:43 -06:00
2da8c04619 Merge branch 'day-20-factory' 2022-12-23 22:27:04 -06:00
081ad4fd86 Potential fix for letters bug? 2022-12-23 22:27:00 -06:00
8a90cd45f7 Finished balancing 2022-12-23 22:24:13 -06:00
1d2c61409c Presents polish 2022-12-23 21:56:36 -06:00
2a2790e13e Begone side effects 2022-12-23 21:24:27 -06:00
87fa404662 Merge remote-tracking branch 'origin/main' into day-20-factory 2022-12-23 21:22:09 -06:00
14d29cd3ad Add presents symbol and lore 2022-12-23 21:20:00 -06:00
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
unsoftcapped3
1bc299e50c
fix foundation going above what it should be 2022-12-23 12:00:40 -08:00
unsoftcapped3
4b9b2f263a
add message about holding L 2022-12-23 10:20:54 -08: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
58939524a3 Fix factory buyables and upgrade grid being visible in day 18 2022-12-23 09:44:13 -06:00
eea9a6f0e8 Fix visibility not working on components 2022-12-23 09:42:45 -06:00
8367ef2099 Fixed factory error when changing saves 2022-12-23 09:42:26 -06:00
5637e1e248 Merge branch 'main' into day-21-reindeer 2022-12-23 08:59:40 -06:00
d43899e938 Fix build errors 2022-12-23 08:55:36 -06:00
dcabdac385 Fixed random error I started getting about main being undefined?? 2022-12-23 08:48:17 -06: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
circle-gon
c1f6741c75
fixes computed inputs/outputs not actually checking properly 2022-12-23 09:28:14 -05: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
69c3d5b427 Implemented upgrades 2022-12-23 00:43:39 -06:00
cce45916f2 Fixed reindeer hotkey order 2022-12-22 23:51:38 -06:00
d9c13ae6a0 Merge branch 'main' into day-21-reindeer 2022-12-22 23:46:49 -06: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
0ce3b6b131 Implemented focus mechanic 2022-12-22 23:37:27 -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