david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
578 Commits 9 Branches 44 Tags
80e3ac746a7f13c4e6e4fa717844e849f7d9e10e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel van Noord 80e3ac746a Fixed CM.Options.TooltipBuildUpgrade #523 2021-01-26 22:26:46 +01:00
Daniel van Noord 52cfd9ddc2 Renamed ToolWrink to TooltipWrink 2021-01-26 22:22:32 +01:00
Daniel van Noord ffa664c476 Added option foor plot tooltip 2021-01-26 22:21:17 +01:00
Daniel van Noord a9dfcaab75 Tooltip with curr/max reward for plants #183 2021-01-26 22:18:21 +01:00
Daniel van Noord 23f19b4d62 Created (empty) tooltip for garden plots 2021-01-26 14:57:59 +01:00
Daniel van Noord ab08bc60e7 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-26 13:56:49 +01:00
DanielNoord b48834e416 Merge pull request #522 from Aktanusa/master 
Master
 2021-01-26 13:56:26 +01:00
DanielNoord 2f12f9839a Merge pull request #520 from DanielNoord/hotfix 
Fix tooltips
 2021-01-26 13:55:43 +01:00
Daniel van Noord c62b514f0a Fix tooltips 2021-01-26 13:55:14 +01:00
Daniel van Noord 1372942705 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-26 13:37:55 +01:00
DanielNoord e64e41e523 Merge pull request #518 from Aktanusa/master 
Push hot fix to dev-branch
 2021-01-26 13:37:03 +01:00
DanielNoord fda6e65176 Merge pull request #516 from DanielNoord/fixes 
Fix building sorting #515
 2021-01-26 13:35:53 +01:00
Daniel van Noord 7795aa79a5 Fix building sorting #515 2021-01-26 13:31:01 +01:00
DanielNoord b6069e2358 Merge pull request #512 from Aktanusa/dev 
Merge pull request #511 from Aktanusa/master
 2021-01-25 23:43:36 +01:00
DanielNoord a7af602aa3 Merge pull request #511 from Aktanusa/master 
Merge dev and master
 2021-01-25 23:43:10 +01:00
DanielNoord f36dcf012a Merge pull request #509 from Aktanusa/dev 
Publish hotfixes
 2021-01-25 23:41:46 +01:00
DanielNoord 5a64ed45be Merge pull request #508 from DanielNoord/fixes 
A number of hot fixes for 2.031.3
 2021-01-25 23:40:41 +01:00
Daniel van Noord e5b24b393e Fixed decimal notation #500 2021-01-25 23:37:41 +01:00
Daniel van Noord 92c28b092b Timer bar now adjusts height correctly #499 2021-01-25 23:29:21 +01:00
Daniel van Noord d5c5a5f62e Show tooltip warnings when extra info is off #496 2021-01-25 23:24:25 +01:00
Daniel van Noord 867249e8cb Missing upgrades no longer shows debug #497 2021-01-25 23:00:30 +01:00
Daniel van Noord 28e28fd5a0 Single fattest wrinkler now excludes shiny #498 2021-01-25 22:55:57 +01:00
Daniel van Noord 5f93186e7d Fixed bug with display of missing upgrades 2021-01-25 22:46:08 +01:00
Daniel van Noord 0a57450815 Fix colour settings not displaying #504 2021-01-25 22:39:03 +01:00
Daniel van Noord c08cefd1a6 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-25 22:32:53 +01:00
DanielNoord 901bc7c61f Merge pull request #503 from Zohnannor/patch-1 
Update CM.Disp.FormatTime
 2021-01-25 20:29:05 +01:00
DanielNoord 519e67dce9 Create CONTRIBUTING.md 2021-01-25 18:07:55 +01:00
Daniel van Noord 55c6b5db8b Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-23 23:03:24 +01:00
DanielNoord 6df4abf945 Merge pull request #493 from Aktanusa/master 
Rebase dev to incorporate hot fix for #490
 2021-01-23 23:02:21 +01:00
DanielNoord 242c6ba754 Merge pull request #491 from Aktanusa/fix/hasGod 
Fixed hasGod #490
 2021-01-23 23:00:21 +01:00
Daniel van Noord 00f79cb073 Fixed hasGod #490 2021-01-23 22:59:46 +01:00
Daniel van Noord c64f42bcfa Start work on Garden Tooltip 2021-01-23 22:55:39 +01:00
Daniel van Noord 29ba1c66cf Moved most replace tooltip funcs to Main.js 2021-01-23 22:36:26 +01:00
DanielNoord 1875423a7b Merge pull request #489 from DanielNoord/enhance/warnings 
Some new functions related to warnings
 2021-01-23 22:11:21 +01:00
Daniel van Noord 62f8e1fe82 Base warnings on new income instead of curr #488 2021-01-23 22:10:06 +01:00
Daniel van Noord f257243b38 Optional warning for Conjure with Frenzy (#487) 2021-01-23 22:02:21 +01:00
Daniel van Noord d71c197ec9 Added Conjure Frenzy to stats 2021-01-23 21:53:36 +01:00
DanielNoord 0ccd16577f Merge pull request #436 from Aktanusa/dev (Version 2.031.3) 
Merge dev-branch for v2.031.3 into master-branch
 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
Daniel van Noord 0f865f3897 Button and stat for single fattest wrinkler (#177) 2020-12-19 18:26:38 +01:00
Daniel van Noord 389dae4daa Created function CM.Cache.InitCache 2020-12-19 17:45:33 +01:00
Daniel van Noord c6c54054ee Added section to Cache.js 2020-12-19 17:37:01 +01:00
DanielNoord 2246e31bb5 Merge pull request #458 from DanielNoord/fix/buildingcolors (#430) 
Fixed building colors not reverting (#430)
 2020-12-19 14:38:59 +01:00
Daniel van Noord 7cfdcc7662 Fixed building colors not reverting (#430) 2020-12-19 14:38:14 +01:00
DanielNoord 938e850e29 Merge pull request #457 from DanielNoord/cutoffscale (#373) 
Made notation cutoff configurable
 2020-12-19 10:50:06 +01:00
Daniel van Noord d3a4eb936a Made notation cutoff configurable 2020-12-19 10:49:17 +01:00
Daniel van Noord c4295a1ed0 Updated Readme 2020-12-19 09:35:27 +01:00
DanielNoord 30c4617bde Merge pull request #456 from DanielNoord/wrinklercps (#301, #254) 
Added cookie per click bonus to tooltip
 2020-12-18 23:25:39 +01:00
Daniel van Noord 37b378ad08 Fixed spelling 2020-12-18 23:23:07 +01:00
Daniel van Noord 90a79dbc0c Added cookie per click bonus to tooltip 2020-12-18 23:17:10 +01:00
DanielNoord 7164801156 Merge pull request #455 from DanielNoord/abrshortscale (#268) 
Added Abbreviated short scale (#268)
 2020-12-18 20:48:15 +01:00
Daniel van Noord c530bd1a4a Added Abbreviated short scale (#268) 2020-12-18 20:47:03 +01:00