david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,294 Commits 9 Branches 44 Tags
6fcece6fc8a1d1f0a13cfe46e04335f5adf17ce5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël van Noord 3e3659e2a4 Merge pull request #902 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.28.4 2021-07-20 20:43:13 +02:00
Daniël van Noord 02bf0d6455 Merge pull request #901 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.28.4 2021-07-20 20:41:22 +02:00
Daniël van Noord 2a82fc2b1f Merge pull request #900 from CookieMonsterTeam/master 
Fix commit history
 2021-07-20 18:11:33 +02:00
Daniël van Noord 80b373ff6c Build CM 2021-07-20 18:09:02 +02:00
Daniël van Noord 8c118b6aef Fix imports after changes to folder structure 2021-07-20 18:08:53 +02:00
Daniël van Noord 82c872ef18 Use framework for Options menu 2021-07-20 18:08:32 +02:00
Daniël van Noord e9dc2ffa51 Use Framework notifications 2021-07-20 18:08:11 +02:00
Daniël van Noord 9294a5bc87 Remove functions and tests that moved to framework 2021-07-20 18:06:16 +02:00
Daniël van Noord 248fd32e91 Bump CM Framework to 0.2.0 2021-07-20 18:05:21 +02:00
Daniël van Noord 436c1d7239 Remove PlaySound from globals 2021-07-20 14:55:17 +02:00
Daniël van Noord b84e511e52 Merge pull request #899 from DanielNoord/fix/ascensionlag 
Fix lag on ascencion screen #890
 2021-07-20 08:13:20 +02:00
Daniël van Noord ec35013be7 Fix lag on ascencion screen #890 2021-07-20 08:11:43 +02:00
Daniël van Noord eefecb7829 Merge pull request #898 from DanielNoord/optimize 
Optimize
 2021-07-19 22:02:04 +02:00
Daniël van Noord bb0ba7f116 Small optimization to AscendButton() 2021-07-19 21:59:45 +02:00
Daniël van Noord 075bd89669 Fix BuildingGetPrice() and remove getSumPrice() 2021-07-19 21:42:04 +02:00
Daniël van Noord 43a651ea4a Only iterate over UpgradesInStore 2021-07-19 21:05:50 +02:00
Daniël van Noord 80dab239b6 Update CI to also run on push to main branches 2021-07-19 16:54:24 +02:00
Daniël van Noord 22faf1edc2 Update README 2021-07-19 16:48:27 +02:00
Daniël van Noord 522443c30f Change env variable name 2021-07-19 16:45:26 +02:00
Daniël van Noord d8eea6939e Update packages 2021-07-19 16:45:16 +02:00
Daniël van Noord c661cba533 Merge pull request #895 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.28.3 
Bump @typescript-eslint/eslint-plugin from 4.28.2 to 4.28.3
 2021-07-19 07:59:42 +02:00
Daniël van Noord 4572d0e5c5 Merge pull request #897 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.28.3 
Bump @typescript-eslint/parser from 4.28.2 to 4.28.3
 2021-07-19 07:57:38 +02:00
Daniël van Noord b7c7739a25 Merge pull request #896 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.31.0 
Bump eslint from 7.30.0 to 7.31.0
 2021-07-19 07:57:29 +02:00
Daniël van Noord 68e42e2744 Merge pull request #894 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.45.1 
Bump webpack from 5.44.0 to 5.45.1
 2021-07-19 07:57:01 +02:00
Daniël van Noord 5a7187aa3c Merge pull request #887 from DanielNoord/framework 
Start using the CookieMonsterFramework
 2021-07-11 12:57:12 +02:00
Daniël van Noord db07ab6c3e Add token to workflow and .npmrc 2021-07-11 12:56:01 +02:00
Daniël van Noord c0e788b143 Use CookieMonsterFramework for save/load, infoMenu 2021-07-11 10:21:16 +02:00
Daniël van Noord b959b3c024 Update CookieMonsterFramework to 0.1.0 2021-07-11 10:19:30 +02:00
Daniël van Noord c8eeab45af Add .nprmc 2021-07-06 22:40:51 +02:00
Daniël van Noord ecf73d815f Merge pull request #883 from DanielNoord/upmaster 
Upmaster
 2021-07-05 16:04:06 +02:00
