Commit Graph

Select branches

Hide Pull Requests

dependabot/npm_and_yarn/eslint-9.27.0

dependabot/npm_and_yarn/eslint-config-prettier-10.1.5

dependabot/npm_and_yarn/eslint/eslintrc-3.3.1

dependabot/npm_and_yarn/eslint/js-9.27.0

dependabot/npm_and_yarn/prettier-3.5.3

dev

gh-pages

master

pre-commit-ci-update-config

#100

#100/merge

#1000

#1001

#1006

#1007

#1008

#1009

#101

#1011

#1012

#1014

#1017

#1018

#1019

#1020

#1023

#1023/merge

#1024

#1025

#1026

#1028

#1029

#1032

#1033

#1034

#1035

#1036

#1037

#1044

#1045

#1046

#1047

#1048

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#1061

#1062

#1064

#1065

#1065/merge

#1066

#1067

#1068

#1069

#107

#107/merge

#1070

#1071

#1072

#1073

#1075

#1076

#1077

#1079

#108

#1080

#1081

#1082

#1084

#1086

#1087

#1088

#1089

#1090

#1091

#1092

#1093

#1094

#1095

#1098

#1099

#1100

#1103

#1106

#1108

#1109

#1111

#1112

#1114

#1116

#1117

#1121

#1122

#1123

#1124

#1125

#1127

#1128

#1131

#1132

#1134

#1135

#1136

#1138

#1139

#1141

#1142

#1143

#1144

#1146

#1147

#1148

#1149

#115

#1150

#1151

#1152

#1153

#1158

#116

#1161

#1163

#1164

#1169

#1179

#1180

#1181

#1182

#1183

#1184

#1185

#1188

#1189

#1190

#1191

#1192

#1192/merge

#1196

#1197

#1198

#1200

#1201

#1202

#1203

#1204

#1205

#1206

#1207

#1208

#1209

#1209/merge

#121

#121/merge

#1211

#1212

#1213

#1216

#1217

#1219

#1220

#1221

#1221/merge

#1223

#1224

#1225

#1226

#1227

#1228

#1229

#1230

#1231

#1232

#1232/merge

#1234

#1234/merge

#1235

#1235/merge

#1239

#1239/merge

#1240

#1241

#1243

#1244

#1245

#1248

#1250

#1253

#1253/merge

#133

#138

#138/merge

#142

#158

#158/merge

#159

#159/merge

#162

#162/merge

#163

#164

#166

#172

#178

#191

#191/merge

#192

#201

#211

#211/merge

#215

#216

#217

#219

#220

#220/merge

#221

#221/merge

#222

#233

#234

#250

#251

#253

#255

#258

#262

#280

#283

#285

#286

#300

#309

#311

#314

#316

#318

#319

#321

#323

#324

#325

#327

#329

#330

#331

#334

#335

#336

#337

#338

#340

#341

#343

#344

#345

#346

#349

#350

#354

#355

#356

#357

#360

#361

#362

#365

#366

#367

#368

#369

#370

#371

#372

#374

#376

#377

#378

#380

#381

#382

#383

#384

#385

#387

#390

#391

#393

#394

#395

#396

#398

#399

#402

#409

#410

#411

#412

#415

#417

#418

#420

#421

#422

#423

#424

#425

#427

#428

#429

#431

#432

#433

#435

#436

#438

#439

#440

#441

#442

#443

#446

#447

#448

#449

#451

#452

#453

#454

#455

#456

#457

#458

#459

#460

#461

#462

#464

#465

#466

#472

#475

#476

#477

#478

#479

#480

#481

#482

#483

#484

#489

#491

#492

#493

#503

#505

#506

#507

#508

#509

#510

#511

#512

#513

#516

#517

#518

#519

#520

#521

#522

#524

#525

#526

#527

#529

#53

#53/merge

#531

#532

#533

#534

#535

#536

#537

#538

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#552

#559

#561

#562

#564

#565

#566

#570

#571

#572

#573

#575

#576

#577

#578

#579

