birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,295 Commits 3 Branches 3 Tags
564bf0c8192e9f5923bfbd48a8ebf18ef4e5cbb0
Commit Graph

867 Commits

Author SHA1 Message Date
Tommy Walton ade8183473 Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:49:26 -08:00
Tommy Walton e44fa2a52a Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:19 -08:00
Tommy Walton d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:11 -08:00
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:35 -08:00
Tommy Walton 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:22 -08:00
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:18 -08:00
AMZN-nggieber 76b7e73f6f Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting (#5593) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-12 16:23:04 -08:00
Guthrie Adams 520c2b52d4 Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references 
Removing references and builders for legacy MTL assets
 2021-11-12 13:47:50 -06:00
Alex Peterson c0df1846f4 Create desktop shortcut functionality (#5536) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-12 11:03:43 -08:00
Guthrie Adams 92c0e598d5 Starting to remove MTL asset references 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 19:20:04 -06:00
AMZN-Phil 0b211d3743 Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI 
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
 2021-11-11 14:01:42 -08:00
nggieber 2b248ac485 Fix merge issue and validation issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-11 12:09:24 -08:00
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-11 11:52:49 -08:00
Steve Pham cbe2948ba8 Merge pull request #5555 from aws-lumberyard-dev/ghi-4320/ProjectManagerLinuxDefaultClang 
Project Manager Fixes for Linux
 2021-11-11 11:21:06 -08:00
nggieber d71196102f More PR feedback changes 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-11 10:20:46 -08:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-11 10:15:52 -08:00
Steve Pham 289d783f25 Fixes for Project Manager on Linux 
- Fix error with EngineFinder using the wrong path to locate project.json
- Simplified and expanded clang detection
- Remove forcing clang-12 for builds and will rely on the new cmake detection of clang by default

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-11 09:41:45 -08:00
AMZN-Phil c07b666bec Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes 2021-11-11 08:19:21 -08:00
AMZN-stankowi 6e70097ad7 Fixed all errors with default seeds (#5489) 
* Cleaning up errors with default assets, used in bundled release builds

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated simple asset references to be to the product, not source assets

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-11-11 07:50:25 -08:00
AMZN-stankowi 2df8d5b620 Fixed crash if you save a bundle outside the default bundle folder (#4974) (#5255) 
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-11-11 07:50:16 -08:00
AMZN-Phil 0b6c3382f1 Add an additional comment 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 16:05:38 -08:00
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-10 15:29:20 -08:00
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-10 12:49:22 -08:00
AMZN-Phil 0bc3e6a18f Let cart overlay be opened to view downloads even when there are no gems to be added or removed 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 12:33:28 -08:00
nggieber f470351d0c Hook up Gem Updating and Uninstallation and fix lots of minor bugs between gem catalog and gem repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-10 12:33:24 -08:00
amzn-mike 61d0ec9d6b Remove debug messages. (#5429) 
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-10 13:22:47 -06:00
amzn-mike e0cc86e898 Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead (#5216) (#5381) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit b3301414ad)

# Conflicts:
#	Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
 2021-11-10 13:21:42 -06:00
AMZN-Phil 541e501b06 Re-add the line to open the cart overlay automatically when a new download starts 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 10:56:44 -08:00
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 08:44:24 -08:00
Alex Peterson 461b63c61a Temporarily disable the platform filter (#5454) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-09 14:14:13 -08:00
AMZN-Phil c7e5a0fe12 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/clouddownloadicon 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-09 11:39:51 -08:00
nggieber a253bfc2f5 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-09 11:36:32 -08:00
AMZN-Phil e9c3a453c5 Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates 
Add ability to overwrite o3de object when downloading
 2021-11-09 10:41:35 -08:00
Scott Romero e30b0f51d1 [development] Android compatibility fixes (#5424) 
- Added support for NDK r23
 - Added support for the versioned Android 'cmdline-tools' package which replace the deprecated 'tools' package
 - Updated max Gradle version to latest point release of 7.0 to fix volume query bug during sync in some configurations
 - Updated min Android Gradle plugin version to latest point release of 4.2
 - Fixed issue with Gradle task chaining for some custom copy tasks
 - Replaced use of deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template
 - Increased debug logging around adb calls in Android deployment script
 - Fixed a couple try/except cases that were looking for the wrong exception when invoking adb_* functions
 - Fixed issue where asset cache would get deleted when regenerating an existing Android Gradle project with --overwrite-existing
 - Fixed issues with running Android project generation scripts on Unix systems

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-11-09 10:32:44 -08:00
nggieber d5ae98496c Full UI Built for Updating and Uninstalling Gems 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-09 10:26:37 -08:00
lumberyard-employee-dm 5fc4551ac0 [LYN-8041] Enable relocation of the Project Game Release Layout (#5380) 
* Enable relocation of the Project Game Release Layout

Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected

Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.

Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called

Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Protect against an empty list of artifacts to remove when generating the
engine.pak

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-09 12:03:52 -06:00
Alex Peterson d053a03b5f Don't update status filter when filling gem model (#5427) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-09 09:38:23 -08:00
AMZN-ScottR 5f7aee0814 Merge branch 'development' into android_compat_fixes 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-09 07:53:13 -08:00
Tom Hulton-Harrop 5047ba7f7b merge stabilization/2110 to development - 2021/11/09 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-09 09:19:54 +00:00
Chris Burel 33d5109fe8 Merge stabilization/2110 as of 20edb35cdc into development (#5319) 2021-11-08 15:22:17 -08:00
AMZN-ScottR c5cd7f7fb8 [android_compat_fixes] replaced deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:40 -08:00
Alex Peterson 431f80510f Merge pull request #5414 from aws-lumberyard-dev/Prism/DisplayAddGemInfo 
Fix Additional Gem Info Handling and Display
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-08 12:20:18 -08:00
nggieber 14a1206274 Add additional info handling and proper display for gems 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-08 08:17:28 -08:00
Alex Peterson a297ceece4 Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-05 17:38:45 -07:00
Alex Peterson 0295aa7070 revert change to cancel label href 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-05 17:31:01 -07:00
Alex Peterson 21c02b195f Update signals/slots to match upstream changes 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-05 17:24:08 -07:00
Alex Peterson 4ce39ea167 Fix tags, downloads, and several vector copies 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-05 17:17:11 -07:00
AMZN-Phil c6e77f8e32 Code readability improvements 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-05 14:21:10 -07:00
amzn-mike 1399159908 Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object (#5176) (#5348) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 916fb413c9)
 2021-11-05 12:39:11 -07:00
Chris Galvan fdc56b4a57 Merge pull request #5337 from aws-lumberyard-dev/cgalvan/MakeProcessingOverlayWidgetAlwaysOnTop 
Set window flags so the processing overlay widget always appears on top.
 2021-11-04 20:59:21 -05:00