david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,404 Commits 9 Branches 44 Tags
1cde6308fa4194c71f8b274fa61d838ac5615959
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël van Noord 488233c8dd Merge pull request #979 from Pidgeot/dev 
Disable automatic sizing on grimoire bar to allow text to fit
 2021-09-05 20:15:11 +02:00
Daniël van Noord a89f1eed1a Update src/Main/ReplaceGameElements/NativeGrimoire.js 2021-09-05 20:13:58 +02:00
Daniël van Noord 60121c0be5 Merge pull request #977 from dmytrokyrychuk/short-time-format 
Add short time format
 2021-09-05 17:34:51 +02:00
Daniël van Noord c7d9144dd2 Rebuild CookieMonster files 2021-09-05 17:33:49 +02:00
Daniël van Noord aa5cad663b Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format 2021-09-05 17:33:29 +02:00
Daniël van Noord b191d9a434 Fix Grimoire bar on Steam 2021-09-05 17:31:23 +02:00
Daniël van Noord 1842c40c01 Rebuild CookieMonster files 2021-09-05 17:28:59 +02:00
Daniël van Noord 9c005b2f2f Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format 2021-09-05 17:23:37 +02:00
Daniël van Noord b74ae3eee0 Change order of Steam delay 2021-09-05 13:02:04 +02:00
Daniël van Noord e4267f4c41 Merge pull request #970 from DanielNoord/dev 
Fix Steam delay
 2021-09-04 16:18:25 +02:00
Daniël van Noord 62dc882e5a Fix the delay for Steam 2021-09-04 16:16:28 +02:00
Daniël van Noord f7e7d171e8 Increase delay for steam to 2000ms 2021-09-04 15:45:49 +02:00
Daniël van Noord b1ec82b4b8 Merge pull request #962 from CookieMonsterTeam/dev 
Add delay for steam
 2021-09-03 12:41:00 +02:00
Daniël van Noord 669b5c1dd9 Merge branch 'gh-pages' into dev 2021-09-03 12:40:53 +02:00
Daniël van Noord f67b561990 Add delay for steam 2021-09-03 12:38:38 +02:00
Daniël van Noord c4812ef8fc Add a delay for loading in Steam 2021-09-03 12:34:53 +02:00
Daniël van Noord 2940d1c631 Merge pull request #955 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.4.2 
Bump typescript from 4.3.5 to 4.4.2
 2021-09-02 23:00:00 +02:00
Daniël van Noord 029c25f48e Merge pull request #956 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.30.0 
Bump @typescript-eslint/parser from 4.29.1 to 4.30.0
 2021-09-02 22:58:23 +02:00
Daniël van Noord 518aff7ca7 Merge pull request #957 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.51.2 
Bump webpack from 5.50.0 to 5.51.2
 2021-09-02 22:57:51 +02:00
Daniël van Noord 295771bcec Merge pull request #954 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.30.0 
Bump @typescript-eslint/eslint-plugin from 4.29.3 to 4.30.0
 2021-09-02 22:56:04 +02:00
Daniël van Noord 612ab6a6f5 Merge pull request #945 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.2.1 
Bump ts-node from 10.2.0 to 10.2.1
 2021-09-02 22:52:18 +02:00
Daniël van Noord b9fe2aa3fb Merge pull request #947 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.24.2 
Bump eslint-plugin-import from 2.24.0 to 2.24.2
 2021-09-02 22:51:54 +02:00
Daniël van Noord 4b454cc123 Merge pull request #948 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.29.3 
Bump @typescript-eslint/eslint-plugin from 4.29.1 to 4.29.3
 2021-09-02 22:51:44 +02:00
Daniël van Noord 725e053df6 Merge pull request #953 from Urganot/steam-fix 
Steam fix
 2021-09-02 22:51:31 +02:00
Daniël van Noord f4445f7b0a Merge pull request #938 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.5 
Bump ts-loader from 9.2.4 to 9.2.5
 2021-08-16 12:03:25 +02:00
Daniël van Noord 3d99f818ab Merge pull request #937 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.24.0 
Bump eslint-plugin-import from 2.23.4 to 2.24.0
 2021-08-16 12:03:15 +02:00
Daniël van Noord 5f40b2a45e Merge pull request #936 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.8.0 
Bump webpack-cli from 4.7.2 to 4.8.0
 2021-08-16 12:03:02 +02:00
