david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
612 Commits 9 Branches 44 Tags
b2ae7c71cfc02d433e6f7b2e10118b61a829b247
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DanielNoord b2ae7c71cf Merge pull request #532 from Aktanusa/revert-531-jscolor 
Revert "Update JSColor to 2.4.5"
 2021-01-29 18:46:03 +01:00
DanielNoord eee663f414 Revert "Update JSColor to 2.4.5" 2021-01-29 18:45:53 +01:00
DanielNoord 3dd2e65092 Merge pull request #531 from DanielNoord/jscolor 
Update JSColor to 2.4.5
 2021-01-29 18:23:22 +01:00
Daniel van Noord 16ad8f78dc Update JSColor to 2.4.5 2021-01-29 18:22:57 +01:00
DanielNoord ce5b7940e4 Merge pull request #529 from DanielNoord/fixsound 
Notify's don't occur when loading the mod #495
 2021-01-28 22:01:41 +01:00
Daniel van Noord 7b8e29e346 Notify's don't occur when loading the mod #495 2021-01-28 22:01:01 +01:00
DanielNoord b3757c452a Merge pull request #527 from DanielNoord/harvestalltooltip 
Tooltip for Harvest All button in Farm
 2021-01-27 22:13:29 +01:00
Daniel van Noord 6c852e2c50 Tooltip for harvest all button #227 2021-01-27 22:12:37 +01:00
Daniel van Noord 5abdc77e30 Added data on possible effects 2021-01-27 21:43:24 +01:00
DanielNoord 5af7be93e3 Merge pull request #526 from DanielNoord/fix/gardentooltip 
Make tooltips be replaced even when minigames were not loaded initially
 2021-01-27 21:31:29 +01:00
Daniel van Noord 0171732e70 Made Grimoire tooltip always launch 2021-01-27 21:30:50 +01:00
Daniel van Noord 00c513798a Make Garden tooltip load on LoadMinigames 2021-01-27 21:20:22 +01:00
DanielNoord abc7dce047 Delete .github/workflows directory 2021-01-27 00:05:42 +01:00
DanielNoord 61fc4aaaef Update main.yml 2021-01-27 00:00:29 +01:00
DanielNoord 4649ab87c6 Update main.yml 2021-01-26 23:58:53 +01:00
DanielNoord 7186be028b Update main.yml 2021-01-26 23:54:49 +01:00
DanielNoord e6728157b3 Update main.yml 2021-01-26 23:52:25 +01:00
DanielNoord 843bb00f34 Update main.yml 2021-01-26 23:50:52 +01:00
DanielNoord 1a73fb8a2d Update main.yml 2021-01-26 23:50:02 +01:00
DanielNoord 1aa6d3797b Update main.yml 2021-01-26 23:48:51 +01:00
DanielNoord 31ea583edb Update main.yml 2021-01-26 23:47:49 +01:00
DanielNoord b4cb0fee52 Update main.yml 2021-01-26 23:43:08 +01:00
DanielNoord 6dd4022a80 Update main.yml 2021-01-26 23:39:01 +01:00
DanielNoord d30a064c69 Update main.yml 2021-01-26 23:38:03 +01:00
DanielNoord cb91c91321 Update main.yml 2021-01-26 23:33:42 +01:00
DanielNoord 93e50181fe Update main.yml 2021-01-26 23:31:49 +01:00
DanielNoord 3b137aa882 Update main.yml 2021-01-26 23:30:01 +01:00
DanielNoord 1d51a36ccd Update main.yml 2021-01-26 23:28:24 +01:00
DanielNoord 30f6ecf8f2 Update main.yml 2021-01-26 23:23:05 +01:00
DanielNoord 1d639a9721 Update main.yml 2021-01-26 23:20:39 +01:00
DanielNoord 19260f9361 Merge pull request #525 from Aktanusa/action-1 
Create main.yml
 2021-01-26 23:18:42 +01:00
DanielNoord 94ba7487b1 Create main.yml 2021-01-26 23:17:59 +01:00
DanielNoord cd3a9caab5 Merge pull request #524 from DanielNoord/gardentooltip 
Gardentooltip
 2021-01-26 22:32:24 +01:00
Daniel van Noord 45c3df2d4b Fixed plant tooltips 2021-01-26 22:30:27 +01:00
Daniel van Noord 80e3ac746a Fixed CM.Options.TooltipBuildUpgrade #523 2021-01-26 22:26:46 +01:00
Daniel van Noord 52cfd9ddc2 Renamed ToolWrink to TooltipWrink 2021-01-26 22:22:32 +01:00
Daniel van Noord ffa664c476 Added option foor plot tooltip 2021-01-26 22:21:17 +01:00
Daniel van Noord a9dfcaab75 Tooltip with curr/max reward for plants #183 2021-01-26 22:18:21 +01:00
Daniel van Noord 23f19b4d62 Created (empty) tooltip for garden plots 2021-01-26 14:57:59 +01:00
Daniel van Noord ab08bc60e7 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip 2021-01-26 13:56:49 +01:00
DanielNoord b48834e416 Merge pull request #522 from Aktanusa/master 
Master
 2021-01-26 13:56:26 +01:00
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
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
DanielNoord 901bc7c61f Merge pull request #503 from Zohnannor/patch-1 
Update CM.Disp.FormatTime
 2021-01-25 20:29:05 +01:00
DanielNoord 519e67dce9 Create CONTRIBUTING.md 2021-01-25 18:07:55 +01: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
 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