david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249 Commits 9 Branches 44 Tags
276160bf7b2600886bd210beaa1abe0911219d43
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aktanusa 276160bf7b Merge branch 'fofoni-dev' into dev 2019-03-13 18:30:48 -04:00
Aktanusa cecbeca1fe Merge branch 'dev' of https://github.com/fofoni/CookieMonster into fofoni-dev and applied some minor changes 2019-03-13 18:29:38 -04:00
Aktanusa f359999f9b Applied pull request #233 patch to the source also 2019-03-13 18:06:09 -04:00
Aktanusa 398db2caf6 Merge branch 'crunk1-master' into dev 2019-03-13 18:04:16 -04:00
Aktanusa 4b90c8a3f0 Merge branch 'master' of https://github.com/crunk1/CookieMonster into crunk1-master 2019-03-13 18:03:52 -04:00
Aktanusa 9a8f1bdb86 Fixed https link in beta userscript in the README 2019-03-13 17:52:05 -04:00
Aktanusa 18e747c3b3 Merge branch 'florensie-patch-1' into dev 2019-03-13 17:50:23 -04:00
Aktanusa 1bb6ae7e9f Merge branch 'patch-1' of https://github.com/florensie/CookieMonster into florensie-patch-1 2019-03-13 17:49:43 -04:00
Aktanusa 1f366430cf Fixed for Version 2.018 of Cookie Clicker (Issue #239 and #241) 2019-03-13 17:44:18 -04:00
Aktanusa 77421c11c0 Change to Version 2.018.1 2019-03-12 20:38:30 -04:00
Aktanusa 9f2a7cda78 Added notification on garden tick (based on @doorajar code) (Issue #180) and minor code formatting cleanup 2018-12-14 17:50:27 -05:00
Aktanusa 963f950039 Separate the configuration for flash/sound for Golden Cookies and Season Special, rearrange the option menu a little bit, and some code cleanup/formatting 2018-12-12 10:50:58 -05:00
Aktanusa 0255afd75d Change to Version 2.016.2 2018-11-28 13:02:06 -05:00
Aktanusa 4a8c59a3e6 Fixed to work with Version 2.016 of Cookie Clicker (Issue #224 & #225) 2018-10-27 20:37:27 -04:00
Aktanusa cd3061f2c4 Change to Version 2.016.1 2018-10-26 11:33:57 -04:00
Aktanusa 937cb34920 Changed how editing sound URLs to be better (aka you don't need to change the URL and save within the 10 second refresh window anymore) 2018-10-26 11:31:04 -04:00
Aktanusa 2f862ac687 Fix bug with timer bar displacing wrinkler detection area (Issue #213) and use game detection instead of copying code plus a minor code formatting change 2018-08-17 15:50:31 -04:00
Aktanusa 6895719759 Version change to 2.012.2 and added option for turning off the timer in Grimoire magic meter 2018-08-09 17:01:43 -04:00
Aktanusa 1a1877e15c Fixed to work with Version 2.012 of Cookie Clicker 2018-08-08 11:37:35 -04:00
Aktanusa 3af0dd81e5 Change to Version 2.012.1 2018-08-08 11:01:22 -04:00
Aktanusa 909806b0f9 Fix to work with Version 2.0109 of CC (Issue #208) 2018-08-01 19:43:10 -04:00
Aktanusa a393c73eec Change to Version 2.0109.1 2018-08-01 11:34:27 -04:00
Aktanusa 1c8a9d6bb3 Split the tooltip options 2018-08-01 11:28:15 -04:00
Aktanusa 62dae65606 Fix calculation error due to timing being off by a little bit (happens more often on slower computers) (Issue #200) 2018-07-21 08:30:52 -04:00
Aktanusa 7310905ae2 Fixed Scientific Notation and Engineering Notation to be more correct 2018-07-19 21:27:34 -04:00
Aktanusa cd1ea8269b Fixed silly bug with Scientific Notation 2018-07-13 00:01:35 -04:00
Aktanusa 22ae4ebc4c Renamed previous Scientific Notation to Engineering Notation and added real Scientific Notation (Issue #110) 2018-07-12 23:05:18 -04:00
Aktanusa b5f6fef9ae Expand the number labels since now the game hits even higher numbers! (Issue #197) 2018-07-10 22:37:00 -04:00
Aktanusa 9becf9b9ac Added the options 10s, 15s, 30s to average CPS (Issue #198) 2018-07-10 21:04:17 -04:00
Aktanusa e4de9c124e Fix Prestige stats not taking account of extra buildings from Spontaneous Edifice (Issue #175) 2018-04-25 19:24:07 -04:00
Aktanusa 5ef7486646 Change to Version 2.0106.2 2018-04-25 18:47:52 -04:00
Aktanusa 902c866f18 Changed 'Pop All' button to pop only normal Wrinklers (Issue #140 & #171) 2018-04-24 20:39:58 -04:00
Aktanusa f6164a9b85 Fixed to work with Version 2.0106 of CC (Issue #179 and #181) 2018-04-24 18:58:18 -04:00
Aktanusa 07253531ef Change to Version 2.0106.1 2018-04-21 17:30:36 -04:00
Aktanusa 5689ffb36e Revert tableLayout since it cuts off information 2018-03-05 21:08:26 -05:00
Aktanusa 3ec7b67c24 Fix brainfart undo https 2018-03-05 16:11:41 -05:00
Aktanusa 23abe72564 Undo some of the merge changes that was unwanted 2018-03-05 16:09:58 -05:00
Aktanusa 5266d8e4dc Merge branch 'redthefed-dev' into dev 2018-03-05 15:59:23 -05:00
Aktanusa ebd0e929e2 Merge branch 'dev' of https://github.com/redthefed/CookieMonster into redthefed-dev 2018-03-05 15:58:38 -05:00
Aktanusa fcd4d9e0fc Format the line better and also fixed the source file that was fixed in Issue #166 2018-03-05 15:08:03 -05:00
Aktanusa 41cd7688ea Merge branch 'ThexXTURBOXx-patch-1' into dev 2018-03-05 14:52:35 -05:00
Aktanusa 2600ec040b Fix for Version 2.0045 of Cookie Clicker (Issue #161) 2018-03-04 19:16:15 -05:00
Aktanusa 3190d18d23 Forgot CookieMonster.js again... 2018-03-04 18:31:48 -05:00
Aktanusa 38b3c503fc Change to Version 2.0045.1 2018-03-04 18:28:44 -05:00
Aktanusa 71388411b5 Fixed Issues #153 and #158. Thanks to @Pantalaim0n and @CrackedP0t for the suggestion with the use of unsafeWindow but I rather use @cpeter256 version with window.eval instead. 2018-03-04 18:15:32 -05:00
Aktanusa 67eac9fde2 Merge branch 'sigv-https-load' into dev 2018-03-04 13:38:06 -05:00
Aktanusa f32b1d5685 Fix tooltip toggle description 2017-09-13 09:35:10 -04:00
Aktanusa 9df807a4ae Version change to 2.0042.3 2017-09-13 09:32:44 -04:00
Aktanusa bd2b59efde Added timer to Grimoire spells (Issue #136) with the help from @Hoten pull request (Issue #138) and fixed a very minor tooltip bug 2017-09-12 17:09:24 -04:00
Aktanusa 04549b5e21 Fix Wrinklers typo in description (forgot the source file also) (Issue #142) 2017-09-09 15:17:04 -04:00
Aktanusa e5039b588b Merge branch 'tayrayb-patch-1' into dev 2017-09-09 15:14:43 -04:00
Aktanusa 5a9dc8b9fe Merge branch 'patch-1' of https://github.com/tayrayb/CookieMonster into tayrayb-patch-1 2017-09-09 15:14:24 -04:00
Aktanusa 362e87610e Changed average CPS to ignore some outliers 2017-08-18 12:28:07 -04:00
Aktanusa b16510c6ed Optimize reset bonus calculation 2017-08-18 08:04:52 -04:00
Aktanusa 92ff50d3a3 Fix reset bonus stat to sometimes show the wrong number before 100% of potential is unlocked (hopefully) 2017-08-18 00:40:23 -04:00
Aktanusa 1633dfb283 Fixed tooltip placement in minigames 2017-08-17 17:55:47 -04:00
Aktanusa 80bb731f17 Changed default for average CPS/clicks to be 1m/1s since people kept getting confused 2017-08-17 17:28:34 -04:00
Aktanusa ba387bddc6 Fixed max prestige not always max with fixes to tooltip description also (Issue #131) 2017-08-17 17:24:04 -04:00
Aktanusa 197fceaddc Version change to 2.0042.2 2017-08-17 16:39:55 -04:00
Aktanusa cad42578a9 Fixed to work with Version 2.0042 (Mostly) (Issue #134) 2017-08-08 20:40:52 -04:00
Aktanusa 446f1e767c Version change to 2.0042.1 2017-08-08 16:22:06 -04:00
Aktanusa 6ac602a067 Fixed very minor bug in average CPS with Chocolate Egg and fixed negative average CPS (maybe?) 2017-08-03 23:31:54 -04:00
Aktanusa 37107ae621 Version change to 2.0034.4 2017-08-03 23:18:33 -04:00
Aktanusa 687cb9a4c9 Fix heavenly chips multiplier (Issue #129) 2017-07-27 21:13:35 -04:00
Aktanusa 2176b9b436 Change the default of calculate with Wrinkler to be off (Issue #91) 2017-07-27 21:02:02 -04:00
Aktanusa e061caa2e4 Version changed to 2.0034.3 and changed to a faster method of getting current time 2017-07-19 17:33:54 -04:00
Aktanusa b4157cdbc5 Fixed current date issue (Issue #124) 2017-07-19 16:21:20 -04:00
Aktanusa c0cd967cc7 Fixed to work with Version 2.0034 (mostly) (Issue #119, #120, and #121) 2017-07-19 14:45:54 -04:00
Aktanusa c32a364d82 Version change to 2.0034.1 2017-07-18 22:08:07 -04:00
Aktanusa d82f782f4b Merge branch 'bryant1410-master' 2017-04-16 21:06:27 -04:00
Aktanusa b4c0c8de2b Fixed Century Egg Stat was wrong (Issue #102 and #103) and Version change 2016-07-27 23:08:28 -04:00
Aktanusa 991c80d040 Fixed minor bug with version numbers 2016-07-25 20:58:12 -04:00
Aktanusa 6c0ab25894 Merge branch 'beta' into dev to update to Version 2.002.1 
Conflicts:
	CookieMonster.js
	src/Main.js
 2016-07-25 20:50:32 -04:00
Aktanusa 92575ccd64 Merge branch 'CrackedP0t-master' into dev 2016-07-25 20:40:37 -04:00
Aktanusa b4da2c69f1 Merge branch 'master' of https://github.com/CrackedP0t/CookieMonster into CrackedP0t-master 2016-07-25 20:38:53 -04:00
Aktanusa 5a42ae532e Fixed for Version 2.002 Beta (mostly) 2016-06-28 22:32:07 -04:00
Aktanusa e1c4826605 Copy @DeathOfBalance code (#95) to the correct source and did minor code cleanup (thanks @DeathOfBalance!) 2016-06-28 21:05:21 -04:00
Aktanusa 23232c536a Merge branch 'DeathOfBalance-beta' into beta 2016-06-28 20:58:06 -04:00
Aktanusa e5f310393f Merge branch 'beta' of https://github.com/DeathOfBalance/CookieMonster into DeathOfBalance-beta 2016-06-28 20:57:27 -04:00
Aktanusa 9fc5b3dbaf Version changed to 2.002.1 2016-06-28 20:50:57 -04:00
Aktanusa adef849df9 Fixed minor bug with "Cookies To Next Level" stat 2016-06-28 20:38:41 -04:00
Aktanusa 76cc63e510 Changed Done! for new timer format (Issue #85) 2016-05-02 22:58:44 -04:00
Aktanusa eea4656094 Minor bug forgot to fix for Issue #85 2016-05-02 22:25:23 -04:00
Aktanusa 5a9d378585 Added minor fixes to @JCBourgo's pull (Issue #85) 2016-05-02 22:18:10 -04:00
Aktanusa 4a20c76885 Merge branch 'JCBourgo-patch-1' into dev 2016-05-02 21:22:02 -04:00
Aktanusa 520f72fe77 Merge branch 'patch-1' of https://github.com/JCBourgo/CookieMonster into JCBourgo-patch-1 2016-05-02 21:14:22 -04:00
Aktanusa ba726ec435 Fixed minor bug (which may never happen anyway) 2016-04-28 17:59:01 -04:00
Aktanusa 4d2287a7ae Change to Version 2.6 2016-04-28 17:56:46 -04:00
Aktanusa 9555e73475 Fixed buff bars (Issue #77) 2016-04-28 17:43:07 -04:00
Aktanusa e62b7bfe04 Fixed GC CSS hover wasn't showing with GC timer 2016-04-28 10:00:14 -04:00
Aktanusa 91d2ea8df7 Hopefully fix the issue of GC timer not popping GC in Firefox (Issue #81) 2016-04-28 08:48:35 -04:00
Aktanusa 05278149c5 Changed to Version 2.001.1 and fixed for Version 2.001 Beta (mostly) (Issue #77) 2016-04-28 00:22:56 -04:00
Aktanusa 881f5233e9 Forgot to update combo file again 2016-04-25 22:18:41 -04:00
Aktanusa 2a67bc1b61 Copied Wikia changes 2016-04-25 22:13:35 -04:00
Aktanusa eb3c403fbd Fixed bug with Reset Bonus Income stat, added average CPS stat with options, added average Cookie Clicks stat with options (Issue #10), added the option to calculate with Wrinkers (Issue #34), added the option to calculate with average CPS, and minor cleanup 2016-04-25 22:08:31 -04:00
Aktanusa 5d0958b63a Rename Return On Investment to Payback Period to fit what the number represents better (Issue #68) 2016-03-27 17:57:50 -04:00
Aktanusa 57ab55a2c1 Added title option for pinned tabs to only highlight on Golden Cookie/Season Popup spawns (Issue #44 part 2) and minor bug fixes 2016-03-24 22:13:39 -04:00
Aktanusa 3adf65f766 Update to Version 2.5 2016-03-17 22:03:15 -04:00
Aktanusa 2ed563c995 Added Heavenly Chips stats, changed max prestige calcuation to include wrinklers and chocolate egg (Issue #62) 2016-03-17 20:14:51 -04:00
Aktanusa 00a9ea2cd4 Added Century Egg stat, fixed golden cookie stats to not include Golden Switch boost (Issue #64), changed pop all wrinkler button to only pop wrinklers that has sucked some cookies (Issue #66), and minor cleanup/bug fix 2016-03-13 10:51:10 -04:00