david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,062 Commits 9 Branches 44 Tags
1d12977984771137b1475c2525f1be428417d01c
Commit Graph

1062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aktanusa
197fceaddc Version change to 2.0042.2 2017-08-17 16:39:55 -04:00
Aktanusa
7b67ea19d8 Updated beta to Version 2.0041.1 2017-08-11 09:36:54 -04:00
Aktanusa
aa93b6a6d2 Merge branch 'master' into gh-pages 2017-08-08 20:42:37 -04:00
Aktanusa
cad42578a9 Fixed to work with Version 2.0042 (Mostly) (Issue #134) 2.0042.1 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
6fc807e3ce Merge branch 'master' into gh-pages 2017-07-27 21:17:27 -04:00
Aktanusa
687cb9a4c9 Fix heavenly chips multiplier (Issue #129) 2.0034.3 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
605927359d Merge branch 'master' into gh-pages 2017-07-19 16:22:31 -04:00
Aktanusa
b4157cdbc5 Fixed current date issue (Issue #124) 2.0034.2 2017-07-19 16:21:20 -04:00
Aktanusa
9f870572f4 Merge branch 'master' into gh-pages 2017-07-19 14:52:41 -04:00
Aktanusa
c0cd967cc7 Fixed to work with Version 2.0034 (mostly) (Issue #119, #120, and #121) 2.0034.1 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
aec0583a89 Merge branch 'master' into gh-pages 2017-04-17 11:30:55 -04:00
Aktanusa
d82f782f4b Merge branch 'bryant1410-master' 2017-04-16 21:06:27 -04:00
Santiago Castro
22a00ceef0 Fix broken Markdown headings 2017-04-16 20:50:48 -03:00
Aktanusa
db95fe5147 Merge branch 'master' into gh-pages 2016-07-27 23:17:24 -04:00
Aktanusa
b4c0c8de2b Fixed Century Egg Stat was wrong (Issue #102 and #103) and Version change 2.002.2 2016-07-27 23:08:28 -04:00
Aktanusa
a21df99b0b Merge branch 'master' into gh-pages 2016-07-25 21:10:31 -04:00
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