- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none
[CL 8321295 by Josh Markiewicz in Main branch]
[at]Daniel.Lamb [at]Thomas.Ross
#ROBOMERGE-SOURCE: CL 8233628 via CL 8233646 via CL 8242228
#ROBOMERGE-BOT: (v401-8057353)
[CL 8242320 by justin marcus in Main branch]
[at]Thomas.Rosss
#ROBOMERGE-SOURCE: CL 8213125 via CL 8213127 via CL 8220902
#ROBOMERGE-BOT: (v401-8057353)
[CL 8221187 by justin marcus in Main branch]
- Add TestUpdateContent() which simulates calling RequestUpdateContent() and returns which bundles are already enqueued and which bundles would be enqued. This allows code to wait on bundles and setup progress tracking without having to be responsible for requesting them.
#JIRA
[at]Daniel.Lamb
#ROBOMERGE-SOURCE: CL 8192682 via CL 8194174 via CL 8207963
#ROBOMERGE-BOT: (v401-8057353)
[CL 8208128 by justin marcus in Main branch]
[at]Daniel.Lamb [at]Thomas.Ross
#ROBOMERGE-SOURCE: CL 8129730 via CL 8129735 via CL 8133455
#ROBOMERGE-BOT: (v401-8057353)
[CL 8159454 by justin marcus in Main branch]
[at]Thomas.Ross [at]Daniel.Lamb
#ROBOMERGE-SOURCE: CL 7842003 via CL 7842009 via CL 7842010 via CL 7860819
#ROBOMERGE-BOT: (v389-7813075)
[CL 7860867 by justin marcus in Main branch]
[at]Thomas.Ross
#ROBOMERGE-SOURCE: CL 7660983 via CL 7662130 via CL 7667013
#ROBOMERGE-BOT: (v372-7473910)
[CL 7667319 by justin marcus in Main branch]
#rb none
#tests iOS Client
[CODEREVIEW] [at]Justin.Marcus
#ROBOMERGE-SOURCE: CL 7479216 via CL 7479218 via CL 7479219 via CL 7499866 via CL 7547002
#ROBOMERGE-BOT: (v372-7473910)
[CL 7547285 by thomas ross in Main branch]
#rb none
#tests Android Classic Client
[CODEREVIEW] [at]Justin.Marcus
#ROBOMERGE-SOURCE: CL 7460598 via CL 7460605 via CL 7460610 via CL 7462708 via CL 7468236
#ROBOMERGE-BOT: (v371-7306989)
[CL 7468360 by thomas ross in Main branch]
[REVIEW] [at]Thomas.Ross
#ROBOMERGE-SOURCE: CL 7327686 via CL 7327688 via CL 7327689 via CL 7327694 via CL 7396370
#ROBOMERGE-BOT: (v371-7306989)
[CL 7397777 by justin marcus in Main branch]
- Fixing Bug where we prematurely show status as Finished and then correct to show an earlier correct status.
- Fixing Bug where we were not resetting the bRequiredUpdate flag when calling SetBundlesToTrackFromContentState multiple times
- Adding bBundleRequiresUpdate bool to the current content state.
- Renaming CompilingShaders CombinedState to Finishing to match BundleManager progress better. Removed NoUpdateRequired state and replaced it with an accurate state and the bRequiredUpdate flag.
Fortnite
- Update calls to match above changes
- Fix bug where we would not show correct text during Shader Compilation
- Fix bug where we would show bad progress when mounting data when no updates are required.
#test iOS Client, Android Client
#rb Justin.Marcus
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7300373 via CL 7300377 via CL 7300378 via CL 7300379 via CL 7309265 via CL 7316935
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7363200 by thomas ross in Dev-Anim branch]
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: peter.knepley
#ROBOMERGE-SOURCE: CL 7277667 via CL 7277669 via CL 7280718 via CL 7280738 via CL 7286815 via CL 7286953
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7353824 by peter knepley in Dev-Anim branch]
#tests iOS Client compile
#rb none
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7277580 via CL 7277589 via CL 7280572 via CL 7280590 via CL 7286612 via CL 7286777
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7353737 by thomas ross in Dev-Anim branch]
Adding Move Constructor implementation first pass for BundlePreReqCombinedStatusHelper.
#tests iOS Client
#rb none
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7273037 via CL 7273038 via CL 7275129 via CL 7276482 via CL 7284262 via CL 7284379
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7351187 by thomas ross in Dev-Anim branch]
Fixing ensure when bundles you aren't tracking complete while running a BundlePrereqCombinedStatusHelper
#tests iOS Client
#rb none
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7251859 via CL 7251976 via CL 7257141 via CL 7257188 via CL 7266631 via CL 7266730
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7338576 by thomas ross in Dev-Anim branch]
#tests none
#rb none
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7245889 via CL 7245895 via CL 7247142 via CL 7247194
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7332778 by thomas ross in Dev-Anim branch]
#tests none
#rb none
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7244883 via CL 7244890 via CL 7247140 via CL 7247193
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7332770 by thomas ross in Dev-Anim branch]
Adding helper class to monitor bundle + prereq status as a single %.
#tests iOS Client
#rb none
[CODEREVIEW] [at]Justin.Marcus,[at]Daniel.Lamb
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 7238071 via CL 7238129 via CL 7247123 via CL 7247172
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v371-7306989)
[CL 7332742 by thomas ross in Dev-Anim branch]
- Fixing Bug where we prematurely show status as Finished and then correct to show an earlier correct status.
- Fixing Bug where we were not resetting the bRequiredUpdate flag when calling SetBundlesToTrackFromContentState multiple times
- Adding bBundleRequiresUpdate bool to the current content state.
- Renaming CompilingShaders CombinedState to Finishing to match BundleManager progress better. Removed NoUpdateRequired state and replaced it with an accurate state and the bRequiredUpdate flag.
Fortnite
- Update calls to match above changes
- Fix bug where we would not show correct text during Shader Compilation
- Fix bug where we would show bad progress when mounting data when no updates are required.
#test iOS Client, Android Client
#rb Justin.Marcus
#ROBOMERGE-SOURCE: CL 7300373 via CL 7300377 via CL 7300378 via CL 7300379 via CL 7309265
#ROBOMERGE-BOT: (v371-7306989)
[CL 7316935 by thomas ross in Main branch]
#ROBOMERGE-SOURCE: CL 7277667 via CL 7277669 via CL 7280718 via CL 7280738 via CL 7286815
#ROBOMERGE-BOT: (v369-7254125)
[CL 7286953 by peter knepley in Main branch]
#tests iOS Client compile
#rb none
#ROBOMERGE-SOURCE: CL 7277580 via CL 7277589 via CL 7280572 via CL 7280590 via CL 7286612
#ROBOMERGE-BOT: (v369-7254125)
[CL 7286777 by thomas ross in Main branch]
Adding Move Constructor implementation first pass for BundlePreReqCombinedStatusHelper.
#tests iOS Client
#rb none
#ROBOMERGE-SOURCE: CL 7273037 via CL 7273038 via CL 7275129 via CL 7276482 via CL 7284262
#ROBOMERGE-BOT: (v369-7254125)
[CL 7284379 by thomas ross in Main branch]
