david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136 Commits 9 Branches 44 Tags
d435e215e883a0a11eb63d5cccc3ea2ca9c150d0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aktanusa f0d492ea4a Split/combine "Lucky!" stat when needed (Issue #60) 2016-03-10 21:33:23 -05:00
Aktanusa dd25067271 Updated README, added option to change bulk buildings colors between the single buildings colors or calculated colors (Issue #59 and #63) 2016-03-10 19:48:42 -05:00
Aktanusa 6c1f08a6c0 Updated README to ROI information and credited @svschouw 2016-03-10 19:27:29 -05:00
Aktanusa 1dcc814fa4 Added back Alderi Tokori to credits with correct link. I confused him with Maxime Fabre 2016-03-06 22:41:37 -05:00
Aktanusa a09602fecd Changed calculation from Base Cost per Income to Return on Investment (Issue #3 (partly), #28, #52) with the formula from @svschouw and minor README edit 2016-03-06 22:21:35 -05:00
Aktanusa 306c7c24a4 Version change to 2.4 2016-03-05 18:41:31 -05:00
Aktanusa 58e4b7d328 Accounted for Golden Switch in Title and GC bars, Chocolate Egg stats now accounts for aura, fixed buy/sell function to reflect the real price, not the display price 2016-03-05 10:19:12 -05:00
Aktanusa be4587a905 Added tooltip information and building colors for bulk buying/selling and fixed a bug in Chocolate Egg calculation (it's still wrong, but will fix more in next commit) 2016-03-03 21:26:25 -05:00
Aktanusa ddd52c9583 Changed the look of CM toggle settings to be like CC, minor code cleanup, added a missing calculation 2016-03-02 16:01:35 -05:00
Aktanusa bb776eb477 GC calculations account for auras now, added more info on require cookies for Chains (Issue #37), and did some stats cleanup 2016-02-28 23:23:41 -05:00
Aktanusa c5ddda54c5 Added back prestige statistics (Issue #46) 2016-02-27 23:11:50 -05:00
Aktanusa cd09bd55fc Added colors for new golden cookie bars and minor cleanup 2016-02-27 19:12:31 -05:00
Aktanusa c12fcf7344 Updated README to change dev link and add credit 2016-02-20 11:42:52 -05:00
Aktanusa 8bddb28d1d Rename Favicon for Golden Cookies 2016-02-19 23:24:58 -05:00
Aktanusa 3ed7a64344 Added Favicon change on Golden/Wrath Cookies (Issue #44 and #55) 2016-02-19 23:22:56 -05:00
Aktanusa 44447d71c3 Formatting fixes 2016-02-19 21:26:56 -05:00
Aktanusa c03c1c44d7 Fixed minor bug in load config with checking colors preferences 2016-02-19 20:57:00 -05:00
Aktanusa 67ca329306 Added additional file for previous commit 2016-02-19 20:47:57 -05:00
Aktanusa ca43950c0c Added favicon for Golden and Wrath Cookies (thanks to @BlackenedGem for the files) for Issue #44 and #55 and fixed issue with the Options menu (thanks to a random person on the Wikia) 2016-02-19 20:47:27 -05:00
Aktanusa ab721fef7c Forgot one file for previous commit 2016-02-14 13:05:07 -05:00
Aktanusa e034ee1f44 Added Missing Golden Cookies stat (Issue #41) with code from Alhifar (Pull #53) 2016-02-14 13:04:30 -05:00
Aktanusa 9070a50355 Merge branch 'Alhifar-master' into dev 2016-02-14 12:28:55 -05:00
Aktanusa 440512ddc7 Version change to 2.3 2016-02-14 11:57:56 -05:00
Aktanusa 348c47e1dc Hopefully to fix the crashing (part 3) 2016-02-09 13:46:50 -05:00
Aktanusa 6e09c8dafb Hopefully to fix the crashing (part 2) 2016-02-09 13:45:42 -05:00
Aktanusa f1a79cbaa3 Hopefully to fix the crashing 2016-02-09 13:04:35 -05:00
Aktanusa 5640cbb9c8 Version change to 2.2 (forgot to do this first so previous commit is under this version) 2016-02-09 11:56:37 -05:00
Aktanusa 6917e3139a Fixed bug where Caut/Warn Tooltip calculation with bonus CPS didn't use the new Lucky reward way 2016-02-09 11:55:28 -05:00
Aktanusa f120f047dc Removed HC stats as it is useless now (pending cleaning) 2016-02-08 20:17:08 -05:00
Aktanusa 13a49e3e39 Updated README to reflect the same thing as the Wikia 2016-02-08 19:27:29 -05:00
Aktanusa 762a6919e7 Updated README to reflect the same thing as the Wikia 2016-02-08 19:25:32 -05:00
Aktanusa 77ba8c4e84 Version change and merge from beta branch (Issue #50) 2016-02-08 19:06:11 -05:00
Aktanusa 914a5e2ff3 Version change to 1.909.1 2016-02-08 09:52:58 -05:00
Aktanusa 6bced494f8 Version change to 1.907.1 and fixed it to work with 1.907 beta (mostly) 2016-02-06 12:34:17 -05:00
Aktanusa ee35136130 Version change to 1.906 2016-02-06 11:24:39 -05:00
Aktanusa 85ed508010 Fix Current Chain reward being calculated wrong, tooltips being buggy, and needing to click a little above santa/dragon icon 2016-02-05 23:37:15 -05:00
Aktanusa 0ea31f6e94 Fixed bug with Current Lucky reward was calculated wrong 2016-02-05 00:42:04 -05:00
Aktanusa 5ceffa9d63 Fix to work with 1.903 beta (mostly) 2016-02-04 23:49:51 -05:00
Aktanusa 07b67be07e Version change to 1.903.1 2016-02-04 18:24:54 -05:00
Aktanusa 5aa21209b9 Used a better fix on missing boxes on upgrades 2015-12-28 11:09:54 -05:00
Aktanusa 14c1afa30d Fixed rare but bad tooltip bug and fixed some toggle upgrades graphical glitches 2015-12-27 21:44:50 -05:00
Aktanusa f36869d528 Fixed tooltip bugs, Upgrades display bug, and timer bar bug 2015-12-27 17:07:40 -05:00
Aktanusa da3200612b Fixed bar display glitches related to ascend changes 2015-12-26 21:27:41 -05:00
Aktanusa d870823c07 Fix to work with 1.9 beta mostly 2015-12-26 16:38:36 -05:00
Aktanusa b134e3b45c Version change to 1.9.1 (part 2) 2015-12-21 20:53:00 -05:00
Aktanusa 07944e366a Version change to 1.9.1 2015-12-21 20:46:55 -05:00
Aktanusa dbcec54b3d Added same Issue #43 fix to other scales 2015-11-05 22:51:29 -05:00
Aktanusa f1ccbf8937 Fixed a bug with Game's Setting Scale not showing fractional numbers like the original (Issue #43) 2015-11-05 22:15:16 -05:00
Aktanusa 56903744d8 Added an indication in the title bar on the type of golden cookie spawned (Issue #39) and tiny cleanup of code 2015-05-27 22:03:33 -04:00
Aktanusa 2ff6ea0746 Finish version change to 1.0466.2 and updated README 2015-05-27 21:48:29 -04:00
Aktanusa a251c5a906 Version change to 1.0466.2 2014-12-08 19:03:12 -05:00
Aktanusa 35ddafdca7 Merge branch 'master' into beta 
Conflicts:
	CookieMonster.js
	src/Main.js
 2014-10-31 20:25:47 -04:00
Aktanusa 2063fa9db7 Version change to 1.0466.1 2014-10-31 20:21:09 -04:00
Aktanusa b9486e9895 Fixed a bug with large numbers and chain calculations (Thanks to an anonymous wikia user) 2014-10-19 22:52:08 -04:00
Aktanusa cd18b1a402 Added the option to calculate warn/caution with or without the bonus CPU from buying (Issue #30) 2014-10-12 22:20:34 -04:00
Aktanusa 4118343606 Version change 2014-10-12 21:49:22 -04:00
Aktanusa 0941e33c11 Merge branch 'master' into beta 
Conflicts:
	CookieMonster.js
	src/Main.js
 2014-09-29 22:48:53 -04:00
Aktanusa 971f08b125 Chocolate egg stat now includes popping wrinklers (Issue #27) 2014-09-29 22:21:50 -04:00
Aktanusa cd7376eaf6 Added sell and sell all amounts to the building tooltips 2014-09-29 21:29:23 -04:00
Aktanusa 89e8ec86db Added a pop all button for wrinklers (Issue #24) 2014-09-27 17:15:25 -04:00
Aktanusa 47b6d4d83f Add amortization to tooltip config (Issue #19) 2014-09-27 16:05:45 -04:00
Aktanusa e5ce8e5ebd Fixed minor bug with Chocolate Egg stat and fixed how undefined was checked (Thanks The_omniscent_pie) 2014-09-09 20:13:56 -04:00
Aktanusa fb83f6679a Added amortization stat to building tooltip (Issue #19) 2014-09-08 08:56:12 -04:00
Aktanusa 6957513960 Added Chocolate egg stat (Issue #22) 2014-09-06 18:09:38 -04:00
Aktanusa c54ecefe4b Hopefully fix jscolor not loading before CM.Init is called (Thanks The_omniscent_pie) 2014-09-06 16:18:06 -04:00
Aktanusa 450db504be Version change 2014-09-06 13:50:08 -04:00
Aktanusa da917ebc6b Merge branch 'master' into dev 2014-08-30 01:45:21 -04:00
Aktanusa d997ff7652 Forgot one line to load jscolor.js 2014-08-30 01:43:27 -04:00
Aktanusa c34bcbfc3a Merge branch 'master' into dev 
Conflicts:
	CookieMonster.js
	src/Disp.js
	src/Main.js
 2014-08-30 01:31:40 -04:00
Aktanusa 3ddd1b3d23 Version change/added the option to change colors (Issue #20) 2014-08-30 01:24:42 -04:00
Aktanusa af05f9907c Forgot to update compliled version (again) 2014-08-29 12:38:05 -04:00
Aktanusa 9a2d96d043 Made the color boxes on upgrades smaller 2014-08-29 12:36:45 -04:00
Aktanusa 28c5909e1f Fixed to work with beta 2014-08-26 21:39:17 -04:00
Aktanusa 1418c17ec9 Merge branch 'master' into dev 
Conflicts:
	CookieMonster.js
	src/Main.js
 2014-08-26 13:40:48 -04:00
Aktanusa a8d404aca7 Version change 2014-08-26 13:27:59 -04:00
Aktanusa 989ef30f4a Fixed upgrades still having color boxes even when it is off in preferences (Issue #21) and fixed graphical glitch with timer bars on a cookie chain 2014-08-26 13:27:10 -04:00
Aktanusa e877f05a06 Version change to the new version of Cookie Clicker in beta plus some preliminary fixes 2014-08-26 13:10:56 -04:00
Aktanusa e4bca75da1 More minor optimizations/typo fixes for the timer bar 2014-08-24 22:49:44 -04:00
Aktanusa 418b1a7d2e Very minor optimization on timer bar creation. 2014-08-24 22:18:09 -04:00
Aktanusa db41ada262 Added the option to move the timer bars to the top left of the screen. Also added a nice visual rounding to the right side of the bars. 2014-08-24 22:14:27 -04:00
Aktanusa 27833773c9 Forgot compile for last commit 2014-08-17 10:58:53 -04:00
Aktanusa 1742ce201c Version change and minor cleanup 2014-08-17 10:57:36 -04:00
Aktanusa 850f16ca4c Fixed minor flaw in README 2014-08-17 02:00:43 -04:00
Aktanusa 4d445c676c Added the option to change sounds played when a Golden Cookie/Season Special spawns (Fixed issue #17) 2014-08-17 01:55:45 -04:00
Aktanusa f9ac7aa549 Fixed userscript section on README 2014-08-16 16:48:29 -04:00
Aktanusa a7e2b2cf35 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into dev 2014-08-16 10:05:24 -04:00
Aktanusa 55fc259849 Changed default Golden Cookie sound (issue #17) 2014-08-16 10:04:59 -04:00
Aktanusa c9a1e60d50 Changed default Golden Cookie sound (issue #17 2014-08-16 10:03:15 -04:00