655 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
thepaperpilot	6725fc850f	Added mastered effect to calendar days	2022-12-16 00:42:04 -06:00
thepaperpilot	bc13b05d85	Fixed mastery.saplings	2022-12-16 00:40:03 -06:00
unsoftcapped3	226962699a	fix negative trees bug	2022-12-15 19:52:40 -08:00
unsoftcapped3	19d58d575e	finish balancing toys layer	2022-12-16 03:32:47 +00:00
thepaperpilot	80a74c13a2	Merge branch 'main' into days-15-16	2022-12-15 21:09:12 -06:00
Chunkybanana	44f940d3a1	Fixed persistent refs (volar is magic)	2022-12-16 02:55:26 +00:00
Chunkybanana	23041e3a0d	cleanup and finger crossing	2022-12-16 02:50:57 +00:00
Chunkybanana	09a6817b3f	this compiles so it's fine	2022-12-16 02:40:25 +00:00
unsoftcapped3	7f0301b3e1	Implement milestone 1	2022-12-16 02:37:37 +00:00
Chunkybanana	47c4874746	maybe this works? just maybe...	2022-12-16 02:37:36 +00:00
unsoftcapped3	6b9ec5f3c5	milestone	2022-12-16 02:07:19 +00:00
circle-gon	096fea964a	attempt to add components display	2022-12-16 02:01:56 +00:00
unsoftcapped3	f690495518	add buyable costs	2022-12-16 01:51:10 +00:00
unsoftcapped3	b9ac4ee40e	rename teddy bears and trains	2022-12-16 01:14:51 +00:00
circle-gon	fc653e6e5a	some ui on factory	2022-12-16 01:11:48 +00:00
unsoftcapped3	c629b77946	fix toy sum	2022-12-16 01:10:07 +00:00
unsoftcapped3	6217b521b6	fix toy thing	2022-12-16 00:43:22 +00:00
unsoftcapped3	6bc0a53ce3	add toys to advent	2022-12-16 00:17:18 +00:00
unsoftcapped3	46eb86fd48	do toy stuff?	2022-12-16 00:13:44 +00:00
unsoftcapped3	2432d2242a	start day 17	2022-12-15 16:04:40 -08:00
circle-gon	8451736817	pull changes from main	2022-12-15 15:08:32 +00:00
circle-gon	4d5f409bb3	Merge branch 'day-20-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory	2022-12-15 15:07:47 +00:00
circle-gon	5116d62fb6	some stuff done	2022-12-15 15:07:08 +00:00
thepaperpilot	93ea38b589	Prevent workshop foundation from spending resources when at 1000%	2022-12-15 07:53:52 -06:00
Chunkybanana	bc0db8c017	kludge go brrr (incomplete)	2022-12-15 12:01:54 +00:00
Chunkybanana	2fe59f1433	Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main	2022-12-15 10:06:58 +00:00
ducdat0507	ad0064d65d	Minor polishing	2022-12-15 16:43:08 +07:00
Chunkybanana	7dcb1dfb80	Fix foundation 99% issue (magic)	2022-12-15 09:24:35 +00:00
thepaperpilot	56bd46d7b7	Merge branch 'day-14-letters'	2022-12-15 01:13:32 -06:00
thepaperpilot	9ea5decb71	Fix workshop	2022-12-15 01:12:52 -06:00
thepaperpilot	ccca7d72bf	Disable auto-saving while between days	2022-12-15 01:12:45 -06:00
thepaperpilot	00ba83db00	Modify two upgrades about management	2022-12-15 01:04:53 -06:00
thepaperpilot	f81c469373	Add hardcap to workshop	2022-12-15 00:53:40 -06:00
thepaperpilot	9147911675	Preload calendar image	2022-12-15 00:53:14 -06:00
thepaperpilot	36f78951b5	Implemented day 14	2022-12-15 00:52:01 -06:00
thepaperpilot	f3916c29b7	Add new save preset	2022-12-15 00:04:59 -06:00
thepaperpilot	0488416654	Fix description	2022-12-15 00:04:46 -06:00
thepaperpilot	14fc325ead	Fix recentlUpdated	2022-12-14 23:36:27 -06:00
thepaperpilot	f48ae55cec	Replace some text references to "buyables"	2022-12-14 23:15:46 -06:00
ducdat0507	f1f43398a7	Fix oil smelter's inverse cost	2022-12-15 11:57:33 +07:00
unsoftcapped3	63314c8f99	Recently updated for new upgrades/buyables from management layer	2022-12-15 04:41:25 +00:00
Chunkybanana	6b56cc05bc	Merge remote-tracking branch 'origin/main' into days-15-16	2022-12-15 04:29:57 +00:00
Chunkybanana	52994915c3	min width	2022-12-15 04:29:08 +00:00
unsoftcapped3	13238d4194	Merge pull request #2 from thepaperpilot/main ... merge day 13 into day 20	2022-12-14 20:28:34 -08:00
thepaperpilot	1a1e5d167c	Make joy and faith buy maxable	2022-12-14 22:20:20 -06:00
ducdat0507	9f05571a35	Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental	2022-12-15 11:16:59 +07:00
unsoftcapped3	3926cc7134	remove possible NaN	2022-12-15 04:17:37 +00:00
ducdat0507	2e7725a2c0	This should fix logs' NaN bug	2022-12-15 11:16:04 +07:00
unsoftcapped3	4d776f9f2c	make ivy 3 match its effect	2022-12-15 04:12:44 +00:00
ducdat0507	b2bcd97f34	Prettier progress bars	2022-12-15 10:58:57 +07:00