Daniël van Noord 094b153f7e Add option to "lock" buildings #763 2021-07-05 16:02:29 +02:00
Daniël van Noord 3ac2c75b6f Fixed annotation 2021-07-05 15:32:33 +02:00
Daniël van Noord 3b444c2b69 Merge pull request #882 from CookieMonsterTeam/master 
Merge pull request #881 from CookieMonsterTeam/dev
 2021-07-05 10:11:53 +02:00
Daniël van Noord a5c052b46e Merge pull request #881 from CookieMonsterTeam/dev 
Hotfix
 2021-07-05 10:11:10 +02:00
Daniël van Noord e3fddd4450 Merge pull request #880 from DanielNoord/cookieduplication 
Cookieduplication
 2021-07-05 10:10:42 +02:00
Daniël van Noord 07bb28cf46 Push hotfix to master file 2021-07-05 10:09:13 +02:00
Daniël van Noord a9eb56de0c Add hotfix to release notes 2021-07-05 10:08:19 +02:00
Daniël van Noord dcf00b82b8 Fix duplicate golden cookie with autoclickers #762 2021-07-05 10:05:26 +02:00
Daniël van Noord 14ba9105ca Merge pull request #879 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.30.0 
Bump eslint from 7.29.0 to 7.30.0
 2021-07-05 07:25:24 +02:00
Daniël van Noord 6f36d1dcf1 Merge pull request #878 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.42.0 
Bump webpack from 5.41.1 to 5.42.0
 2021-07-05 07:25:15 +02:00
Daniël van Noord 68e6afa410 Merge pull request #872 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.2 2021-07-01 22:46:07 +02:00
Daniël van Noord a147065fd6 Merge pull request #876 from DanielNoord/updatepackage 
Updatepackage
 2021-07-01 22:37:16 +02:00
Daniël van Noord 27ad606380 Update packages 2021-07-01 22:36:05 +02:00
Daniël van Noord cff2928535 Merge pull request #870 from CookieMonsterTeam/dev 
Master to 2.031.9
 2021-06-27 23:25:29 +02:00
Daniël van Noord 5fec38625f Merge pull request #869 from DanielNoord/update 
Update
 2021-06-27 23:24:58 +02:00
Daniël van Noord 1d325a253c Update CookieMonster.js 2021-06-27 23:23:37 +02:00
Daniël van Noord 33caf8838c Push to 2.031.9 2021-06-27 23:22:53 +02:00
Daniël van Noord 2708903e92 Merge pull request #868 from DanielNoord/achievement 
Achievement
 2021-06-27 23:21:50 +02:00
Daniël van Noord 6b346e0272 Add info about next achievement in stats #833 2021-06-27 23:18:15 +02:00
Daniël van Noord d6a3209c43 Update package-lock 2021-06-27 23:03:57 +02:00
Daniël van Noord dfd0d790bc Add Achievements section to Stats page 2021-06-27 23:03:48 +02:00
Daniël van Noord f228365978 Merge pull request #867 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.27.0 
Bump @typescript-eslint/parser from 4.26.1 to 4.27.0
 2021-06-21 08:59:26 +02:00
Daniël van Noord 9a6086d823 Merge pull request #866 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.39.1 
Bump webpack from 5.38.1 to 5.39.1
 2021-06-21 08:58:16 +02:00
Daniël van Noord 527de03493 Merge pull request #863 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.29.0 
Bump eslint from 7.28.0 to 7.29.0
 2021-06-21 08:57:50 +02:00
Daniël van Noord d4043689a4 Merge pull request #864 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.27.0 
Bump @typescript-eslint/eslint-plugin from 4.26.1 to 4.27.0
 2021-06-21 08:56:38 +02:00