Daniël van Noord df392029ce Merge pull request #935 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.2.0 
Bump ts-node from 10.1.0 to 10.2.0
 2021-08-16 11:55:30 +02:00
Daniël van Noord 001efa24bd Merge pull request #933 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.29.1 
Bump @typescript-eslint/parser from 4.28.4 to 4.29.1
 2021-08-16 11:53:29 +02:00
Daniël van Noord 88952e9986 Merge pull request #924 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.32.0 
Bump eslint from 7.31.0 to 7.32.0
 2021-08-16 11:53:16 +02:00
Daniël van Noord 946d0ff00e Merge pull request #932 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.50.0 
Bump webpack from 5.46.0 to 5.50.0
 2021-08-16 11:53:04 +02:00
Daniël van Noord cb23000caa Merge pull request #934 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.29.1 
Bump @typescript-eslint/eslint-plugin from 4.28.4 to 4.29.1
 2021-08-16 11:52:47 +02:00
Daniël van Noord 97f8e974de Merge pull request #911 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.4 
Bump ts-loader from 9.2.3 to 9.2.4
 2021-07-25 16:22:52 +02:00
Daniël van Noord 42543370b7 Fix Amortization tooltips 2021-07-25 16:20:22 +02:00
Daniël van Noord b736015b1c Merge pull request #913 from CookieMonsterTeam/master 
Merge pull request #912 from CookieMonsterTeam/dev
 2021-07-25 15:39:04 +02:00
Daniël van Noord 60f19e5084 Merge pull request #912 from CookieMonsterTeam/dev 
Bump master to 2.031.10
 2021-07-25 15:33:37 +02:00
Daniël van Noord c455f940c6 Merge pull request #910 from DanielNoord/update 
Bump to 2.031.10
 2021-07-25 15:32:42 +02:00
Daniël van Noord 36780486a1 Bump to 2.031.10 2021-07-25 15:31:08 +02:00
Daniël van Noord 55e3fe536c Merge pull request #909 from DanielNoord/various 
Various
 2021-07-25 15:28:25 +02:00
Daniël van Noord f60ac4889e Add percentage to GC/Reindeer timer 2021-07-25 15:25:17 +02:00
Daniël van Noord 51713afaea Fix building tooltips not updating correctly #893 2021-07-25 14:54:38 +02:00
Daniël van Noord d0ddc93f7c Change to "color" to "colour" 2021-07-25 14:42:21 +02:00
Daniël van Noord 65eff470cf Fix bug with storing locked buildings 2021-07-25 14:41:51 +02:00
Daniël van Noord 9996e59024 Fix upgrade bar not displaying #908 2021-07-25 14:15:16 +02:00
Daniël van Noord f59972892b Add overlay and save to building locking #763 2021-07-25 14:09:37 +02:00
Daniël van Noord 4fe07ba1d3 Fix loading if no previous save is found 2021-07-25 10:33:03 +02:00
Daniël van Noord bedda0093d Merge pull request #906 from CookieMonsterTeam/dependabot/npm_and_yarn/types/mocha-9.0.0 
Bump @types/mocha from 8.2.3 to 9.0.0
 2021-07-22 22:18:47 +02:00
Daniël van Noord 1f219df674 Merge branch 'gh-pages' into dev 2021-07-22 22:12:28 +02:00
Daniël van Noord 3144e776b7 Update package name and version 2021-07-22 22:07:48 +02:00
Daniël van Noord be0edd090d Update packagename 2021-07-22 22:07:19 +02:00
Daniël van Noord 6395ad318a Update README.md 2021-07-22 22:05:04 +02:00
Daniël van Noord bbd523ac3f Get latest version of framework 2021-07-22 22:00:03 +02:00
Daniël van Noord fb0f42deed Get latest version of Framework 2021-07-22 21:57:37 +02:00
Daniël van Noord 74bb5d924d Update CI 2021-07-22 21:53:18 +02:00
Daniël van Noord 065f8b4c23 Move saveClasses to Framework 2021-07-22 21:17:30 +02:00
Daniël van Noord e685489543 Bump packages 2021-07-22 21:10:26 +02:00
Daniël van Noord 6a4772d8e2 Add new build commands 2021-07-22 09:08:24 +02:00
Daniël van Noord bd0a55609d Fix sounds playing at start up #903 2021-07-21 14:42:17 +02:00
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