#581

#582

#583

#585

#586

#590

#591

#592

#594

#598

#601

#603

#604

#605

#606

#607

#61

#61/merge

#614

#615

#616

#622

#623

#624

#634

#635

#639

#640

#641

#642

#643

#644

#645

#646

#649

#650

#652

#653

#654

#655

#656

#658

#659

#661

#662

#663

#664

#665

#666

#671

#672

#673

#674

#676

#678

#679

#680

#681

#682

#684

#685

#688

#689

#691

#692

#693

#704

#705

#706

#711

#712

#713

#717

#718

#719

#722

#723

#724

#725

#730

#733

#738

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#751

#752

#755

#756

#757

#758

#759

#760

#765

#769

#770

#774

#776

#777

#778

#779

#781

#782

#783

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#803

#804

#807

#808

#809

#810

#811

#812

#813

#814

#815

#817

#818

#819

#820

#824

#825

#826

#827

#828

#829

#830

#835

#836

#837

#838

#839

#840

#841

#842

#847

#848

#849

#850

#851

#852

#853

#855

#856

#857

#858

#86

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#870

#871

#872

#873

#874

#876

#877

#878

#879

#880

#881

#882

#883

#887

#894

#895

#896

#897

#898

#899

#900

#901

#902

#906

#907

#909

#910

#911

#912

#913

#916

#917

#923

#924

#925

#926

#927

#928

#929

#932

#933

#934

#935

#936

#937

#938

#94

#94/merge

#941

#942

#943

#944

#945

#947

#948

#949

#95

#953

#954

#955

#956

#957

#962

#963

#970

#971

#972

#975

#977

#979

#980

#981

#990

#991

#992

#994

1.0465.10

1.0465.11

1.0465.12

1.0465.13

1.0465.2

1.0465.3

1.0465.4

1.0465.5

1.0465.6

1.0465.7

1.0465.8

1.0465.9

1.0466.1

2.002.1

2.002.2

2.0034.1

2.0034.2

2.0034.3

2.0042.1

2.0042.2

2.0045.1

2.0106.1

2.0109.1

2.012.1

2.016.1

2.018.1

2.019.1

2.021.1

2.021.2

2.031.1

2.031.10

2.031.2

2.031.3

2.031.4

2.031.5

2.031.6

2.031.7

2.031.8

2.031.9

2.1

2.2

2.3

2.4

2.5

Mono Color

