david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,440 Commits 9 Branches 44 Tags
ab73a78a01bc901b5fde6b01de53f4adf862fb22
Commit Graph
1440 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aktanusa 991c80d040 Fixed minor bug with version numbers 2.002.1 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
CrackedP0t 8802a834d5 Add shell script to make CookieMonster.js 2016-07-24 14:01:06 -06:00
Aktanusa 79de5d09c7 Update beta version 2016-06-28 22:33:18 -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
DeathOfBalance d435e215e8 Updated for 2.002 multiplicative egg behavior 2016-06-28 17:51:31 -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
Jean-Christophe Bourgault 37f4252509 Removed the line, back to the original 2016-05-02 20:45:33 -04:00
Jean-Christophe Bourgault ae29132175 Made a single second look nicer 
Changed the condition so it returns only ":01" when the time is at a second (or less) for the items with format = 1.
 2016-05-02 20:33:48 -04:00
Jean-Christophe Bourgault 5fb084bd12 Added condition for format and time lower than 1 2016-05-02 20:13:12 -04:00
Jean-Christophe Bourgault c3e85afb85 Added an "if" for the XX:XX:XX:XX:XX time format 
Maybe the "if" is constructed backwards... simply a matter of changing the 1 to 0 in the condition. Otherwise I think it's good.
 2016-05-01 22:45:55 -04:00
Jean-Christophe Bourgault 3ce5164abb Merge pull request #1 from JCBourgo/patch-2 
Merge patches for TimeFormat config
 2016-05-01 22:32:28 -04:00
Jean-Christophe Bourgault 6107be18a9 Added listing for TimeFormat 2016-05-01 22:30:24 -04:00
Jean-Christophe Bourgault ae11e1db73 Added config for "XX:XX:XX:XX:XX" 2016-05-01 22:27:39 -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 0d1265d533 Update beta version 2016-04-28 17:44:20 -04:00
Aktanusa 9555e73475 Fixed buff bars (Issue #77) 2016-04-28 17:43:07 -04:00
Aktanusa 797a0ce498 Update beta version 2016-04-28 10:01:09 -04:00
Aktanusa e62b7bfe04 Fixed GC CSS hover wasn't showing with GC timer 2016-04-28 10:00:14 -04:00
Aktanusa 494673a371 Update beta version 2016-04-28 08:50:08 -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 2299d0b89c Updated beta version 2016-04-28 00:25:39 -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 c5806799a4 Merge branch 'master' into gh-pages 2016-04-25 22:36:13 -04:00
Aktanusa 881f5233e9 Forgot to update combo file again 2.5 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 f44d03c4c7 Added get method to the queue helper JS 2016-03-27 22:59:43 -04:00
Aktanusa b7666cca6d Added helper JS queue.js 2016-03-27 19:49:33 -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 3568799c32 Merge branch 'master' into gh-pages 2016-03-17 21:48:03 -04:00
Aktanusa 2ed563c995 Added Heavenly Chips stats, changed max prestige calcuation to include wrinklers and chocolate egg (Issue #62) 2.4 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