Commit Graph

482 Commits

Author SHA1 Message Date
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
Chorizorro
f30ebd081e Fix Dragon's Fortune mult in CalculateGains sim 2020-12-07 10:11:07 +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
Chorizorro
87a85bfc59 Fix favicon not being reset with no GC left 2020-12-05 23:14:12 +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
Chorizorro
15d467992d Move CM.Disp.Draw out of bottom bar section 2020-12-05 22:31:40 +01:00
DanielNoord
15e4291489 Merge pull request #417 from Chorizorro/fix/disp
Enhance autosave timer refresh
2020-12-05 17:00:49 +01:00
Chorizorro
7cd62e1735 Enhance autosave timer refresh #375 2020-12-05 16:54:58 +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