birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,767 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '199a59e8f9'
${ noResults }
Commit Graph

841 Commits (199a59e8f9824cef4a5c0ac3da1683bb7ded66a6)

Author SHA1 Message Date
Alex Peterson 4ad6d3e9f7
Updated project manager backgrounds (#5770) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 7787ceb04c Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil c375f07339
Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart 
Display Gem Cart in Gem Catalog Right Panel
 4 years ago
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil 95c8398c79
Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton 
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
 4 years ago
AMZN-nggieber 7de4628747
Merge branch 'stabilization/2110' into Prism/FixGemCart 4 years ago
nggieber 8d26251c93 Include DownloadController 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Qing Tao d0ebe4ee10
Follow up fix for ATOM-13512 (#5689) 
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 4 years ago
AMZN-Phil a7e90fd6c8 Fix copy paste variable name 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Chris Burel 9f9aa8f2a6
[Linux] Avoid duplicating inotify watches in forked AssetBuilder processes (#5683) 
The AssetProcessor on Linux uses `inotify` to monitor for file updates.
The AssetProcessor also uses a `ProcessWatcher` to launch child
AssetBuilder processes. `ProcessWatcher` accomplishes this by calling
`fork()`, which duplicates the current process, then calling `exec()`.
The `fork()` call also appears to duplicate any inotify fds. This
results in the subprocess consuming duplicate inotify watches, which is
a limited system resource (Ubunut 20 defaults
`/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor
still has issues with this max, but this should free up at least half of
the uses.

Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
AMZN-Phil ba5102b37d Change to optionally show all python error strings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber dcd50d90c9 Forward declared QVBoxLayout 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber c2308de8ee Added in missed suggestions from previous PR 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber a3d3423ff7 Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 4 years ago
nggieber de67bb70c9 Added comment why GemRepos isn't included in ContainsScreen 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 95da89d0cc Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 4 years ago
AMZN-nggieber 0d17e575a7
Fix: Display Repo Gems on Repo Screen Correctly (#5638) 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 5d2be299d8 Moved includes to forward declarations on GemCatalogScreen 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Qing Tao 2ae8477683
ATOM-13512 Altering IBL ImageProcessor .preset Does Not Force Assets to Rebuild (#5639) 
Changes include:
- Move config files from ImageProcessingAtom/Config/ folder to ImageProcessingAtom/Assets/Config/ folder so it can be watched as source depencies.
- Change GetSuggestedPreset function so it can return certain preset for certain file name.
- Move file mask mappings from preset to ImageBuilder.settings. But the file masks in preset can still be used.
- Changed from using project config folder's imageBuilder.Settings for override to using it as json merge patch.
- Expose GetFileHash function in AssetBuilderSDK api.


Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 4 years ago
Alex Peterson fc805594d0
Fixes for misc gem download issues (#5665) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber df36067ef3 Configure gems option added to projects button to go directly to gem catalog 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 1aae84537d Makes project settings screen scrollable 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 4854023eb1
Merge pull request #5592 from aws-lumberyard-dev/Prism/ShowProjectBuildReq 
Store whether O3DE Project Manager built the project successfully
 4 years ago
nggieber cb5c4256c7 Fix license text eliding 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 7f57548023 Adds triangle under cart button when cart is shown 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 18cf128854 Remove some code duplication 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber 1ed0e09399 Merge branch 'stabilization/2110' into Prism/FixGemCart 4 years ago
nggieber e62af4260b Moves Cart to Right Panel with Gem Inspector 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 07c142b975 Remove temporary changes and remove key before building 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
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>
 4 years ago
Guthrie Adams 520c2b52d4
Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references 
Removing references and builders for legacy MTL assets
 4 years ago
Alex Peterson c0df1846f4
Create desktop shortcut functionality (#5536) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Guthrie Adams 92c0e598d5 Starting to remove MTL asset references 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
AMZN-Phil bc20208f13 Create file in project directory on successful build for Project Manager 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
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
 4 years ago
nggieber 2b248ac485 Fix merge issue and validation issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
Steve Pham cbe2948ba8
Merge pull request #5555 from aws-lumberyard-dev/ghi-4320/ProjectManagerLinuxDefaultClang 
Project Manager Fixes for Linux
 4 years ago
nggieber d71196102f More PR feedback changes 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
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>
 4 years ago
AMZN-Phil c07b666bec Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes 4 years ago
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>
 4 years ago
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>
 4 years ago
AMZN-Phil 0b6c3382f1 Add an additional comment 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
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>
 4 years ago
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>
 4 years ago