Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #320

Merged
merged 14 commits into from
Jun 2, 2023
Merged

Merge master into develop #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
69835d2
Chore: Allow 000*.rpy files in renpy/common (#300)
a2937 May 7, 2023
c2bea06
RunRenpyViaplugin (#291)
seanj29 May 7, 2023
8bc721a
Ignore dist folder (#303)
duckdoom4 May 12, 2023
3aff52c
Ignore dist folder (#301)
duckdoom4 May 12, 2023
f62be5d
Chore(Enhancement) - Add a command that cleans up compiled files.
a2937 May 12, 2023
d7d98d5
Update the command title to match the convention.
a2937 May 12, 2023
4a584eb
Use await/async syntax
a2937 May 12, 2023
ae913ac
Merge pull request #304 from a2937/old-file-command
LuqueDaniel May 12, 2023
e981aa5
Adds PR ci to master
LuqueDaniel May 13, 2023
f2a94a3
Fixes codeql-analysis.yml format
LuqueDaniel May 13, 2023
65b41f7
Adds setup action
LuqueDaniel May 13, 2023
9f1f558
Merge pull request #308 from LuqueDaniel/adds-pr-check-to-master
LuqueDaniel May 13, 2023
babb1f7
Merge branch 'master' into develop
duckdoom4 Jun 2, 2023
8442ec0
Fix package lock after merge
duckdoom4 Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/pr-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: PR Check

on:
pull_request:
branches:
- master
- develop

env:
NODE_VERSION: 16
Expand Down
235 changes: 233 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
"webpack": "^5.72.1",
"webpack-cli": "^4.9.2",
"vsce": "^2.9.2",
"prettier": "^2.7.1"
"prettier": "^2.7.1",
"@vscode/vsce": "^2.15.0"
}
}