david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
645 Commits 9 Branches 44 Tags
545a1a3102f0e7ef5e90aa52ce33dad40f146080
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel van Noord 545a1a3102 Fixed number of TODOs 2021-01-31 20:32:15 +01:00
DanielNoord c602ea5f45 Merge pull request #544 from DanielNoord/modapi 
Incorporate Modding API
 2021-01-31 19:46:08 +01:00
Daniel van Noord bbdbbfb667 Added Loop to hook of modding api #468 2021-01-31 19:44:00 +01:00
Daniel van Noord d9e0e46e64 Added Loop to hook of modding api #468 2021-01-31 18:28:14 +01:00
DanielNoord 2608ff9149 Merge pull request #543 from DanielNoord/bulkbuy 
Bulkbuy
 2021-01-31 18:19:18 +01:00
Daniel van Noord 0e7880816e Implement blocking of Bulk buying #143 2021-01-31 18:15:42 +01:00
Daniel van Noord 4e238e800c Added BulkBuyBlock to settings 2021-01-31 17:37:02 +01:00
Daniel van Noord 8c6de64ac9 Spelling error in TimeFormat 2021-01-31 17:33:41 +01:00
DanielNoord ca676c3b6a Final test ESLint successful 2021-01-31 14:12:46 +01:00
DanielNoord 425d640592 Final test ESLint Action 2021-01-31 14:11:17 +01:00
DanielNoord 9c61d62a8f Update README.md 2021-01-31 14:10:17 +01:00
DanielNoord f4becd6a91 Create ESLint.yml 2021-01-31 14:08:07 +01:00
DanielNoord d07964cfc5 Merge pull request #542 from DanielNoord/jshint 
Jshint
 2021-01-31 14:07:35 +01:00
Daniel van Noord 6519497ffc Fixed ESLint install 2021-01-31 13:55:47 +01:00
Daniel van Noord 4dd640ef4b Installed ESLint 2021-01-31 13:54:31 +01:00
Daniel van Noord 2d9af222c1 ESLint compliant 2021-01-31 13:33:34 +01:00
Daniel van Noord 416637bac3 Cache.js, Config.js & Data.js compy with JSHint 2021-01-30 16:12:09 +01:00
Daniel van Noord f7de9831e5 Semicolons and easy fixes for all documents 2021-01-30 15:25:19 +01:00
Daniel van Noord e4113d21e1 Semicolons and var declarations in Cache.js 2021-01-30 14:50:40 +01:00
DanielNoord f4711c74da Merge pull request #541 from DanielNoord/timerdisplay 
Timerdisplay
 2021-01-30 13:57:46 +01:00
Daniel van Noord 33d0478ca9 Make overlays of timers toggleable #494 2021-01-30 13:57:15 +01:00
Daniel van Noord ac457ed8dc Fixed TimerBarOverlay 2021-01-30 13:44:31 +01:00
Daniel van Noord efcaccfb26 Added TimerBarOverlay option 2021-01-30 13:43:28 +01:00
DanielNoord 63a38e564c Merge pull request #540 from DanielNoord/jscolorfix 
Fixed JSColor display not updating #539
 2021-01-30 11:36:00 +01:00
Daniel van Noord 2491f7a7cc Fixed JSColor display not updating #539 2021-01-30 11:35:28 +01:00
DanielNoord 8deb0c435d Merge pull request #538 from Aktanusa/master 
Master
 2021-01-30 01:18:23 +01:00
DanielNoord 6ed19f23e6 Merge pull request #536 from Aktanusa/jscolor 
Hot fix for jscolor
 2021-01-30 01:17:33 +01:00
Daniel van Noord 13e1233e0f Hot fix for jscolor 2021-01-30 01:16:18 +01:00
DanielNoord d3af77e2c8 Merge pull request #535 from Aktanusa/master (JSColor update) 
Update dev with JSColor
 2021-01-30 01:13:26 +01:00
DanielNoord b628d20363 Merge pull request #533 from Aktanusa/jscolor 
Update JSColor and integrate it
 2021-01-30 01:12:15 +01:00
Daniel van Noord 63139933ce Clean up 2021-01-30 01:10:08 +01:00
Daniel van Noord 0547381845 Changed the settings for colours 2021-01-30 01:07:09 +01:00
Daniel van Noord 455e99e2ab Updated jscolor to 2.4.5 2021-01-29 20:53:04 +01:00
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