Commit Graph

539 Commits

Author SHA1 Message Date
Daniel van Noord
106331af85 Update state-checking code v2 2020-12-03 16:40:21 +01:00
Daniel van Noord
8a303c2d27 Update state-checking code 2020-12-03 16:36:19 +01:00
Daniel van Noord
cbaf06a76b Updated GCTimer code 2020-12-03 16:06:25 +01:00
Daniel van Noord
e6f2c4c966 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into dev 2020-12-03 15:46:49 +01:00
Daniel van Noord
08e005b9db Reorgainzed src/Disp.js 2020-12-03 15:45:49 +01:00
Daniel van Noord
4067410397 Added annotations to CM.Disp.FormatTime 2020-12-03 15:44:16 +01:00
Daniel van Noord
e3861f1ffe Cleaned CM.Disp.FormatTime 2020-12-03 15:44:16 +01:00
DanielNoord
e6d0774734 Merge pull request #402 from Chorizorro/fix/misc #400
Hotfix for numbers Engineering notation
2.031.2
2020-12-03 15:35:36 +01:00
Daniel van Noord
95f19fbfd7 Fixded CM.Disp.GetTimeColor 2020-12-03 15:28:38 +01:00
Daniel van Noord
63c3a493fa Rewrote the code and data for the options-page 2020-12-03 15:23:12 +01:00
Chorizorro
17efc10568 Fix numbers Engineering notation #400 2020-12-03 13:32:01 +01:00
Daniel van Noord
9cad31da3e Updated CM.Disp.GetTimeColor v2 2020-12-03 13:24:34 +01:00
Daniel van Noord
5b9d171bf4 Updated CM.Disp.GetTimeColor 2020-12-03 13:23:36 +01:00
Daniel van Noord
44f75247cd Updated functions related to tab-bar v2 2020-12-03 13:05:43 +01:00
Daniel van Noord
06c7f59cd6 Updated functions related to tab-bar 2020-12-03 13:05:22 +01:00
Daniel van Noord
28ab2eab22 Annotated section on flashes/sound/notification 2020-12-03 12:33:21 +01:00
Daniel van Noord
854bec1519 Updated upgrade bar code 2020-12-03 12:17:00 +01:00
Daniel van Noord
243e43188f Cleaned up bottom bar code 2020-12-03 11:40:05 +01:00
Daniel van Noord
391b70017a Cleaned up CM.Disp.Beautify 2020-12-03 10:50:00 +01:00
DanielNoord
cd6f1ddaf4 Merge pull request #398 from DanielNoord/fix/cleanupdisp
Initial re-organization of src/Disp.js
2020-12-02 22:26:21 +01:00
Daniel van Noord
7efbd59062 Reorgainzed src/Disp.js 2020-12-02 22:23:17 +01:00
Daniel van Noord
e256d39101 Added annotations to CM.Disp.FormatTime 2020-12-02 21:55:57 +01:00
Daniel van Noord
0f5291b41c Cleaned CM.Disp.FormatTime 2020-12-02 21:53:19 +01:00
DanielNoord
8bbec4c8a4 Merge dev-branch into master for v2.031.2 2020-12-02 14:02:11 +01:00
DanielNoord
e518f25f24 Pushed Dev-branch to version 2.031.2 2020-12-02 13:59:52 +01:00
Daniel van Noord
e644fcb49f Pushed version to 2.031.2 2020-12-02 13:29:27 +01:00
DanielNoord
b9c7a0f154 Avoid crash on double-loading of the mod #252 2020-12-02 13:26:07 +01:00
Daniel van Noord
94745fb013 Avoid crash on double-loading 2020-12-02 13:24:56 +01:00
DanielNoord
a8e3691507 Adjust Lucky/Chain stats for Dragon's Fortune & Reality Bending #289 2020-12-02 12:36:54 +01:00
Chorizorro
cb8114ecfb Adjust Lucky/Chain stats for Dragon's Fortune #289
Add a multiplier adjustment when Dragon's Fortune aura is set
(either via Dragon's Fortune itself or via Reality Bending) and use
it to adjust CPS with 1 golden cookie even if there are no golden
cookies currently on screen
2020-12-02 10:20:03 +01:00
DanielNoord
f864e60e87 Remove Cookes till achievement in tooltip if all are obtained #89 2020-12-01 17:47:57 +01:00
Daniel van Noord
53117009e7 Remove Cookes till achievement if all are got 2020-12-01 17:46:20 +01:00
DanielNoord
5f4dda4adb Added warning for lagginess of "Missing Achievs" (see #386) 2020-12-01 16:44:54 +01:00
Daniel van Noord
63e5ddf1ca Added warning for lagginess of "Missing Achievs" 2020-12-01 16:43:23 +01:00
DanielNoord
8c5ea875bf Fix: Changed CM.Sim.Has to HasAchiev in Building tooltip #384
Fix: Changed CM.Sim.Has to HasAchiev in Building tooltip
2020-12-01 16:28:06 +01:00
Daniel van Noord
af0f210c54 Changed CM.Sim.Has to HasAchiev 2020-12-01 16:26:11 +01:00
DanielNoord
31e701505e Added cookies till achievement in building tooltip #89 2020-12-01 16:11:11 +01:00
Daniel van Noord
cb6b97a269 Added cookies till achievement in building tooltip 2020-12-01 16:10:12 +01:00
DanielNoord
0bebb12808 Fix stats for lucky/chain cookies #379
Fix stats for lucky/chain cookies
2020-12-01 15:10:17 +01:00
Chorizorro
8a3609092d Handle lucky wrath cookies rewards (#379) 2020-12-01 14:40:15 +01:00
Chorizorro
8dc5d4b849 Fix golden and wrath cookies multipliers (#379) 2020-12-01 14:39:52 +01:00
DanielNoord
63a00a2ae1 Added cookies to be gained/lost to Conjure Baked Goods tooltip #130
Added cookies to be gained/lost to Conjure Baked Goods tooltip
2020-12-01 13:40:36 +01:00
Daniel van Noord
71a4407da8 Added cookies to be gained/lost to conjure tooltip 2020-12-01 13:38:49 +01:00
DanielNoord
7cf021ac5d Fixed sorting when PP = Infinity #353
Fixed sorting when PP = Infinity
2020-12-01 12:44:58 +01:00
Daniel van Noord
810c5adfba Fixed sorting when PP = Infinity 2020-12-01 12:44:13 +01:00
DanielNoord
26549a148a Optional display of missing upgrades in stats menu #193
Optional display of missing upgrades in stats menu
2020-12-01 11:44:45 +01:00
Daniel van Noord
f810c42b73 Optional display of missing upgrades to stats 2020-12-01 11:37:03 +01:00
DanielNoord
e3c3c1b1fe Re-base dev-branch to master-branch
Re-base dev-branch to master-branch
2020-12-01 08:48:42 +01:00
DanielNoord
9b87b1d5ad Fixed PP calculation when CPS = 0 #368
Fixed PP calculation when CPS = 0
2020-12-01 08:45:47 +01:00
Daniel van Noord
baf21e888f Fixed PP calculation when CPS = 0 2020-12-01 08:44:23 +01:00