david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
675 Commits 9 Branches 44 Tags
9e21fc8586222912f0085bd44fbb499f371428f6
Commit Graph

675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DanielNoord
2f12f9839a Merge pull request #520 from DanielNoord/hotfix 
Fix tooltips
 2021-01-26 13:55:43 +01:00
Daniel van Noord
c62b514f0a Fix tooltips 2021-01-26 13:55:14 +01:00
PneuJai
125113133a Added CM.Disp.ReplaceCrateTooltipAchievements() into init 2021-01-26 20:45:37 +08:00
PneuJai
e5bd08c0c4 Added CM.Disp.ReplaceCrateTooltipAchievements 
CM.Disp.ReplaceCrateTooltipAchievements will backup and replace Game.crate and Game.crateTooltip and edit their outputs to show mysterious achievements
Also this will check for CM.Options.ShowMysteriousAchievements and CM.Options.ShowMysteriousShadowAchievements
 2021-01-26 20:44:48 +08:00
PneuJai
abfeabf08f Added default values for those two options 2021-01-26 20:42:17 +08:00
PneuJai
d958fc08bf Added two options 
They are options to show/hide mysterious achievements, and they dont need functions cuz CM.Disp.ReplaceCrateTooltipAchievements will check for them
 2021-01-26 20:41:22 +08:00
Daniel van Noord
1372942705 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-26 13:37:55 +01:00
DanielNoord
e64e41e523 Merge pull request #518 from Aktanusa/master 
Push hot fix to dev-branch
 2021-01-26 13:37:03 +01:00
DanielNoord
fda6e65176 Merge pull request #516 from DanielNoord/fixes 
Fix building sorting #515
 2021-01-26 13:35:53 +01:00
Daniel van Noord
7795aa79a5 Fix building sorting #515 2021-01-26 13:31:01 +01:00
DanielNoord
b6069e2358 Merge pull request #512 from Aktanusa/dev 
Merge pull request #511 from Aktanusa/master
 2021-01-25 23:43:36 +01:00
DanielNoord
a7af602aa3 Merge pull request #511 from Aktanusa/master 
Merge dev and master
 2021-01-25 23:43:10 +01:00
DanielNoord
f36dcf012a Merge pull request #509 from Aktanusa/dev 
Publish hotfixes
 2021-01-25 23:41:46 +01:00
DanielNoord
5a64ed45be Merge pull request #508 from DanielNoord/fixes 
A number of hot fixes for 2.031.3
 2021-01-25 23:40:41 +01:00
Daniel van Noord
e5b24b393e Fixed decimal notation #500 2021-01-25 23:37:41 +01:00
Daniel van Noord
92c28b092b Timer bar now adjusts height correctly #499 2021-01-25 23:29:21 +01:00
Daniel van Noord
d5c5a5f62e Show tooltip warnings when extra info is off #496 2021-01-25 23:24:25 +01:00
Daniel van Noord
867249e8cb Missing upgrades no longer shows debug #497 2021-01-25 23:00:30 +01:00
Daniel van Noord
28e28fd5a0 Single fattest wrinkler now excludes shiny #498 2021-01-25 22:55:57 +01:00
Daniel van Noord
5f93186e7d Fixed bug with display of missing upgrades 2021-01-25 22:46:08 +01:00
Daniel van Noord
0a57450815 Fix colour settings not displaying #504 2021-01-25 22:39:03 +01:00
Daniel van Noord
c08cefd1a6 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-25 22:32:53 +01:00
Zohnannor
51ab15f2ec Fix in Disp.js and combine 2021-01-25 20:31:32 +01:00
Zohnannor
8505b1621d Update CM.Disp.FormatTime 
Add years to date formatting, fixes #502
 2021-01-25 20:31:32 +01:00
DanielNoord
901bc7c61f Merge pull request #503 from Zohnannor/patch-1 
Update CM.Disp.FormatTime
 2021-01-25 20:29:05 +01:00
Zohnannor
192c5d105c Fix in Disp.js and combine 2021-01-25 22:20:59 +03:00
DanielNoord
519e67dce9 Create CONTRIBUTING.md 2021-01-25 18:07:55 +01:00
Zohnannor
c184d8b7a7 Update CM.Disp.FormatTime 
Add years to date formatting, fixes #502
 2021-01-25 19:02:24 +03:00
Daniel van Noord
55c6b5db8b Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-23 23:03:24 +01:00
DanielNoord
6df4abf945 Merge pull request #493 from Aktanusa/master 
Rebase dev to incorporate hot fix for #490
 2021-01-23 23:02:21 +01:00
DanielNoord
242c6ba754 Merge pull request #491 from Aktanusa/fix/hasGod 
Fixed hasGod #490
 2021-01-23 23:00:21 +01:00
Daniel van Noord
00f79cb073 Fixed hasGod #490 2021-01-23 22:59:46 +01:00
Daniel van Noord
c64f42bcfa Start work on Garden Tooltip 2021-01-23 22:55:39 +01:00
Daniel van Noord
29ba1c66cf Moved most replace tooltip funcs to Main.js 2021-01-23 22:36:26 +01:00
DanielNoord
1875423a7b Merge pull request #489 from DanielNoord/enhance/warnings 
Some new functions related to warnings
 2021-01-23 22:11:21 +01:00
Daniel van Noord
62f8e1fe82 Base warnings on new income instead of curr #488 2021-01-23 22:10:06 +01:00
Daniel van Noord
f257243b38 Optional warning for Conjure with Frenzy (#487) 2021-01-23 22:02:21 +01:00
Daniel van Noord
d71c197ec9 Added Conjure Frenzy to stats 2021-01-23 21:53:36 +01:00
DanielNoord
0ccd16577f Merge pull request #436 from Aktanusa/dev (Version 2.031.3) 
Merge dev-branch for v2.031.3 into master-branch
2.031.3 		2020-12-28 14:10:06 +01:00
DanielNoord
7c9d6f570d Merge branch 'master' into dev 2020-12-28 14:08:13 +01:00
DanielNoord
2648af3095 Merge pull request #483 from DanielNoord/version, Bump to version 2.031.3 (#397) 
Bump to version 2.031.3
 2020-12-28 14:01:53 +01:00
Daniel van Noord
cb284ed22d Bumped version to 2.031.3 2020-12-28 14:00:35 +01:00
Daniel van Noord
5f5a1abac0 Removed a TODO 2020-12-28 14:00:21 +01:00
DanielNoord
66429ff0d2 Merge pull request #482 from DanielNoord/popbutton 
Option for extra wrinkler popping buttons (#126)
 2020-12-28 13:26:09 +01:00
Daniel van Noord
c997ace2cf Option for extra wrinkler popping buttons (#126) 2020-12-28 13:25:26 +01:00
DanielNoord
9e0dac5413 Merge pull request #481 from DanielNoord/popbutton 
Another hotfix for levelup tooltip
 2020-12-28 13:02:49 +01:00
Daniel van Noord
4a3bb46f8b Another hotfix for levelup tooltip 2020-12-28 12:57:34 +01:00
DanielNoord
69fb8af639 Merge pull request #480 from DanielNoord/tooltip 
Hotfix for dragon levelup Tooltip
 2020-12-28 12:53:04 +01:00
Daniel van Noord
ad7d35e1ee Hotfix for dragon levelup Tooltip 2020-12-28 12:51:50 +01:00
DanielNoord
2bedae477d Merge pull request #479 from DanielNoord/tooltip (#65) 
Added tooltip with costs for Dragon Levels (#65)
 2020-12-28 12:41:39 +01:00