Commit Graph

1438 Commits

Author SHA1 Message Date
Aktanusa
71388411b5 Fixed Issues #153 and #158. Thanks to @Pantalaim0n and @CrackedP0t for the suggestion with the use of unsafeWindow but I rather use @cpeter256 version with window.eval instead. 2018-03-04 18:15:32 -05:00
Aktanusa
67eac9fde2 Merge branch 'sigv-https-load' into dev 2018-03-04 13:38:06 -05:00
redthefed
bd0cd9900d Fixed a few spelling errors and whitespace (#3)
* linting, spelling errors
2018-02-28 23:51:21 -06:00
Valters Jansons
4ad6cc9fe0 Update README to use HTTPS instead of HTTP
HTTPS is good to push for wherever possible,
even if the Cookie Clicker site itself does not support it now.

(cherry picked from commit 98924bc12e)
2018-02-25 16:26:11 +02:00
Valters Jansons
e59b69e3f2 Add TLS to HTTP links
Please use HTTPS wherever it is supported.
It is just good practise, you know.

This follows up commit 98924bc12e.
2018-02-25 12:31:36 +02:00
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
62bc84920a Merge branch 'master' into gh-pages 2017-09-12 17:22:24 -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
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