Skip to content

Commit

Permalink
Merge pull request #766 from Unity-Technologies/develop
Browse files Browse the repository at this point in the history
release
  • Loading branch information
SamuelBellomo authored Oct 6, 2022
2 parents 554bbeb + 6829370 commit 9bdfe99
Show file tree
Hide file tree
Showing 714 changed files with 56,923 additions and 18,725 deletions.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
- [ ] All commits are accompanied by meaningful commit messages
- [ ] JIRA ticket ID is in the PR title or at least one commit message
- [ ] Include the ticket ID number within the body message of the PR to create a hyperlink
- [ ] An Index entry has been added in readme.md if applicable

8 changes: 4 additions & 4 deletions .yamato/mobile-build-and-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
- chmod +x ./utr
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime

artifacts:
players:
Expand Down Expand Up @@ -48,7 +48,7 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:
- unity-downloader-cli -c Editor -c Android -u {{ editor }} --fast --wait
# Build player(s)
- set UTR_VERSION=0.12.0
- ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
- ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --testfilter=Unity.BossRoom.Tests.Runtime
artifacts:
players:
paths:
Expand Down Expand Up @@ -86,7 +86,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
# Give UTR execution permissions
- chmod +x ./utr
# Run the test build on the device
- ./utr --suite=playmode --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
- ./utr --suite=playmode --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --testfilter=Unity.BossRoom.Tests.Runtime

artifacts:
logs:
Expand Down Expand Up @@ -119,7 +119,7 @@ mobile_test_android_{{ project.name }}_{{ editor }}:
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
set UTR_VERSION=0.12.0
./utr --artifacts_path=build/test-results --testproject={{ project.path }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=android --player-connection-ip=%BOKKEN_HOST_IP% --player-load-path=build/players --testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
./utr --artifacts_path=build/test-results --testproject={{ project.path }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=android --player-connection-ip=%BOKKEN_HOST_IP% --player-load-path=build/players --testfilter=Unity.BossRoom.Tests.Runtime
# Set uploadable artifact paths
artifacts:
logs:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/project-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
- unity-downloader-cli -u {{ editor }} -c editor -w --fast
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg=--testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg=--testfilter=Unity.BossRoom.Tests.Runtime
artifacts:
logs:
paths:
Expand Down
320 changes: 245 additions & 75 deletions ARCHITECTURE.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Archer/ArcherBaseAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Archer/ArcherBaseAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Archer/ArcherChargedShot.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Archer/ArcherChargedShot.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Archer/ArcherVolley.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Archer/ArcherVolley.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Boss/BossImpBaseAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Boss/BossImpBaseAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Boss/BossImpTrampleAttack.asset
Git LFS file not shown

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Chase.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Chase.asset.meta

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

3 changes: 3 additions & 0 deletions Assets/GameData/Action/General/Drop.asset
Git LFS file not shown

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote1.asset
Git LFS file not shown
13 changes: 1 addition & 12 deletions Assets/GameData/Action/General/Emote1.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote2.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Emote2.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote3.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Emote3.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote4.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Emote4.asset.meta

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

3 changes: 3 additions & 0 deletions Assets/GameData/Action/General/Pick Up.asset
Git LFS file not shown

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Revive.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Revive.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Stunned.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Stunned.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Target.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Target.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Imp/ImpBaseAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Imp/ImpBaseAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Mage/MageBaseAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Mage/MageBaseAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Mage/MageHeal.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Mage/MageHeal.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Rogue/RogueBaseAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Rogue/RogueBaseAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Rogue/RogueDashAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Rogue/RogueDashAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Rogue/RogueStealthMode.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Rogue/RogueStealthMode.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankBaseAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankBaseAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankShieldBuff.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankShieldBuff.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankShieldRush.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankShieldRush.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankTestAoeAttack.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankTestAoeAttack.asset.meta

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/VandalImp/ImpToss.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/VandalImp/ImpToss.asset.meta

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

Loading

0 comments on commit 9bdfe99

Please sign in to comment.