Daniël van Noord 8cb0471694 Merge pull request #865 from CookieMonsterTeam/dependabot/npm_and_yarn/types/chai-4.2.19 
Bump @types/chai from 4.2.18 to 4.2.19
 2021-06-21 08:56:29 +02:00
Daniël van Noord ce7f0eb7e3 Merge pull request #861 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.3.4 
Bump typescript from 4.3.2 to 4.3.4
 2021-06-21 08:56:07 +02:00
Daniël van Noord 1c1afb6880 Merge pull request #860 from tsr488/shiny 
Fix Pop All Normal wrinkler tooltip
 2021-06-20 22:35:59 +02:00
Daniël van Noord 23eb28e29c Merge pull request #855 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.26.1 
Bump @typescript-eslint/eslint-plugin from 4.26.0 to 4.26.1
 2021-06-14 09:08:54 +02:00
Daniël van Noord 035318c33f Merge pull request #857 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.26.1 
Bump @typescript-eslint/parser from 4.26.0 to 4.26.1
 2021-06-14 09:06:47 +02:00
Daniël van Noord a620efe44a Merge pull request #858 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.7.2 
Bump webpack-cli from 4.7.0 to 4.7.2
 2021-06-14 08:52:31 +02:00
Daniël van Noord 9252d10f23 Merge pull request #848 from tsr488/achievementsort 
Adding option to sort buildings by price until next achievement
 2021-06-08 08:57:33 +02:00
Daniël van Noord ee0ed81aba Merge pull request #851 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.1 
Bump prettier from 2.3.0 to 2.3.1
 2021-06-07 10:31:54 +02:00
Daniël van Noord f69fb191d1 Merge pull request #852 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.28.0 
Bump eslint from 7.27.0 to 7.28.0
 2021-06-07 10:31:42 +02:00
Daniël van Noord c0e93f316f Merge pull request #850 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.26.0 
Bump @typescript-eslint/parser from 4.25.0 to 4.26.0
 2021-06-07 10:30:35 +02:00
Daniël van Noord c0e27f3c52 Merge pull request #853 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.26.0 
Bump @typescript-eslint/eslint-plugin from 4.25.0 to 4.26.0
 2021-06-07 09:00:32 +02:00
Daniël van Noord ca796c0b48 Merge pull request #849 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.3 
Bump ts-loader from 9.2.2 to 9.2.3
 2021-06-07 08:58:55 +02:00
Daniël van Noord f84f6fc348 Merge pull request #847 from tsr488/automerge 
Adding auto merge from 'dev' branch to 'gh-pages'
 2021-06-07 08:57:25 +02:00
Daniël van Noord be245da05f Update publish-dev.yml 2021-06-07 08:56:27 +02:00
Daniël van Noord 977c25e77a Update and rename merge-branch.yml to publish-dev.yml 2021-06-07 08:55:16 +02:00
Daniël van Noord 4fb58719d3 Merge pull request #839 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.25.0 
Bump @typescript-eslint/parser from 4.24.0 to 4.25.0
 2021-05-31 11:41:24 +02:00
Daniël van Noord f403f89c20 Merge pull request #840 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.4 
Bump eslint-plugin-import from 2.23.3 to 2.23.4
 2021-05-31 11:39:39 +02:00
Daniël van Noord 18b151d7c0 Merge pull request #841 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.25.0 
Bump @typescript-eslint/eslint-plugin from 4.24.0 to 4.25.0
 2021-05-31 11:38:06 +02:00
Daniël van Noord 73b9ebce7f Merge pull request #838 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.38.1 2021-05-31 11:16:21 +02:00
Daniël van Noord 97624bd4da Merge pull request #842 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.3.2 2021-05-31 09:23:51 +02:00
Daniël van Noord df152fd302 Merge pull request #837 from DanielNoord/autosavetimer 
Add option for autosave timer bar #799
 2021-05-30 16:38:46 +02:00