• a21df99b0b Merge branch 'master' into gh-pages Aktanusa 2016-07-25 21:10:31 -04:00
• 991c80d040 Fixed minor bug with version numbers 2.002.1 Aktanusa 2016-07-25 20:58:12 -04:00
• 6c0ab25894 Merge branch 'beta' into dev to update to Version 2.002.1 Aktanusa 2016-07-25 20:50:32 -04:00
• 92575ccd64 Merge branch 'CrackedP0t-master' into dev Aktanusa 2016-07-25 20:40:37 -04:00
• b4da2c69f1 Merge branch 'master' of https://github.com/CrackedP0t/CookieMonster into CrackedP0t-master Aktanusa 2016-07-25 20:38:53 -04:00
• 8802a834d5 Add shell script to make CookieMonster.js CrackedP0t 2016-07-24 14:01:06 -06:00
• 79de5d09c7 Update beta version Aktanusa 2016-06-28 22:33:18 -04:00
• 5a42ae532e Fixed for Version 2.002 Beta (mostly) Aktanusa 2016-06-28 22:32:07 -04:00
• e1c4826605 Copy @DeathOfBalance code (#95) to the correct source and did minor code cleanup (thanks @DeathOfBalance!) Aktanusa 2016-06-28 21:05:21 -04:00
• 23232c536a Merge branch 'DeathOfBalance-beta' into beta Aktanusa 2016-06-28 20:58:06 -04:00
• e5f310393f Merge branch 'beta' of https://github.com/DeathOfBalance/CookieMonster into DeathOfBalance-beta Aktanusa 2016-06-28 20:57:27 -04:00
• 9fc5b3dbaf Version changed to 2.002.1 Aktanusa 2016-06-28 20:50:57 -04:00
• adef849df9 Fixed minor bug with "Cookies To Next Level" stat Aktanusa 2016-06-28 20:38:41 -04:00
• d435e215e8 Updated for 2.002 multiplicative egg behavior DeathOfBalance 2016-06-28 17:51:31 -04:00
• 76cc63e510 Changed Done! for new timer format (Issue #85) Aktanusa 2016-05-02 22:58:44 -04:00
• eea4656094 Minor bug forgot to fix for Issue #85 Aktanusa 2016-05-02 22:25:23 -04:00
• 5a9d378585 Added minor fixes to @JCBourgo's pull (Issue #85) Aktanusa 2016-05-02 22:18:10 -04:00
• 4a20c76885 Merge branch 'JCBourgo-patch-1' into dev Aktanusa 2016-05-02 21:22:02 -04:00
• 520f72fe77 Merge branch 'patch-1' of https://github.com/JCBourgo/CookieMonster into JCBourgo-patch-1 Aktanusa 2016-05-02 21:14:22 -04:00
• 37f4252509 Removed the line, back to the original Jean-Christophe Bourgault 2016-05-02 20:45:33 -04:00
• ae29132175 Made a single second look nicer Jean-Christophe Bourgault 2016-05-02 20:33:48 -04:00
• 5fb084bd12 Added condition for format and time lower than 1 Jean-Christophe Bourgault 2016-05-02 20:13:12 -04:00
• c3e85afb85 Added an "if" for the XX:XX:XX:XX:XX time format Jean-Christophe Bourgault 2016-05-01 22:45:55 -04:00
• 3ce5164abb Merge pull request #1 from JCBourgo/patch-2 Jean-Christophe Bourgault 2016-05-01 22:32:28 -04:00
• 6107be18a9 Added listing for TimeFormat Jean-Christophe Bourgault 2016-05-01 22:30:24 -04:00
• ae11e1db73 Added config for "XX:XX:XX:XX:XX" Jean-Christophe Bourgault 2016-05-01 22:27:39 -04:00
• ba726ec435 Fixed minor bug (which may never happen anyway) Aktanusa 2016-04-28 17:59:01 -04:00
• 4d2287a7ae Change to Version 2.6 Aktanusa 2016-04-28 17:56:46 -04:00
• 0d1265d533 Update beta version Aktanusa 2016-04-28 17:44:20 -04:00
• 9555e73475 Fixed buff bars (Issue #77) Aktanusa 2016-04-28 17:43:07 -04:00
• 797a0ce498 Update beta version Aktanusa 2016-04-28 10:01:09 -04:00
• e62b7bfe04 Fixed GC CSS hover wasn't showing with GC timer Aktanusa 2016-04-28 10:00:14 -04:00
• 494673a371 Update beta version Aktanusa 2016-04-28 08:50:08 -04:00
• 91d2ea8df7 Hopefully fix the issue of GC timer not popping GC in Firefox (Issue #81) Aktanusa 2016-04-28 08:48:35 -04:00
• 2299d0b89c Updated beta version Aktanusa 2016-04-28 00:25:39 -04:00
• 05278149c5 Changed to Version 2.001.1 and fixed for Version 2.001 Beta (mostly) (Issue #77) Aktanusa 2016-04-28 00:22:56 -04:00
• c5806799a4 Merge branch 'master' into gh-pages Aktanusa 2016-04-25 22:36:13 -04:00
• 881f5233e9 Forgot to update combo file again 2.5 Aktanusa 2016-04-25 22:18:41 -04:00
• 2a67bc1b61 Copied Wikia changes Aktanusa 2016-04-25 22:13:35 -04:00
• 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 Aktanusa 2016-04-25 22:08:31 -04:00
• f44d03c4c7 Added get method to the queue helper JS Aktanusa 2016-03-27 22:59:43 -04:00
• b7666cca6d Added helper JS queue.js Aktanusa 2016-03-27 19:49:33 -04:00
• 5d0958b63a Rename Return On Investment to Payback Period to fit what the number represents better (Issue #68) Aktanusa 2016-03-27 17:57:50 -04:00
• 57ab55a2c1 Added title option for pinned tabs to only highlight on Golden Cookie/Season Popup spawns (Issue #44 part 2) and minor bug fixes Aktanusa 2016-03-24 22:13:39 -04:00
• 3adf65f766 Update to Version 2.5 Aktanusa 2016-03-17 22:03:15 -04:00
• 3568799c32 Merge branch 'master' into gh-pages Aktanusa 2016-03-17 21:48:03 -04:00
• 2ed563c995 Added Heavenly Chips stats, changed max prestige calcuation to include wrinklers and chocolate egg (Issue #62) 2.4 Aktanusa 2016-03-17 20:14:51 -04:00
• 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 Aktanusa 2016-03-13 10:51:10 -04:00
• f0d492ea4a Split/combine "Lucky!" stat when needed (Issue #60) Aktanusa 2016-03-10 21:33:23 -05:00
• dd25067271 Updated README, added option to change bulk buildings colors between the single buildings colors or calculated colors (Issue #59 and #63) Aktanusa 2016-03-10 19:48:42 -05:00
• 6c1f08a6c0 Updated README to ROI information and credited @svschouw Aktanusa 2016-03-10 19:27:29 -05:00
• 1dcc814fa4 Added back Alderi Tokori to credits with correct link. I confused him with Maxime Fabre Aktanusa 2016-03-06 22:41:37 -05:00
• 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 Aktanusa 2016-03-06 22:21:35 -05:00
• 306c7c24a4 Version change to 2.4 Aktanusa 2016-03-05 18:41:31 -05:00
• 47a8427448 Merge branch 'master' into gh-pages Aktanusa 2016-03-05 10:33:55 -05:00
• 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 2.3 Aktanusa 2016-03-05 10:19:12 -05:00
• 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) Aktanusa 2016-03-03 21:26:25 -05:00
• ddd52c9583 Changed the look of CM toggle settings to be like CC, minor code cleanup, added a missing calculation Aktanusa 2016-03-02 16:01:35 -05:00
• bb776eb477 GC calculations account for auras now, added more info on require cookies for Chains (Issue #37), and did some stats cleanup Aktanusa 2016-02-28 23:23:41 -05:00
• c5ddda54c5 Added back prestige statistics (Issue #46) Aktanusa 2016-02-27 23:11:50 -05:00
• cd09bd55fc Added colors for new golden cookie bars and minor cleanup Aktanusa 2016-02-27 19:12:31 -05:00
• c12fcf7344 Updated README to change dev link and add credit Aktanusa 2016-02-20 11:42:52 -05:00
• 2899291162 Rename Favicon for Golden Cookies Aktanusa 2016-02-19 23:25:44 -05:00
• 8bddb28d1d Rename Favicon for Golden Cookies Aktanusa 2016-02-19 23:24:58 -05:00
• 3ed7a64344 Added Favicon change on Golden/Wrath Cookies (Issue #44 and #55) Aktanusa 2016-02-19 23:22:56 -05:00
• 44447d71c3 Formatting fixes Aktanusa 2016-02-19 21:26:56 -05:00
• c03c1c44d7 Fixed minor bug in load config with checking colors preferences Aktanusa 2016-02-19 20:57:00 -05:00
• 67ca329306 Added additional file for previous commit Aktanusa 2016-02-19 20:47:57 -05:00
• 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) Aktanusa 2016-02-19 20:47:27 -05:00
• a390734890 Added favicons for Golden and Wrath Cookies (thanks to @BlackenedGem for the files) Aktanusa 2016-02-19 20:30:41 -05:00
• ab721fef7c Forgot one file for previous commit Aktanusa 2016-02-14 13:05:07 -05:00
• e034ee1f44 Added Missing Golden Cookies stat (Issue #41) with code from Alhifar (Pull #53) Aktanusa 2016-02-14 13:04:30 -05:00
• 9070a50355 Merge branch 'Alhifar-master' into dev Aktanusa 2016-02-14 12:28:55 -05:00
• 440512ddc7 Version change to 2.3 Aktanusa 2016-02-14 11:57:56 -05:00
• 4dd498cc4d Add missed GC clicks stat with preference, create a section header for misc stats Alhifar 2016-02-13 23:36:07 -05:00
• 6995e86752 Merge branch 'master' into gh-pages Aktanusa 2016-02-09 15:33:23 -05:00
• 348c47e1dc Hopefully to fix the crashing (part 3) 2.2 Aktanusa 2016-02-09 13:46:50 -05:00
• 6e09c8dafb Hopefully to fix the crashing (part 2) Aktanusa 2016-02-09 13:45:42 -05:00
• f1a79cbaa3 Hopefully to fix the crashing Aktanusa 2016-02-09 13:04:35 -05:00
• 5640cbb9c8 Version change to 2.2 (forgot to do this first so previous commit is under this version) Aktanusa 2016-02-09 11:56:37 -05:00
• 6917e3139a Fixed bug where Caut/Warn Tooltip calculation with bonus CPS didn't use the new Lucky reward way Aktanusa 2016-02-09 11:55:28 -05:00
• dbd2b0ae51 Merge branch 'master' into gh-pages Aktanusa 2016-02-08 20:22:04 -05:00
• f120f047dc Removed HC stats as it is useless now (pending cleaning) 2.1 Aktanusa 2016-02-08 20:17:08 -05:00
• 13a49e3e39 Updated README to reflect the same thing as the Wikia Aktanusa 2016-02-08 19:27:29 -05:00
• 762a6919e7 Updated README to reflect the same thing as the Wikia Aktanusa 2016-02-08 19:25:32 -05:00
• 77ba8c4e84 Version change and merge from beta branch (Issue #50) Aktanusa 2016-02-08 19:06:11 -05:00
• f9141a7f4f [Beta] Version change to 1.909.1 Aktanusa 2016-02-08 09:54:04 -05:00
• 914a5e2ff3 Version change to 1.909.1 Aktanusa 2016-02-08 09:52:58 -05:00
• 15b80cf48f [beta] Version change to 1.907.1 and fixed it to work with 1.907 beta (mostly) Aktanusa 2016-02-06 12:35:33 -05:00
• 6bced494f8 Version change to 1.907.1 and fixed it to work with 1.907 beta (mostly) Aktanusa 2016-02-06 12:34:17 -05:00
• ee35136130 Version change to 1.906 Aktanusa 2016-02-06 11:24:39 -05:00
• 030a0a20da [beta] Fixed Current Chain reward being calculated wrong, tooltips being buggy, and needing to click a little above santa/dragon icon Aktanusa 2016-02-05 23:39:20 -05:00
• 85ed508010 Fix Current Chain reward being calculated wrong, tooltips being buggy, and needing to click a little above santa/dragon icon Aktanusa 2016-02-05 23:37:15 -05:00
• a1f2e0f424 [beta] Fixed bug with Current Lucky reward was calculated wrong Aktanusa 2016-02-05 00:43:47 -05:00
• 0ea31f6e94 Fixed bug with Current Lucky reward was calculated wrong Aktanusa 2016-02-05 00:42:04 -05:00
• 581db06f0f Fixed to work with 1.903 beta (mostly) Aktanusa 2016-02-04 23:52:16 -05:00
• 5ceffa9d63 Fix to work with 1.903 beta (mostly) Aktanusa 2016-02-04 23:49:51 -05:00
• 07b67be07e Version change to 1.903.1 Aktanusa 2016-02-04 18:24:54 -05:00
• 93ffc9d67b [beta] Used a better fix on missing boxes on upgrades Aktanusa 2015-12-28 11:11:15 -05:00
• 5aa21209b9 Used a better fix on missing boxes on upgrades Aktanusa 2015-12-28 11:09:54 -05:00