Commit Graph

637 Commits

Author SHA1 Message Date
DanielNoord
0ccd16577f Merge pull request #436 from Aktanusa/dev (Version 2.031.3)
Merge dev-branch for v2.031.3 into master-branch
2.031.3
2020-12-28 14:10:06 +01:00
DanielNoord
7c9d6f570d Merge branch 'master' into dev 2020-12-28 14:08:13 +01:00
DanielNoord
2648af3095 Merge pull request #483 from DanielNoord/version, Bump to version 2.031.3 (#397)
Bump to version 2.031.3
2020-12-28 14:01:53 +01:00
Daniel van Noord
cb284ed22d Bumped version to 2.031.3 2020-12-28 14:00:35 +01:00
Daniel van Noord
5f5a1abac0 Removed a TODO 2020-12-28 14:00:21 +01:00
DanielNoord
66429ff0d2 Merge pull request #482 from DanielNoord/popbutton
Option for extra wrinkler popping buttons (#126)
2020-12-28 13:26:09 +01:00
Daniel van Noord
c997ace2cf Option for extra wrinkler popping buttons (#126) 2020-12-28 13:25:26 +01:00
DanielNoord
9e0dac5413 Merge pull request #481 from DanielNoord/popbutton
Another hotfix for levelup tooltip
2020-12-28 13:02:49 +01:00
Daniel van Noord
4a3bb46f8b Another hotfix for levelup tooltip 2020-12-28 12:57:34 +01:00
DanielNoord
69fb8af639 Merge pull request #480 from DanielNoord/tooltip
Hotfix for dragon levelup Tooltip
2020-12-28 12:53:04 +01:00
Daniel van Noord
ad7d35e1ee Hotfix for dragon levelup Tooltip 2020-12-28 12:51:50 +01:00
DanielNoord
2bedae477d Merge pull request #479 from DanielNoord/tooltip (#65)
Added tooltip with costs for Dragon Levels (#65)
2020-12-28 12:41:39 +01:00
Daniel van Noord
91ebbf39b9 Added tooltip with costs for Dragon Levels (#65) 2020-12-28 12:41:01 +01:00
DanielNoord
a8b874f37d Merge pull request #478 from DanielNoord/save
Allow saving outside of autosave-interval (#469)
2020-12-28 10:55:22 +01:00
Daniel van Noord
b58c3ea292 Allow saving outside of autosave-interval (#469) 2020-12-28 10:53:58 +01:00
DanielNoord
cafa12204e Merge pull request #477 from DanielNoord/fix/timerbar (#88)
Added indicator when upgrades/buildings are purchasable with wrinklers
2020-12-27 14:13:05 +01:00
Daniel van Noord
b4e2236fb7 Fixed #88 2020-12-27 14:11:21 +01:00
DanielNoord
5d126b6be3 Merge pull request #476 from DanielNoord/fix/timerbar (#147, #304, #388)
Multiple commits related tot he TimerBar
2020-12-27 13:37:56 +01:00
Daniel van Noord
b6cd262ff2 Fixed (#388) and add percentage overlay to timers 2020-12-27 13:27:44 +01:00
Daniel van Noord
6edda5420f Fixed Timers for loans (#304) 2020-12-27 13:07:07 +01:00
Daniel van Noord
97014d273e Added timer overlays in TimerBar (#147) 2020-12-27 12:39:33 +01:00
DanielNoord
319a3102de Merge pull request #475 from DanielNoord/fix/avgcps (#401, #97)
Fixed calculation of average and current CPS
2020-12-26 17:56:08 +01:00
Daniel van Noord
b9a1a5444f Fixed calculation of average and current CPS 2020-12-26 17:53:12 +01:00
DanielNoord
3f405da833 Merge pull request #447 from Aktanusa/readmeupdate
Update README.md
2020-12-24 23:52:05 +01:00
Daniel van Noord
9a649f93d2 Removed action .yml files 2020-12-24 11:02:22 +01:00
DanielNoord
d89c8e3a0f Create Lint.yml 2020-12-24 10:58:01 +01:00
DanielNoord
6bb99ace11 Update main.yml 2020-12-24 10:54:32 +01:00
DanielNoord
68c30e7bdd Update main.yml 2020-12-24 10:51:56 +01:00
DanielNoord
3ca1018a51 Create main.yml 2020-12-24 10:42:15 +01:00
DanielNoord
aed9b75397 Merge pull request #472 from DanielNoord/fix/various (#470, #471)
Fix/various
2020-12-22 23:17:58 +01:00
Daniel van Noord
0c095e4d81 Add new options section (#470) 2020-12-22 23:16:50 +01:00
Daniel van Noord
2f430e82e1 Added CM to version number in BotBar (#471) 2020-12-22 23:13:12 +01:00
DanielNoord
56d23aae22 Merge pull request #466 from DanielNoord/removecookies (#445)
Started to remove left over cookies and made subsections in notifications options
2020-12-21 23:58:29 +01:00
Daniel van Noord
c1501b47d6 Add subsections for notifications settings (#445) 2020-12-21 23:56:50 +01:00
Daniel van Noord
63ddf7fa38 Added code to remove cookies from old save system 2020-12-21 23:28:00 +01:00
DanielNoord
798f61cafe Merge pull request #465 from DanielNoord/saveapi (#463)
Incorporated Modding API
2020-12-21 22:55:39 +01:00
Daniel van Noord
72aef84fcc Combined CookieMonster (#364) 2020-12-21 22:54:14 +01:00
Daniel van Noord
203dc8137e Incorporated Modding API 2020-12-21 22:53:23 +01:00
DanielNoord
e6118f14c2 Merge pull request #464 from DanielNoord/missingupgrades (#386)
Rewrote Missing Upgrades code
2020-12-21 11:25:35 +01:00
Daniel van Noord
1cffb822fb Rewrote Missing Upgrades code 2020-12-21 11:24:23 +01:00
DanielNoord
1a0f9ed1a2 Merge pull request #462 from DanielNoord/edificestats
Fixed lay-out of code
2020-12-20 13:14:26 +01:00
Daniel van Noord
ca0889790d Fixed lay-out of code 2020-12-20 13:13:02 +01:00
DanielNoord
5fc662980a Merge pull request #461 from DanielNoord/edificestats
Added Edifice to Spells stats section
2020-12-20 13:09:50 +01:00
Daniel van Noord
5d5256bfc9 Added Edifice to Spells stats section 2020-12-20 13:09:16 +01:00
DanielNoord
0f5f244fdc Merge pull request #460 from DanielNoord/edifice (#168)
Optional warning for spontaneous edifice
2020-12-20 12:28:39 +01:00
Daniel van Noord
1715306374 Removed tooltip box from Sell tooltip 2020-12-20 12:27:43 +01:00
Daniel van Noord
a05c9290de Created warning for ToolWarnEdifice 2020-12-20 12:15:50 +01:00
Daniel van Noord
51617c9777 Added ToolWarnEdifice option 2020-12-20 11:50:48 +01:00
DanielNoord
f7bf34d7af Merge pull request #459 from DanielNoord/wrinklers (#177, #245)
Added some functionality related to wrinklers
2020-12-19 18:34:48 +01:00
Daniel van Noord
07d73b10e3 Option to calc with single fattest wrinkler (#245) 2020-12-19 18:32:53 +01:00