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 |
|
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
|
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 |
|
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)
|
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)
|
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)
|
2017-07-19 16:21:20 -04:00 |
|
Aktanusa
|
c0cd967cc7
|
Fixed to work with Version 2.0034 (mostly) (Issue #119, #120, and #121)
|
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 |
|
Aktanusa
|
b4c0c8de2b
|
Fixed Century Egg Stat was wrong (Issue #102 and #103) and Version change
|
2016-07-27 23:08:28 -04:00 |
|
Aktanusa
|
991c80d040
|
Fixed minor bug with version numbers
|
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 |
|
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 |
|
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 |
|
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
|
9555e73475
|
Fixed buff bars (Issue #77)
|
2016-04-28 17:43:07 -04:00 |
|
Aktanusa
|
e62b7bfe04
|
Fixed GC CSS hover wasn't showing with GC timer
|
2016-04-28 10:00:14 -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
|
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
|
881f5233e9
|
Forgot to update combo file again
|
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
|
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
|
2ed563c995
|
Added Heavenly Chips stats, changed max prestige calcuation to include wrinklers and chocolate egg (Issue #62)
|
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 |
|
Aktanusa
|
1dcc814fa4
|
Added back Alderi Tokori to credits with correct link. I confused him with Maxime Fabre
|
2016-03-06 22:41:37 -05:00 |
|
Aktanusa
|
a09602fecd
|
Changed calculation from Base Cost per Income to Return on Investment (Issue #3 (partly), #28, #52) with the formula from @svschouw and minor README edit
|
2016-03-06 22:21:35 -05:00 |
|
Aktanusa
|
306c7c24a4
|
Version change to 2.4
|
2016-03-05 18:41:31 -05:00 |
|
Aktanusa
|
58e4b7d328
|
Accounted for Golden Switch in Title and GC bars, Chocolate Egg stats now accounts for aura, fixed buy/sell function to reflect the real price, not the display price
|
2016-03-05 10:19:12 -05:00 |
|
Aktanusa
|
be4587a905
|
Added tooltip information and building colors for bulk buying/selling and fixed a bug in Chocolate Egg calculation (it's still wrong, but will fix more in next commit)
|
2016-03-03 21:26:25 -05:00 |
|
Aktanusa
|
ddd52c9583
|
Changed the look of CM toggle settings to be like CC, minor code cleanup, added a missing calculation
|
2016-03-02 16:01:35 -05:00 |
|
Aktanusa
|
bb776eb477
|
GC calculations account for auras now, added more info on require cookies for Chains (Issue #37), and did some stats cleanup
|
2016-02-28 23:23:41 -05:00 |
|
Aktanusa
|
c5ddda54c5
|
Added back prestige statistics (Issue #46)
|
2016-02-27 23:11:50 -05:00 |
|
Aktanusa
|
cd09bd55fc
|
Added colors for new golden cookie bars and minor cleanup
|
2016-02-27 19:12:31 -05:00 |
|
Aktanusa
|
c12fcf7344
|
Updated README to change dev link and add credit
|
2016-02-20 11:42:52 -05:00 |
|
Aktanusa
|
8bddb28d1d
|
Rename Favicon for Golden Cookies
|
2016-02-19 23:24:58 -05:00 |
|
Aktanusa
|
3ed7a64344
|
Added Favicon change on Golden/Wrath Cookies (Issue #44 and #55)
|
2016-02-19 23:22:56 -05:00 |
|
Aktanusa
|
44447d71c3
|
Formatting fixes
|
2016-02-19 21:26:56 -05:00 |
|
Aktanusa
|
c03c1c44d7
|
Fixed minor bug in load config with checking colors preferences
|
2016-02-19 20:57:00 -05:00 |
|
Aktanusa
|
67ca329306
|
Added additional file for previous commit
|
2016-02-19 20:47:57 -05:00 |
|
Aktanusa
|
ca43950c0c
|
Added favicon for Golden and Wrath Cookies (thanks to @BlackenedGem for the files) for Issue #44 and #55 and fixed issue with the Options menu (thanks to a random person on the Wikia)
|
2016-02-19 20:47:27 -05:00 |
|
Aktanusa
|
ab721fef7c
|
Forgot one file for previous commit
|
2016-02-14 13:05:07 -05:00 |
|
Aktanusa
|
e034ee1f44
|
Added Missing Golden Cookies stat (Issue #41) with code from Alhifar (Pull #53)
|
2016-02-14 13:04:30 -05:00 |
|
Aktanusa
|
9070a50355
|
Merge branch 'Alhifar-master' into dev
|
2016-02-14 12:28:55 -05:00 |
|
Aktanusa
|
440512ddc7
|
Version change to 2.3
|
2016-02-14 11:57:56 -05:00 |
|
Aktanusa
|
348c47e1dc
|
Hopefully to fix the crashing (part 3)
|
2016-02-09 13:46:50 -05:00 |
|
Aktanusa
|
6e09c8dafb
|
Hopefully to fix the crashing (part 2)
|
2016-02-09 13:45:42 -05:00 |
|
Aktanusa
|
f1a79cbaa3
|
Hopefully to fix the crashing
|
2016-02-09 13:04:35 -05:00 |
|
Aktanusa
|
5640cbb9c8
|
Version change to 2.2 (forgot to do this first so previous commit is under this version)
|
2016-02-09 11:56:37 -05:00 |
|
Aktanusa
|
6917e3139a
|
Fixed bug where Caut/Warn Tooltip calculation with bonus CPS didn't use the new Lucky reward way
|
2016-02-09 11:55:28 -05:00 |
|
Aktanusa
|
f120f047dc
|
Removed HC stats as it is useless now (pending cleaning)
|
2016-02-08 20:17:08 -05:00 |
|
Aktanusa
|
13a49e3e39
|
Updated README to reflect the same thing as the Wikia
|
2016-02-08 19:27:29 -05:00 |
|
Aktanusa
|
762a6919e7
|
Updated README to reflect the same thing as the Wikia
|
2016-02-08 19:25:32 -05:00 |
|
Aktanusa
|
77ba8c4e84
|
Version change and merge from beta branch (Issue #50)
|
2016-02-08 19:06:11 -05:00 |
|
Aktanusa
|
914a5e2ff3
|
Version change to 1.909.1
|
2016-02-08 09:52:58 -05:00 |
|
Aktanusa
|
6bced494f8
|
Version change to 1.907.1 and fixed it to work with 1.907 beta (mostly)
|
2016-02-06 12:34:17 -05:00 |
|
Aktanusa
|
ee35136130
|
Version change to 1.906
|
2016-02-06 11:24:39 -05:00 |
|
Aktanusa
|
85ed508010
|
Fix Current Chain reward being calculated wrong, tooltips being buggy, and needing to click a little above santa/dragon icon
|
2016-02-05 23:37:15 -05:00 |
|
Aktanusa
|
0ea31f6e94
|
Fixed bug with Current Lucky reward was calculated wrong
|
2016-02-05 00:42:04 -05:00 |
|
Aktanusa
|
5ceffa9d63
|
Fix to work with 1.903 beta (mostly)
|
2016-02-04 23:49:51 -05:00 |
|
Aktanusa
|
07b67be07e
|
Version change to 1.903.1
|
2016-02-04 18:24:54 -05:00 |
|
Aktanusa
|
5aa21209b9
|
Used a better fix on missing boxes on upgrades
|
2015-12-28 11:09:54 -05:00 |
|
Aktanusa
|
14c1afa30d
|
Fixed rare but bad tooltip bug and fixed some toggle upgrades graphical glitches
|
2015-12-27 21:44:50 -05:00 |
|
Aktanusa
|
f36869d528
|
Fixed tooltip bugs, Upgrades display bug, and timer bar bug
|
2015-12-27 17:07:40 -05:00 |
|
Aktanusa
|
da3200612b
|
Fixed bar display glitches related to ascend changes
|
2015-12-26 21:27:41 -05:00 |
|
Aktanusa
|
d870823c07
|
Fix to work with 1.9 beta mostly
|
2015-12-26 16:38:36 -05:00 |
|