redthefed
|
78df5491a0
|
Merge branch 'master' of github.com:redthefed/CookieMonster
|
2018-02-17 21:22:39 -06:00 |
|
redthefed
|
de0d148dd0
|
changed combine.sh to reflect file order defined in combine.bat
|
2018-02-17 21:19:07 -06:00 |
|
redthefed
|
f9b4dd4ada
|
Merge pull request #2 from redthefed/custom
pull
|
2018-02-16 18:59:01 -06:00 |
|
redthefed
|
0f8b5b7da7
|
commit
|
2018-02-16 18:53:56 -06:00 |
|
redthefed
|
7295e0ea76
|
Merge pull request #1 from lgeorget/master
.
|
2018-02-12 05:49:56 -06:00 |
|
Laurent Georget
|
010e065dd7
|
Add the time left to the 'next multiple' information in buildings' tooltip
|
2017-09-15 14:48:37 +02:00 |
|
Laurent Georget
|
816c566442
|
Add the 'next multiple of 50' information to buildings' tooltip
|
2017-09-15 14:48:37 +02: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
2.0042.2
|
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 |
|
Tayray
|
f773a9595a
|
Fix Wrinklers Typo in Description
|
2017-08-25 13:14:45 +10: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)
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
|
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
|
b4157cdbc5
|
Fixed current date issue (Issue #124)
2.0034.2
|
2017-07-19 16:21:20 -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
|
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
|
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
|
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
|
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 |
|