Daniël van Noord ff31c45a4a Add option for autosave timer bar #799 2021-05-30 16:37:26 +02:00
Daniël van Noord 9ba81afae1 Update README.md 2021-05-30 11:51:27 +02:00
Daniël van Noord 66e906e878 Merge pull request #836 from DanielNoord/tillnextachiev 
Make current season green in Stats section #821
 2021-05-30 11:47:27 +02:00
Daniël van Noord 865fc3b227 Make current season green in Stats section #821 2021-05-30 11:45:51 +02:00
Daniël van Noord 47ebed0925 Merge pull request #835 from DanielNoord/tillnextachiev 
Some optimizations in Left till next achievement calculations
 2021-05-30 10:57:32 +02:00
Daniël van Noord 734f3c38c2 Optimize & fix LeftTillNext calculation #805 #832 2021-05-30 10:55:42 +02:00
Daniël van Noord fcbf1b2377 Simple refactor of calculation 2021-05-30 10:35:33 +02:00
Daniël van Noord 4c6dfbba69 Merge pull request #828 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.2 
Bump ts-loader from 9.1.2 to 9.2.2
 2021-05-24 11:03:57 +02:00
Daniël van Noord 49e9711b7c Merge pull request #830 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.27.0 
Bump eslint from 7.26.0 to 7.27.0
 2021-05-24 11:02:43 +02:00
Daniël van Noord a48ad37b7f Merge pull request #829 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.37.1 
Bump webpack from 5.37.0 to 5.37.1
 2021-05-24 11:02:19 +02:00
Daniël van Noord 974b948583 Merge pull request #827 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.24.0 
Bump @typescript-eslint/eslint-plugin from 4.23.0 to 4.24.0
 2021-05-24 09:21:50 +02:00
Daniël van Noord d054b55ddc Merge pull request #826 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.24.0 
Bump @typescript-eslint/parser from 4.23.0 to 4.24.0
 2021-05-24 09:19:11 +02:00
Daniël van Noord f431d2b6be Merge pull request #825 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.3 
Bump eslint-plugin-import from 2.23.2 to 2.23.3
 2021-05-24 09:15:01 +02:00
Daniël van Noord 68ad398b27 Merge pull request #824 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.0.0 
Bump ts-node from 9.1.1 to 10.0.0
 2021-05-24 09:13:26 +02:00
Daniël van Noord ae6db8f330 Merge pull request #820 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.23.0 
Bump @typescript-eslint/parser from 4.22.1 to 4.23.0
 2021-05-17 13:28:38 +02:00
Daniël van Noord 74cdb613ca Merge pull request #819 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.23.0 
Bump @typescript-eslint/eslint-plugin from 4.22.1 to 4.23.0
 2021-05-17 13:17:43 +02:00
Daniël van Noord 4eae4598a7 Merge pull request #818 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.2 
Bump eslint-plugin-import from 2.22.1 to 2.23.2
 2021-05-17 13:17:21 +02:00
Daniël van Noord d9ef469980 Merge pull request #817 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.37.0 
Bump webpack from 5.36.2 to 5.37.0
 2021-05-17 13:16:24 +02:00
Daniël van Noord 1a520b4d52 Merge pull request #814 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.22.1 
Bump @typescript-eslint/parser from 4.22.0 to 4.22.1
 2021-05-10 14:06:06 +02:00
Daniël van Noord a3ad66a058 Merge pull request #815 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.0 
Bump prettier from 2.2.1 to 2.3.0
 2021-05-10 14:03:33 +02:00
Daniël van Noord ee3aac59ce Merge pull request #812 from CookieMonsterTeam/dependabot/npm_and_yarn/mocha-8.4.0 
Bump mocha from 8.3.2 to 8.4.0
 2021-05-10 14:03:01 +02:00
Daniël van Noord 598a36493f Merge pull request #813 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.26.0 
Bump eslint from 7.25.0 to 7.26.0
 2021-05-10 13:37:11 +02:00
Daniël van Noord 19edf86751 Merge pull request #808 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.7.0 2021-05-10 13:02:08 +02:00
Daniël van Noord 28857220f3 Merge pull request #811 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.1.2 2021-05-10 13:01:14 +02:00