nggieber
d71196102f
More PR feedback changes
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-11 10:20:46 -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
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
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
jonawals
adf3357176
Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239
...
Fix for Issue #5239 : Component Edit Mode does not disable Entity Inspector interaction
2021-11-10 14:50:36 +00:00
AMZN-Igarri
027b0f86ae
Activate AssetBrowserTableView feature ( #5367 )
...
Signed-off-by: igarri <igarri@amazon.com >
2021-11-10 13:41:59 +00:00
John
0e3df14ea2
Add missing bus connection/disconnection.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 11:59:28 +00:00
moraaar
15586ee53e
Adding missing pragma once at XcbInputDeviceMouse.h ( #5448 )
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-11-09 15:42:01 -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
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
Nicholas Van Sickle
ec74d363f3
Merge pull request #5297 from aws-lumberyard-dev/nvsickle/FixEntityOrdering
...
Fix Entity Outliner sort order with Prefabs enabled
2021-11-09 09:29:12 -08:00
John Jones-Steele
c35f74e9ce
Physics/test axis aligned box shape configuration works #7378a ( #5366 )
...
* Safety commit before merging
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Moved from Physics to Terrain
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR + AR fix
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fixed another AR bug
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fixed another AR compilation bug
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* More PR changes
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Added virtual destructor
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Added TestSuite_main_Optimized.py
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Further fixes for PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fix to editor_test.py
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Testing prefab level
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Testing slice level
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Testing prefab level
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Disabled orefab loading for the time being.
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-11-09 14:11:33 +00:00
lumberyard-employee-dm
1998c53882
Non MSVC Release build fix ( #5428 )
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-11-09 10:19:04 +00:00
nvsickle
a5e11efda1
Add a safety check to Prefab/PrefabPublicHandler (potential AR fix)
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-11-08 16:21:35 -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
Alex Peterson
79f8edce14
Allow using gem repos page without losing changes #5317
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-08 12:17:16 -08:00
nvsickle
47c02f555a
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering
2021-11-08 09:12:51 -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
srikappa-amzn
652e35b0ca
Fix camera transforms being reset when switching to default editor camera ( #5326 )
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-11-08 08:01:57 -08:00
Tom Hulton-Harrop
c0d36399db
Improvements to feedback for default camera orbit point (when no entity is selected) ( #5397 )
...
* improvements to camera orbit feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* minor tidy-up before publishing PR
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-08 13:37:35 +00:00
AMZN-Igarri
a1d9a2cc58
Asset Browser Tests ( #4948 )
...
* Added AssetBrowser Tests
Signed-off-by: igarri <igarri@amazon.com >
* Added Entries to test AssetBrowser
Signed-off-by: igarri <igarri@amazon.com >
* Added Print info.
Signed-off-by: igarri <igarri@amazon.com >
* Added more folders
Signed-off-by: igarri <igarri@amazon.com >
* Added Asset Browser Tests for the Search View
Signed-off-by: igarri <igarri@amazon.com >
* Fixed Entry creation
Signed-off-by: igarri <igarri@amazon.com >
* Removed optimize
Signed-off-by: igarri <igarri@amazon.com >
* Cleanup AssetBrowserModel
Signed-off-by: igarri <igarri@amazon.com >
* RowCount made public
Signed-off-by: igarri <igarri@amazon.com >
* Delegated entry creation to RootAssetBrowserEntry and added Code review feedback
Signed-off-by: igarri <igarri@amazon.com >
* removed unused helper class and fixed demo tests
Signed-off-by: igarri <igarri@amazon.com >
* Fixed bus connections
Signed-off-by: igarri <igarri@amazon.com >
* Refactored test environment and added basic tests
Signed-off-by: igarri <igarri@amazon.com >
* Applied some code review feedback and added basic tests
Signed-off-by: igarri <igarri@amazon.com >
* fixed naming
Signed-off-by: igarri <igarri@amazon.com >
* Refactored Tests
Signed-off-by: igarri <igarri@amazon.com >
* removed pointer reset, now handled by the AssetBrowserComponent
Signed-off-by: igarri <igarri@amazon.com >
* Fixed conversion unsigned-signed
Signed-off-by: igarri <igarri@amazon.com >
* Cleaned includes
Signed-off-by: igarri <igarri@amazon.com >
* fixed test setup
Signed-off-by: igarri <igarri@amazon.com >
* Fixed unused variables
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Added printer function
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* cleaned up code
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Added Test to check the correctness of the setup
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Fixed basic tests
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Fixed Tests
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-08 09:56:51 +00:00
Tom Hulton-Harrop
783186fa7e
Update default camera orbit behavior ( #5301 )
...
* add new default orbit point behavior
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add default orbit distance to settings registry
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add new default orbit point behavior
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add default orbit distance to settings registry
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* expose default orbit distance to editor settings menu and update how we display default camera position
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add improve orbit changes for focus
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-08 09:19:40 +00: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
amzn-phist
6cba64f226
Fix issue with Server Launcher debug console not accepting keystrokes ( #5325 )
...
* Fix issue with debug console ignoring some keys
This problem was reported for Server only, the Enter/Backspace keys were
being ignored in the ImGui Debug Console.
This wasn't an issue if the Server had loaded a map.
The problem was with XConsole explicitly setting a bool in dedicated
server mode. This caused text input to be processed by XConsole code
and not passed further along to DebugConsole where it should have been
handling it via ImGui.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Fix missing runtime dependency of ServerLauncher
ServerLauncher in non-monolithic config was missing a runtime dependency
on Legacy::CrySystem.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-11-05 13:47:24 -05:00
moraaar
356fec5490
bugfix: resolve crash with FBX Settings ( #4813 ) ( #4944 ) ( #5365 )
...
-prevent export of ModuleInitISystem and ModuleShutdownISystem
Signed-off-by: Michael Pollind <mpollind@gmail.com >
Co-authored-by: Michael Pollind <mpollind@gmail.com >
2021-11-05 15:17:00 +00: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
AMZN-Phil
31382d080e
Remove duplication, additional readability and added missed file
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 17:07:02 -07:00
Alex Peterson
c69142b73b
Merge branch upstream/stabilization/2110
...
* Conflict GemModel.h
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 17:02:00 -07:00
Alex Peterson
d582715321
Merge pull request #5318 from aws-lumberyard-dev/StablizationMacPMLaunchEditor
...
[MacOS] Launching Editor from ProjectManager and other misc. fixes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 16:46:24 -07:00
AMZN-Phil
393f08fc4b
Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/clouddownloadicon
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 15:41:59 -07:00
AMZN-Phil
9d977e81da
Uncomment temporary disabling of toast notifications
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 15:20:35 -07:00
Chris Galvan
c37767f92a
Set window flags so the processing overlay widget always appears on top.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-04 16:30:44 -05:00
amzn-mike
20edb35cdc
[LYN-7245] Fix test thread being created multiple times ( #5267 ) ( #5315 )
...
* Fix test thread being created multiple times
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Update test to not use a callback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add some more comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add back the callback, remove the use of a thread/sleep
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 73202c2091 )
2021-11-04 13:29:39 -07:00
Chris Burel
46d1b19816
Merge pull request #5275 from aws-lumberyard-dev/burelc/LYN-6480
...
[Linux] Unify Editor and Game raw mouse event handling
Signed-off-by: Chris Burel burelc@amazon.com
2021-11-04 13:17:39 -07:00
AMZN-nggieber
4721ef8298
License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements ( #5272 )
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-04 13:04:06 -07:00
nvsickle
9a4cc6bde9
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering
2021-11-04 12:07:53 -07:00
nvsickle
52604d79f6
Address some review feedback
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-11-04 12:06:37 -07:00
amzn-sj
9958e5f012
[MacOS] Launching Editor from ProjectManager and other misc. fixes
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-04 11:04:01 -07:00
Alex Peterson
774b7c2593
Fixed minor logic issue with gem removal warning
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 11:03:36 -07:00