Commit Graph
100 Commits
Author SHA1 Message Date
DanielNoord 101c309cec Merge pull request #442 from DanielNoord/seperator (#392)
Separator is now changeable
2020-12-17 18:09:22 +01:00
Daniel van Noord 8037615659 Added functionality for ScaleSeparator 2020-12-17 18:07:34 +01:00
Daniel van Noord fcadf1cc18 Added Config.ScaleSeparator 2020-12-17 17:41:25 +01:00
DanielNoord 671ff61830 Merge pull request #441 from DanielNoord/decimals (#264)
Make amount of decimals an option
2020-12-16 14:12:07 +01:00
Daniel van Noord 2fbbd39118 Added CM.Config.ScaleDecimals to CM.Disp.Beautify 2020-12-16 14:10:11 +01:00
Daniel van Noord cff7377789 Created ScaleDecimals as option 2020-12-16 13:31:49 +01:00
DanielNoord 583501e01b Merge pull request #440 from DanielNoord/volumeoption (#26)
Changed Volume-options into sliders
2020-12-15 15:20:29 +01:00
Daniel van Noord 10482dfd2d Fixed lay-out issue 2020-12-15 15:19:50 +01:00
Daniel van Noord 08b30e9c62 Changed Volume-options into sliders 2020-12-15 15:17:49 +01:00
DanielNoord 6098a398f0 Merge pull request #439 from DanielNoord/fix/gamesound (#437)
Incorporated the general game volume in calculation of notifications volumes
2020-12-13 22:14:36 +01:00
Daniel van Noord b80d2b63e8 Fixed bug with Sound of notifications 2020-12-13 22:12:53 +01:00
Daniel van Noord a867d3d896 Incorporated Game volume settings 2020-12-13 22:10:06 +01:00
DanielNoord f398aa9564 Merge pull request #438 from Aktanusa/dragoninfo (#185)
Added extra info to dragon aura selector display
2020-12-13 21:55:56 +01:00
Daniel van Noord 6a6a27680f Annotated CM.Sim.CalculateChangeAura 2020-12-13 21:54:29 +01:00
Daniel van Noord 15b859e8b9 Changed display of DragonAuraInfo in options 2020-12-13 21:50:39 +01:00
Daniel van Noord f13c9fb02d Added Aura caching and changing 2020-12-13 21:50:04 +01:00
Daniel van Noord f72e95301c Fixed some annotations in Sim.js 2020-12-10 22:31:26 +01:00
Daniel van Noord 8ffc0a2664 Added CM.Disp.AddAuraInfo() 2020-12-10 22:30:07 +01:00
Daniel van Noord f9c4f68bb8 Add config and replace-function for AuraInfo 2020-12-10 22:13:26 +01:00
DanielNoord 6bf81085ca Merge pull request #435 from DanielNoord/dispstats
Final work on initial rewrite of Disp.js
2020-12-07 21:26:40 +01:00
Daniel van Noord ea4776ae4b Final rework of Disp.js 2020-12-07 21:25:02 +01:00
DanielNoord efd4e9319d Merge pull request #433 from Chorizorro/fix/gains
Fix Dragon's Fortune mult in CalculateGains sim
2020-12-07 10:18:04 +01:00
Daniel van Noord 8805eacb0e Created CM.Disp.CreateStatsLuckySection 2020-12-06 20:51:04 +01:00
DanielNoord 62d05ea074 Merge pull request #428 from DanielNoord/fix/sellpricedev
Fix #416 on dev-branch
2020-12-06 19:38:49 +01:00
Daniel van Noord b462ed2ced Fix #416 on dev-branch 2020-12-06 19:37:34 +01:00
DanielNoord 7c08431271 Merge pull request #423 from Chorizorro/fix/disp
Fix favicon not being reset with no GC left
2020-12-06 12:43:00 +01:00
Daniel van Noord e066c8c43b Merge branch 'fix/cleanupdisp' of https://github.com/DanielNoord/CookieMonster into fix/cleanupdisp 2020-12-05 23:17:28 +01:00
Daniel van Noord bbc2fdf29f Fix for challenge mode 2020-12-05 23:17:15 +01:00
Daniel van Noord b6370c1873 First version of stats page 2020-12-05 23:17:15 +01:00
DanielNoord bf8e1922cb Merge pull request #420 from Chorizorro/fix/disp
Move CM.Disp.Draw out of bottom bar section
2020-12-05 23:15:38 +01:00
Daniel van Noord 7e101edf82 Fix for challenge mode 2020-12-05 23:13:53 +01:00
Daniel van Noord 36e64d3d90 First version of stats page 2020-12-05 23:13:28 +01:00
DanielNoord 15e4291489 Merge pull request #417 from Chorizorro/fix/disp
Enhance autosave timer refresh
2020-12-05 17:00:49 +01:00
DanielNoord d0ad7c418d Merge pull request #418 from DanielNoord/fix/cleanupdisp
Further revision of Disp.js
2020-12-05 16:24:14 +01:00
Daniel van Noord 77447cfca3 Further revision of Disp.js 2020-12-05 15:44:33 +01:00
DanielNoord 28b144ee70 Merge pull request #415 from DanielNoord/fix/cleanupdisp
Fixes to some of the new CM.Disp code
2020-12-05 14:28:42 +01:00
Daniel van Noord b6cdc77064 Fixed Warning tooltips 2020-12-05 14:27:48 +01:00
Daniel van Noord e0915bc307 Fix CM.Disp.Beautify failing when num=0 2020-12-05 14:10:42 +01:00
DanielNoord 7e935aab1a Merge pull request #399 from DanielNoord/fix/cleanupdisp
Preliminary overhaul of CM.Disp and related code
2020-12-05 10:34:42 +01:00
Daniel van Noord 9dc95d760a Almost done with updating Disp.js 2020-12-04 23:41:23 +01:00
Daniel van Noord 4baae5c9f7 Updated timer bar code 2020-12-04 22:38:14 +01:00
Daniel van Noord 02b31c8932 Fixed CM.Disp.Beautify 2020-12-04 21:14:17 +01:00
Daniel van Noord 343327a1b5 Fix CalculateGains 2020-12-04 21:06:23 +01:00
Daniel van Noord a3f2fe5dab Reworked Tooltip code v1 2020-12-04 20:23:58 +01:00
Daniel van Noord ed814ef39a FIx for floating numbers 2020-12-03 19:00:27 +01:00
Daniel van Noord 74b353d530 Fix CM.Sim.eff 2020-12-03 18:31:45 +01:00
Daniel van Noord d6aca47698 Initial work on Tooltip section 2020-12-03 18:17:07 +01:00
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
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
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
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
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
DanielNoord 8a26fc3178 Removed console.log left from debugging
Removed console.log from debugging
2020-11-30 22:28:10 +01:00
Daniel van Noord a30f07be77 Removed console.log from debugging 2020-11-30 22:27:00 +01:00
DanielNoord 428c000a5a Added 'Seconds till autosave' to Misc. stats #287 2020-11-30 22:09:37 +01:00
Daniel van Noord 42960d9780 Added 'seconds till autosave' to Misc. tats 2020-11-30 22:07:47 +01:00
DanielNoord 27567b3cff Fix building price displayed in sell mode (source code is incorrect) #359
Fix building price displayed in sell mode
2020-11-30 12:35:13 +01:00
DanielNoord c87a9d47d0 Fixed notations bugging out #282
Fixed notations bugging out #282
2020-11-30 10:37:37 +01:00
Daniel van Noord a11f82fce4 Fixed notations bugging out 2020-11-30 10:36:34 +01:00