Skip to content

Commit aa585e2

Browse files
Merge pull request #83 from Unity-Technologies/develop
release: Bitesize samples v.1.1.0 release
2 parents 36e9d19 + d2405e3 commit aa585e2

File tree

542 files changed

+83259
-4450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

542 files changed

+83259
-4450
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### Description
2+
<!---
3+
Please provide a description of the changes proposed in the pull request.
4+
Make sure your commit messages have meaningful information.
5+
To help us link commits and PRs to JIRA work items, please include the JIRA ticket ID in the PR title or at least of your commit messages.
6+
-->
7+
8+
### Issue Number(s)
9+
<!---
10+
Provide a list of fixed issues from Jira (MTT-ticketnumber) or GitHub (#issuenumber).
11+
This helps us understand the reasoning behind this change, what it fixes, feature being added, etc.
12+
-->
13+
14+
### Contribution checklist
15+
- [ ] Tests have been added for the project and/or any internal package
16+
- [ ] Release notes have been added to the [project changelog](../CHANGELOG.md) file
17+
- [ ] Pull request has a meaningful description of its purpose
18+
- [ ] All commits are accompanied by meaningful commit messages
19+
- [ ] JIRA ticket ID is in the PR title or at least one commit message
20+
- [ ] Include the ticket ID number within the body message of the PR to create a hyperlink

Basic/2DSpaceShooter/.gitignore

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,50 @@
11
# This .gitignore file should be placed at the root of your Unity project directory
2-
#
32
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4-
#
3+
4+
# A marker file of which existence is used to decide whether to run the first-launch experience or not.
5+
InitCodeMarker
6+
/[Tt]utorial [Dd]efaults/
7+
8+
# Packed templates go here
9+
upm-ci~/
10+
upm-ci.log
11+
12+
# Never ignore Asset meta data...
13+
!/[Aa]ssets/**/*.meta
14+
15+
# User's project-specific settings implemented using Settings Manager
16+
/ProjectSettings/Packages
17+
18+
# The rest are general best practices for Unity projects
19+
/.Editor/
520
/[Ll]ibrary/
621
/[Tt]emp/
722
/[Oo]bj/
823
/[Bb]uild/
924
/[Bb]uilds/
1025
/[Ll]ogs/
11-
/[Uu]ser[Ss]ettings/
12-
/[Pp]ackages/*
13-
!/[Pp]ackages/manifest.json
14-
15-
# output dir
16-
/[Bb]in/
17-
18-
# MemoryCaptures can get excessive in size.
19-
# They also could contain extremely sensitive data
2026
/[Mm]emoryCaptures/
27+
/[Vv]alidationSuiteResults/
2128

22-
# Asset meta data should only be ignored when the corresponding asset is also ignored
23-
!/[Aa]ssets/**/*.meta
29+
# Project/user-specific settings using Settings Manager
30+
/ProjectSettings/Packages/
31+
# UserSettings introduced in 2020.1
32+
/UserSettings/
2433

2534
# Uncomment this line if you wish to ignore the asset store tools plugin
26-
# /[Aa]ssets/AssetStoreTools*
35+
/[Aa]ssets/AssetStoreTools*
2736

2837
# Autogenerated Jetbrains Rider plugin
29-
/[Aa]ssets/Plugins/Editor/JetBrains*
38+
[Aa]ssets/Plugins/Editor/JetBrains*
39+
40+
# Rider
41+
.idea/
3042

31-
# IDE directories
43+
# Visual Studio cache directory
3244
.vs/
45+
46+
# Visual Studio Code settings directory
3347
.vscode/
34-
.idea/
3548

3649
# Gradle cache directory
3750
.gradle/
@@ -64,15 +77,15 @@ sysinfo.txt
6477

6578
# Builds
6679
*.apk
67-
*.aab
6880
*.unitypackage
6981

7082
# Crashlytics generated file
7183
crashlytics-build.properties
84+
*.orig
85+
*.orig.meta
7286

73-
# Packed Addressables
74-
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
87+
# Ignore build reports
88+
/Assets/BuildReports*
7589

76-
# Temporary auto-generated Android Assets
77-
/[Aa]ssets/[Ss]treamingAssets/aa.meta
78-
/[Aa]ssets/[Ss]treamingAssets/aa/*
90+
# Mac file setting
91+
.DS_Store

Basic/2DSpaceShooter/Assets/Fonts.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)