Skip to content

Commit c13ba78

Browse files
committed
Merge branch 'develop' into sam/feat/bump-NGO-to-1.1
* develop: (60 commits) fix: removing FindObjectOfType for a serialized reference (#754) fix: can click through loading screen [MTT-4753] (#760) Update CHANGELOG.md (#765) feat: Architecture.md update (MTT-2637) (#763) Update README.md (#759) Updating utilities package for release (#764) Version bumps (#761) Updating broken PR links (shouldn't be linked to jira) and changelog fixes (#758) adding components refs to index (#757) Adding link to feedback form at the top (#756) chore: adding details to changelog (#746) Updating readme with Typeform for feedback (#755) made arrow trails smaller (#750) Fixed up some layer settings on some archer VFX so that they show up properly! (#739) fix: lobby UI unblocking before it should [MTT-4579] (#748) feat: PubSub improvement: ISubscriber unsub [MTT-2765] (#612) Fix: Reduction of SSAO Cost (Especially on Mac) [MTT-4558] (#753) fix: Moving utp to component instead of child GameObject (#752) Adding TOC and index to readme [MTT-4617] (#736) Feat: Char Portrait Mouse Hover Feedback [MTT-4754] (#751) ... # Conflicts: # Assets/Prefabs/NetworkingManager.prefab
2 parents 519bd5e + 9b48228 commit c13ba78

File tree

669 files changed

+55031
-16820
lines changed

Some content is hidden

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

669 files changed

+55031
-16820
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions

.yamato/mobile-build-and-run.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
1717
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
1818
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
1919
- chmod +x ./utr
20-
- ./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
20+
- ./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
2121

2222
artifacts:
2323
players:
@@ -48,7 +48,7 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:
4848
- unity-downloader-cli -c Editor -c Android -u {{ editor }} --fast --wait
4949
# Build player(s)
5050
- set UTR_VERSION=0.12.0
51-
- ./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
51+
- ./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
5252
artifacts:
5353
players:
5454
paths:
@@ -86,7 +86,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
8686
# Give UTR execution permissions
8787
- chmod +x ./utr
8888
# Run the test build on the device
89-
- ./utr --suite=playmode --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
89+
- ./utr --suite=playmode --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --testfilter=Unity.BossRoom.Tests.Runtime
9090

9191
artifacts:
9292
logs:
@@ -119,7 +119,7 @@ mobile_test_android_{{ project.name }}_{{ editor }}:
119119
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
120120
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
121121
set UTR_VERSION=0.12.0
122-
./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
122+
./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
123123
# Set uploadable artifact paths
124124
artifacts:
125125
logs:

.yamato/project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
1717
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1818
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1919
- unity-downloader-cli -u {{ editor }} -c editor -w --fast
20-
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg=--testfilter=Unity.Multiplayer.Samples.BossRoom.Tests.Runtime
20+
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg=--testfilter=Unity.BossRoom.Tests.Runtime
2121
artifacts:
2222
logs:
2323
paths:

ARCHITECTURE.md

Lines changed: 245 additions & 75 deletions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:add1740f30f9604edabacd15b1667e7e87e8d87f7e7f460df83283493815be6f
3-
size 1190
2+
oid sha256:88c1c6a212f87c7bddb294289cc6f3350d5550701def4ad1628167418b3c0eec
3+
size 1244

Assets/GameData/Action/Archer/ArcherBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d5bca5771f0ced01f42172068b0ca0d333e1de8f48a0e8211ff7b052c660226f
3-
size 1747
2+
oid sha256:a900c47508ea00231c47ff48371dc4eee2c1fd8db31926b33863f3a7a8953d7c
3+
size 1824

Assets/GameData/Action/Archer/ArcherChargedShot.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2c4317ed0f8ca5e54a3729cb4bec061ff630d0f05860cc9ade9485424e9a847f
3-
size 1197
2+
oid sha256:604af17f516fded57742eca6457cba98500bab260d9e0eecc3d7b0c598021f4d
3+
size 1242

Assets/GameData/Action/Archer/ArcherVolley.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)