Commit Graph

118 Commits

Author SHA1 Message Date
Aktanusa
0941e33c11 Merge branch 'master' into beta
Conflicts:
	CookieMonster.js
	src/Main.js
2014-09-29 22:48:53 -04:00
Aktanusa
017096df73 Merge branch 'master' into gh-pages 2014-09-29 22:36:24 -04:00
Aktanusa
971f08b125 Chocolate egg stat now includes popping wrinklers (Issue #27) 1.0465.13 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
f3507c4046 Temp beta file 2014-08-30 01:49:05 -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 1.0465.12 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 1.0465.11 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 1.0465.10 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 1.0465.9 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
Aktanusa
188a622c97 A single word corrected by anonymous 2014-08-16 09:59:00 -04:00
Aktanusa
ccc01ab5dc Fixed issue #14 (tooltip is cut off at bottom) 2014-07-14 09:50:27 -04:00
Aktanusa
ee1545fca0 Added the option to turn off wrinkler tooltip (issue #13) 2014-07-11 21:30:41 -04:00
Aktanusa
267b40bfa1 Version change, minor optimizations in wrinker tooltip/reset bonus income tooltip, move wrinkler tooltip a little right to minor game 2014-07-11 21:17:49 -04:00
Aktanusa
f429888727 Added a tooltip for reset bonus income. Also added a tooltip per wrinkler that shows the amount it will give on pop (#9) 1.0465.8 2014-07-08 23:38:21 -04:00
Aktanusa
4ae550e4ab Updated README to match Wikia 2014-07-07 23:06:04 -04:00
Aktanusa
952ee91f7c Updated README to match Wikia 2014-07-07 22:59:45 -04:00
Aktanusa
a9fe2df233 Added increase reset bonus % in stats 2014-07-07 17:15:50 -04:00
Aktanusa
d453499014 Updated version/tiny refactoring of a global variable 2014-06-21 22:40:46 -04:00
Aktanusa
9395bebd46 Added buy 10 building tooltip/fixed minor bug with pref config loading 1.0465.7 2014-06-21 22:07:28 -04:00
Aktanusa
75c52362b9 Fixed silly mistake of swtiching + and - 2014-06-21 19:05:25 -04:00
Aktanusa
448922dbda Added 1 extra stat in chain/added expand/collape config to stats/reorganize menu code 2014-06-21 13:51:44 -04:00
Aktanusa
686238e6e5 Optimize how Chain Stats are calculated 2014-06-16 08:57:04 -04:00
Aktanusa
d9c21a43bf Fix minor bug with the chain stats 2014-06-14 17:17:12 -04:00
Aktanusa
93f87913b4 Change how chain and missing cookies/eggs stats work 1.0465.6 2014-06-09 21:22:37 -04:00
Aktanusa
ddf70d1aaa Fix bug with statistics for Lucky and Chain 2014-06-08 09:30:54 -04:00