Commit Graph
100 Commits
Author SHA1 Message Date
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
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
DanielNoord 7d7516bb21 Merge pull request #454 from DanielNoord/plantdrops (#206_
Added missing plant drops to stats page
2020-12-18 20:32:56 +01:00
Daniel van Noord 28fbb1e094 Added missing plant drops to stats page 2020-12-18 20:31:25 +01:00
DanielNoord ff30cc2818 Merge pull request #453 from DanielNoord/splitwarning (#243)
Split the options for Lucky/LuckyFrenzy warning
2020-12-18 20:20:29 +01:00
Daniel van Noord 9542093f1b Split the options for Lucky/LuckyFrenzy warning 2020-12-18 20:19:37 +01:00
DanielNoord 208c99baf5 Merge pull request #452 from DanielNoord/fix/beautify (#450)
Fixed small numbers for Beautify
2020-12-18 20:09:21 +01:00
Daniel van Noord 5e4471d929 Fixed small numbers for Beautify 2020-12-18 20:08:03 +01:00
DanielNoord 2a5fb05a2f Merge pull request #451 from DanielNoord/savesettings (#444)
Save settings of headers and rewrite of Config.js
2020-12-18 18:11:56 +01:00
Daniel van Noord 8aa8a7c878 Fully annotated Config.js 2020-12-18 18:10:39 +01:00
Daniel van Noord 0ae29ce2e8 Missed some CM.Config's 2020-12-18 17:29:54 +01:00
Daniel van Noord 367702dc00 Changed CM.Config into CM.Options 2020-12-18 17:26:59 +01:00
Daniel van Noord 73ca07a0e9 Partial rewrite of Config.js 2020-12-18 17:17:54 +01:00
DanielNoord bd59f7b4a9 Merge pull request #449 from DanielNoord/choceggtooltip (#272)
Choc egg tooltip shows cookies to be gained
2020-12-18 16:50:03 +01:00
Daniel van Noord f6f2f99966 Choc egg tooltip shows cookies to be gained 2020-12-18 16:49:14 +01:00
DanielNoord 04714f22ac Merge pull request #448 from DanielNoord/wrinklerinfo (#196)
Stats displays reward pop all normal wrinkler
2020-12-18 16:13:48 +01:00
Daniel van Noord b65f31bee1 Stats displays reward pop all normal wrinkler 2020-12-18 16:12:33 +01:00
DanielNoord 7a094a8990 Merge pull request #446 from Aktanusa/issue-templates
Update issue templates
2020-12-18 15:46:41 +01:00
DanielNoord a8002f29e3 Update issue templates 2020-12-18 15:38:16 +01:00
DanielNoord 05e84d42d3 Merge pull request #443 from DanielNoord/fix/defaultconfig
Changed structure of Data.js
2020-12-17 18:19:58 +01:00
Daniel van Noord 556e71434d Changed structure of Data.js 2020-12-17 18:18:58 +01:00
DanielNoord 101c309cec Merge pull request #442 from DanielNoord/seperator (#392)
Separator is now changeable
2020-12-17 18:09:22 +01:00
Daniel van Noord 8037615659 Added functionality for ScaleSeparator 2020-12-17 18:07:34 +01:00
Daniel van Noord fcadf1cc18 Added Config.ScaleSeparator 2020-12-17 17:41:25 +01:00
DanielNoord 671ff61830 Merge pull request #441 from DanielNoord/decimals (#264)
Make amount of decimals an option
2020-12-16 14:12:07 +01:00
Daniel van Noord 2fbbd39118 Added CM.Config.ScaleDecimals to CM.Disp.Beautify 2020-12-16 14:10:11 +01:00
Daniel van Noord cff7377789 Created ScaleDecimals as option 2020-12-16 13:31:49 +01:00
DanielNoord 583501e01b Merge pull request #440 from DanielNoord/volumeoption (#26)
Changed Volume-options into sliders
2020-12-15 15:20:29 +01:00
Daniel van Noord 10482dfd2d Fixed lay-out issue 2020-12-15 15:19:50 +01:00
Daniel van Noord 08b30e9c62 Changed Volume-options into sliders 2020-12-15 15:17:49 +01:00
DanielNoord 6098a398f0 Merge pull request #439 from DanielNoord/fix/gamesound (#437)
Incorporated the general game volume in calculation of notifications volumes
2020-12-13 22:14:36 +01:00
Daniel van Noord b80d2b63e8 Fixed bug with Sound of notifications 2020-12-13 22:12:53 +01:00
Daniel van Noord a867d3d896 Incorporated Game volume settings 2020-12-13 22:10:06 +01:00
DanielNoord f398aa9564 Merge pull request #438 from Aktanusa/dragoninfo (#185)
Added extra info to dragon aura selector display
2020-12-13 21:55:56 +01:00
Daniel van Noord 6a6a27680f Annotated CM.Sim.CalculateChangeAura 2020-12-13 21:54:29 +01:00
Daniel van Noord 15b859e8b9 Changed display of DragonAuraInfo in options 2020-12-13 21:50:39 +01:00
Daniel van Noord f13c9fb02d Added Aura caching and changing 2020-12-13 21:50:04 +01:00
Daniel van Noord f72e95301c Fixed some annotations in Sim.js 2020-12-10 22:31:26 +01:00
Daniel van Noord 8ffc0a2664 Added CM.Disp.AddAuraInfo() 2020-12-10 22:30:07 +01:00
Daniel van Noord f9c4f68bb8 Add config and replace-function for AuraInfo 2020-12-10 22:13:26 +01:00
DanielNoord 6bf81085ca Merge pull request #435 from DanielNoord/dispstats
Final work on initial rewrite of Disp.js
2020-12-07 21:26:40 +01:00
Daniel van Noord ea4776ae4b Final rework of Disp.js 2020-12-07 21:25:02 +01:00
DanielNoord efd4e9319d Merge pull request #433 from Chorizorro/fix/gains
Fix Dragon's Fortune mult in CalculateGains sim
2020-12-07 10:18:04 +01:00
Daniel van Noord 8805eacb0e Created CM.Disp.CreateStatsLuckySection 2020-12-06 20:51:04 +01:00
DanielNoord 62d05ea074 Merge pull request #428 from DanielNoord/fix/sellpricedev
Fix #416 on dev-branch
2020-12-06 19:38:49 +01:00
Daniel van Noord b462ed2ced Fix #416 on dev-branch 2020-12-06 19:37:34 +01:00
DanielNoord 7c08431271 Merge pull request #423 from Chorizorro/fix/disp
Fix favicon not being reset with no GC left
2020-12-06 12:43:00 +01:00
Daniel van Noord e066c8c43b Merge branch 'fix/cleanupdisp' of https://github.com/DanielNoord/CookieMonster into fix/cleanupdisp 2020-12-05 23:17:28 +01:00
Daniel van Noord bbc2fdf29f Fix for challenge mode 2020-12-05 23:17:15 +01:00
Daniel van Noord b6370c1873 First version of stats page 2020-12-05 23:17:15 +01:00
DanielNoord bf8e1922cb Merge pull request #420 from Chorizorro/fix/disp
Move CM.Disp.Draw out of bottom bar section
2020-12-05 23:15:38 +01:00
Daniel van Noord 7e101edf82 Fix for challenge mode 2020-12-05 23:13:53 +01:00
Daniel van Noord 36e64d3d90 First version of stats page 2020-12-05 23:13:28 +01:00
DanielNoord 15e4291489 Merge pull request #417 from Chorizorro/fix/disp
Enhance autosave timer refresh
2020-12-05 17:00:49 +01:00
DanielNoord d0ad7c418d Merge pull request #418 from DanielNoord/fix/cleanupdisp
Further revision of Disp.js
2020-12-05 16:24:14 +01:00
Daniel van Noord 77447cfca3 Further revision of Disp.js 2020-12-05 15:44:33 +01:00
DanielNoord 28b144ee70 Merge pull request #415 from DanielNoord/fix/cleanupdisp
Fixes to some of the new CM.Disp code
2020-12-05 14:28:42 +01:00
Daniel van Noord b6cdc77064 Fixed Warning tooltips 2020-12-05 14:27:48 +01:00
Daniel van Noord e0915bc307 Fix CM.Disp.Beautify failing when num=0 2020-12-05 14:10:42 +01:00
DanielNoord 7e935aab1a Merge pull request #399 from DanielNoord/fix/cleanupdisp
Preliminary overhaul of CM.Disp and related code
2020-12-05 10:34:42 +01:00
Daniel van Noord 9dc95d760a Almost done with updating Disp.js 2020-12-04 23:41:23 +01:00
Daniel van Noord 4baae5c9f7 Updated timer bar code 2020-12-04 22:38:14 +01:00
Daniel van Noord 02b31c8932 Fixed CM.Disp.Beautify 2020-12-04 21:14:17 +01:00
Daniel van Noord 343327a1b5 Fix CalculateGains 2020-12-04 21:06:23 +01:00
Daniel van Noord a3f2fe5dab Reworked Tooltip code v1 2020-12-04 20:23:58 +01:00