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

1427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël van Noord
60f19e5084 Merge pull request #912 from CookieMonsterTeam/dev 
Bump master to 2.031.10
2.031.10 		2021-07-25 15:33:37 +02:00
dependabot[bot]
525ea72174 Bump ts-loader from 9.2.3 to 9.2.4 
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 9.2.3 to 9.2.4.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v9.2.3...v9.2.4)

---
updated-dependencies:
- dependency-name: ts-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-25 13:33:17 +00:00
github-actions[bot]
2489eb16ac [Automated] Merge dev into gh-pages 2021-07-25 13:32:56 +00: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
github-actions[bot]
89f895f01e [Automated] Merge dev into gh-pages 2021-07-25 13:28:39 +00: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
github-actions[bot]
7d40e12472 [Automated] Merge dev into gh-pages 2021-07-22 20:19:02 +00: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
dependabot[bot]
7c26b8015a Bump @types/mocha from 8.2.3 to 9.0.0 
Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 8.2.3 to 9.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-22 20:15:37 +00:00
github-actions[bot]
ce768cb135 [Automated] Merge dev into gh-pages 2021-07-22 20:12:43 +00:00
Daniël van Noord
1f219df674 Merge branch 'gh-pages' into dev 2021-07-22 22:12:28 +02:00
github-actions[bot]
8280d3ae7a [Automated] Merge dev into gh-pages 2021-07-22 20:07:49 +00: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
github-actions[bot]
038a8b33b0 [Automated] Merge dev into gh-pages 2021-07-22 20:05:18 +00:00
Daniël van Noord
6395ad318a Update README.md 2021-07-22 22:05:04 +02:00
github-actions[bot]
ed0049e367 [Automated] Merge dev into gh-pages 2021-07-22 20:00:26 +00:00
Daniël van Noord
bbd523ac3f Get latest version of framework 2021-07-22 22:00:03 +02:00
github-actions[bot]
cb1f9d7ca5 [Automated] Merge dev into gh-pages 2021-07-22 19:58:13 +00: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
github-actions[bot]
6fcece6fc8 [Automated] Merge dev into gh-pages 2021-07-20 18:43:28 +00: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
dependabot[bot]
10c1e9eefb Bump @typescript-eslint/parser from 4.28.3 to 4.28.4 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) 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/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.4/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-20 18:42:19 +00:00
github-actions[bot]
4c4ef57ce4 [Automated] Merge dev into gh-pages 2021-07-20 18:41:37 +00: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
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