birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,333 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 'c9f4600bf3'
${ noResults }
Commit Graph

3230 Commits (c9f4600bf38c1d422453fa079a88c973fcbe2bc7)

Author SHA1 Message Date
Alex Peterson 49da85ca3a
Fix new project path when enabling gem (#5173) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Chris Burel 8f56dc10c3
Perform sse float comparisons with the floating-point intrinsics (#5115) 
Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
Danilo Aimini d948d78b2e
Merge pull request #5170 from aws-lumberyard-dev/daimini/cherrypick/outlinerEntityOrderingFix 
Cherry-pick: resolve entity ordering for EntityOutliner
 4 years ago
Michael Pollind 9886603f99 Bug Fix: resolve entity ordering for EntityOutliner (#4798) (#4938) 
* bugifx: resolve dragging behaviour for EntityOutliner (#4798)

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: cleanup and rework logic

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 4 years ago
Guthrie Adams 7ba7928559 Removing redundant registration of script assets 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
AMZN-Igarri d3ff91f153
Fixed memory leak of the in the AssetBrowserComponent (#5132) 
Signed-off-by: igarri <igarri@amazon.com>
 4 years ago
hultonha cf767fd4bd
Fix for 'focus' text appearing incorrectly (#5133) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 4 years ago
Alex Peterson 65d23c7ed6
Merge pull request #5086 from aws-lumberyard-dev/Prism/RefreshRepoButtonDisablesRepo 
Removed Gem Repo Enable Button
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 5db6ffb6f3
Disable custom titlebar on Mac, Linux, fix resize (#4973) (#5114) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson b4dd4c8f02
Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Chris Galvan b2a8e40569
Merge pull request #5100 from aws-lumberyard-dev/cgalvan/GemplateImprovements 
Improvements to C++/Python tool gemplates
 4 years ago
Alex Peterson 6cce184340
Enforce unique gem names in catalog (#5063) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 00a49fa251
Use source model data instead of filtered (#5071) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Tommy Walton f350ba3042
Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project (#5072) 
* Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Removed unnecessary if() statement and updated the comment.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Disabling gem loading in the asset bundler tests, just like the asset bundler itself.

Signed-off-by: Tommy Walton <waltont@amazon.com>
 4 years ago
Chris Galvan e56396a817 Improvements to C++/Python tool gemplates 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Guthrie Adams e5729fbefe Fix clearing material component default material not clearing materials or updating preview 
• Changed thumbnail property control to track asset key even if image is overridden so that it will be restored if the image is cleared.
• Changed property asset control to disable the thumbnail image by default whenever the attribute is applied. It will only enable the thumbnail image if the pixmap is valid.
• Changed the material component controller to always use an empty material assignment map on deactivation so that no persistent materials are reapplied.
• Changed the material component controller to immediately send a notification that materials have updated if no materials were queued for load but the configuration contained pre created or persistent material instances. This mainly affects the material editor because it manages its own material instances.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
nggieber 8117798949 Removed gem repo enable button 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
greerdv 9b2afbc39b fix explicit qualification of member function addresses 
Signed-off-by: greerdv <greerdv@amazon.com>
 4 years ago
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup 
Signed-off-by: greerdv <greerdv@amazon.com>
 4 years ago
Alex Peterson 59c898fc48
Fix notification queue and add gem action (#4985) (#5024) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 3165cf2838
Merge pull request #5011 from aws-lumberyard-dev/Prism/FixGemSelectedFilter 
Gem Catalog Selected Gems Now Filters For Gems to be Enabled in Current Session
 4 years ago
AMZN-Phil 7fc0f14a1b
Merge pull request #5006 from aws-lumberyard-dev/Prism/FixRemovedProjectStillShown 
Fix Issue When Removed Project is Still Shown if it Was The Last Project
 4 years ago
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
AMZN-Phil 856318005c
Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Adds Warning to Add Repo Dialog
 4 years ago
nggieber 866fd8a420 Fix selected gem filtering 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
jonawals a2eca9de3d
Merge pull request #4998 from aws-lumberyard-dev/LYN-5265_state_tracker_impl 
Add Focus Mode integration tests.
 4 years ago
Steve Pham 22a287d046
Fix to set the Taskbar name and Game Launcher window title to the name of the Project (#4986) 
Signed-off-by: Steve Pham <spham@amazon.com>
 4 years ago
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 6b3fc0ff8b
Merge pull request #4981 from aws-lumberyard-dev/Prism/gemdownloadcallfix 
Re-add call used to initiate gem download
 4 years ago
Chris Burel f3499011ac
[Mac] Fix QtEditorApplication_mac include (#4978) 
Commit 8e03d6f306 missed updating the
platform-specific mac QApplication implementation file to include the
class declaration from the new header.

Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
nggieber 77d05b0bc9 Merge branch 'stabilization/2110' into Prism/RemoteGemWarning 4 years ago
John c2105b0631 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 4 years ago
nggieber 75ebf77b59 Added warning message when adding repositories 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Danilo Aimini 1bc2968330
Resolve minor hover state bugs on the Entity Outlier (branches detect hover state separately from the rest of the columns) (#4977) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
AMZN-Phil 423693d16b Re-add call used to initiate gem download 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Danilo Aimini 3b4b8c3549
Move the initialization of m_editorEntityUiInterface higher so that it's initialized when the interface is set up. (#4972) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
John f98d2e55aa Refactor component mode query. 
Signed-off-by: John <jonawals@amazon.com>
 4 years ago
John 99b840652d Add Focus Mode integration tests. 
Signed-off-by: John <jonawals@amazon.com>
 4 years ago
AMZN-Igarri e970247fc5
Asset Browser Search View fixes (#4814) 
* Fixed RowCount method.

Signed-off-by: igarri <igarri@amazon.com>

* Fixed Signals

Signed-off-by: igarri <igarri@amazon.com>

* Fixed Delegate case

Signed-off-by: igarri <igarri@amazon.com>

* Fixed issue when displaying branch icons

Signed-off-by: igarri <igarri@amazon.com>

* Fixed AssetBrowser Delegate

Signed-off-by: igarri <igarri@amazon.com>

* Removed optimize flags

Signed-off-by: igarri <igarri@amazon.com>

* AssetBrowsertableModel cleanup

Signed-off-by: igarri <igarri@amazon.com>

* Fixed Typos

Signed-off-by: igarri <igarri@amazon.com>

* Fixed Comment

Signed-off-by: igarri <igarri@amazon.com>

* Added check for rowCount == 0

Signed-off-by: igarri <igarri@amazon.com>
 4 years ago
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
AMZN-Phil e8a7743aec
Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos 
Gem Repos can be Refreshed through Project Manager
 4 years ago
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 69771ab2e1
Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress 
Project Manager track progress of, and cancel downloads
 4 years ago
AMZN-Phil b609dbbbbb Pass a callback instead of weak linking a module 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Danilo Aimini a4e0d69e83
Update Splashscreen and About Us dialogs for General Availability (#4901) 
* Add new image for splashscreen. Layout changes incoming.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Adapt layouts to new splashscreen style with transparent background.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Ensure cropping logic works correctly when screen scaling is used.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove old image. Replace new image with new version with more readable credits.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
nggieber f6d4556b60 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
nggieber 10c0522dcb Added F5 support for refreshing repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago