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 |
|
Daniel van Noord
|
91ebbf39b9
|
Added tooltip with costs for Dragon Levels (#65)
|
2020-12-28 12:41:01 +01:00 |
|
DanielNoord
|
a8b874f37d
|
Merge pull request #478 from DanielNoord/save
Allow saving outside of autosave-interval (#469)
|
2020-12-28 10:55:22 +01:00 |
|
Daniel van Noord
|
b58c3ea292
|
Allow saving outside of autosave-interval (#469)
|
2020-12-28 10:53:58 +01:00 |
|
DanielNoord
|
cafa12204e
|
Merge pull request #477 from DanielNoord/fix/timerbar (#88)
Added indicator when upgrades/buildings are purchasable with wrinklers
|
2020-12-27 14:13:05 +01:00 |
|
Daniel van Noord
|
b4e2236fb7
|
Fixed #88
|
2020-12-27 14:11:21 +01:00 |
|
DanielNoord
|
5d126b6be3
|
Merge pull request #476 from DanielNoord/fix/timerbar (#147, #304, #388)
Multiple commits related tot he TimerBar
|
2020-12-27 13:37:56 +01:00 |
|
Daniel van Noord
|
b6cd262ff2
|
Fixed (#388) and add percentage overlay to timers
|
2020-12-27 13:27:44 +01:00 |
|
Daniel van Noord
|
6edda5420f
|
Fixed Timers for loans (#304)
|
2020-12-27 13:07:07 +01:00 |
|
Daniel van Noord
|
97014d273e
|
Added timer overlays in TimerBar (#147)
|
2020-12-27 12:39:33 +01:00 |
|
DanielNoord
|
319a3102de
|
Merge pull request #475 from DanielNoord/fix/avgcps (#401, #97)
Fixed calculation of average and current CPS
|
2020-12-26 17:56:08 +01:00 |
|
Daniel van Noord
|
b9a1a5444f
|
Fixed calculation of average and current CPS
|
2020-12-26 17:53:12 +01:00 |
|
DanielNoord
|
3f405da833
|
Merge pull request #447 from Aktanusa/readmeupdate
Update README.md
|
2020-12-24 23:52:05 +01:00 |
|
Daniel van Noord
|
9a649f93d2
|
Removed action .yml files
|
2020-12-24 11:02:22 +01:00 |
|
DanielNoord
|
d89c8e3a0f
|
Create Lint.yml
|
2020-12-24 10:58:01 +01:00 |
|
DanielNoord
|
6bb99ace11
|
Update main.yml
|
2020-12-24 10:54:32 +01:00 |
|
DanielNoord
|
68c30e7bdd
|
Update main.yml
|
2020-12-24 10:51:56 +01:00 |
|
DanielNoord
|
3ca1018a51
|
Create main.yml
|
2020-12-24 10:42:15 +01:00 |
|
DanielNoord
|
aed9b75397
|
Merge pull request #472 from DanielNoord/fix/various (#470, #471)
Fix/various
|
2020-12-22 23:17:58 +01:00 |
|
Daniel van Noord
|
0c095e4d81
|
Add new options section (#470)
|
2020-12-22 23:16:50 +01:00 |
|
Daniel van Noord
|
2f430e82e1
|
Added CM to version number in BotBar (#471)
|
2020-12-22 23:13:12 +01:00 |
|
DanielNoord
|
56d23aae22
|
Merge pull request #466 from DanielNoord/removecookies (#445)
Started to remove left over cookies and made subsections in notifications options
|
2020-12-21 23:58:29 +01:00 |
|
Daniel van Noord
|
c1501b47d6
|
Add subsections for notifications settings (#445)
|
2020-12-21 23:56:50 +01:00 |
|