david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,390 Commits 9 Branches 44 Tags
1842c40c01c6589fee468bff145eddca8514b8ed
Commit Graph

1390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot]
f89a685c49 Bump @typescript-eslint/eslint-plugin from 4.28.3 to 4.28.4 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.28.3 to 4.28.4.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.4/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-20 16:14:24 +00:00
github-actions[bot]
d776b9b799 [Automated] Merge dev into gh-pages 2021-07-20 16:11:47 +00: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
github-actions[bot]
055ba22ee2 [Automated] Merge dev into gh-pages 2021-07-20 06:13:35 +00: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
github-actions[bot]
52edc5696a [Automated] Merge dev into gh-pages 2021-07-19 20:02:19 +00: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
github-actions[bot]
fde93b5639 [Automated] Merge dev into gh-pages 2021-07-19 14:55:05 +00: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
github-actions[bot]
ab7a092ab9 [Automated] Merge dev into gh-pages 2021-07-19 05:59:54 +00: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
dependabot[bot]
451ed9ee7a Bump @typescript-eslint/eslint-plugin from 4.28.2 to 4.28.3 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.28.2 to 4.28.3.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.3/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 05:58:12 +00:00
github-actions[bot]
6ac737d3af [Automated] Merge dev into gh-pages 2021-07-19 05:57:44 +00: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
github-actions[bot]
85b6d96be6 [Automated] Merge dev into gh-pages 2021-07-19 05:57:21 +00: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
dependabot[bot]
984c11e2ac Bump @typescript-eslint/parser from 4.28.2 to 4.28.3 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.28.2 to 4.28.3.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.3/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 02:15:16 +00:00
dependabot[bot]
e3eccf25e8 Bump eslint from 7.30.0 to 7.31.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.30.0 to 7.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.30.0...v7.31.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 02:14:53 +00:00
dependabot[bot]
85b161fe14 Bump webpack from 5.44.0 to 5.45.1 
Bumps [webpack](https://github.com/webpack/webpack) from 5.44.0 to 5.45.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.44.0...v5.45.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 02:13:55 +00:00
github-actions[bot]
a497dec741 [Automated] Merge dev into gh-pages 2021-07-11 10:57:24 +00: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
github-actions[bot]
28bc2b5620 [Automated] Merge dev into gh-pages 2021-07-05 14:04:19 +00: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
github-actions[bot]
531adb2a16 [Automated] Merge dev into gh-pages 2021-07-05 08:10:57 +00: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