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

2213 Commits

Author SHA1 Message Date
chcurran facfdf4e7a Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-11 16:07:18 -08:00
AMZN-AlexOteiza edefb57cfd Fixed crash when typing asset name and clicking browse (#5495) 2021-11-11 13:58:00 +00:00
bosnichd 528a747876 Don't allocate memory when processing WM_INPUT messages. (#5491) 
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-10 11:28:21 -07:00
Esteban Papp 21f9a789c1 Merged the Editor.Camera.Tests with the Editor.Tests (#5463) 
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds dependency to Camera.Editor gem which is used by the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Inheirts from TraceBusHook instead of adding the default env to the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* makes order consistent between Setup/Teardown

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* adds missing header for non-unity builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes dependency to Camera gem

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-10 08:57:39 -08:00
bosnichd eb775a48dc Make InputDeviceId's constructor constexpr. (#5433) 
* Make InputDeviceId's constructor constexpr.

See also https://github.com/o3de/o3de/pull/4220

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

* Updates based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-10 08:06:27 -07:00
lsemp3d 934c0f2ec7 Made SerializeContext and BehaviorContext consistent with their class name 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-09 15:25:06 -08:00
lsemp3d d3b8b761fd Improved messaging on assert about argument types lacking reflection for scripting 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-09 14:51:10 -08:00
Mikhail Naumov e1d53395fe Propagation Optimization (#5355) 
* Merge changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* removing leftover immediate flag

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-11-09 14:05:15 -08:00
Ronald Koppers e6a1f8ed0a Merge pull request #5108 from aws-lumberyard-dev/Prefabs/SpawnableEntityAlias 
Ability to setup aliases for entities spawned from spawnables.
 2021-11-09 13:17:59 -08:00
Chris Galvan 5bf0375598 Merge pull request #4776 from pollend/bugfix/resolve-dragging-problem-for-DockTabWidget 
bugfix[Linux]: resolve dragging window with more than one tabbed  (#4658)
 2021-11-09 12:30:33 -06:00
AMZN-koppersr cc2513f224 Linux build fix Spawnable Entity Aliases. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2021-11-09 09:55:39 -08:00
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-09 08:53:25 -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-koppersr b3295ffeb3 Fixed several issues with compilation of Spawnable Entities Aliases. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2021-11-08 14:54:43 -08:00
AMZN-koppersr 976c6abb90 Build fix. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2021-11-08 13:48:20 -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
AMZN-koppersr c9f9a83c57 Further PR feedback on the Spawnble Entity Aliases. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2021-11-08 12:00:15 -08:00
AMZN-koppersr 8ccccdcaf1 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-08 10:10:06 -08: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
kberg-amzn c0e63988d8 merging latest dev, again, and hopefully dev is not still completely broken 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-05 19:23:01 -07:00
kberg-amzn 479ff188a0 merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-05 15:05:23 -07:00
Jeremy Ong 6b6eb2c936 Remove markers that occupy <2us for 99% of events 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-11-05 16:01:51 -06:00
Michael Pollind eddb867ddf bugfix: change event to WindowBlocked for FancyDocking 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-04 19:36:09 -07:00
Michael Pollind b42f1b022e replace with ungrab mouse event instead of deactivate window 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-04 19:36:08 -07:00
Michael Pollind b3c7bf47f2 Update Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp 
Signed-off-by: Michael Pollind mpollind@gmail.com

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-04 19:36:08 -07:00
Michael Pollind 9eb7972e74 bugfix: main window is deactived for tabbed window preventing the use from dragging tabbed windows 
issue: https://github.com/o3de/o3de/issues/4658

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-04 19:36:08 -07:00
AMZN-koppersr 567702931f Updates for the spawnable entity aliases based on provided feedback. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2021-11-04 19:10:20 -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
kberg-amzn ed06ef7ed2 Removing ITimeoutHandler to simplify timeout queue interface, removes some unneeded code 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-04 16:48:39 -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
chcurran 0175e9d3cb Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 2021-11-04 15:58:44 -07:00
Chris Burel f97fa6dbe0 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:44:28 -07:00
Chris Burel 0ee217acac Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:41:18 -07:00
Chris Burel 4ba2c06386 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:41:15 -07:00
Chris Burel ac7cda86c5 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:40:51 -07:00
Chris Burel f5dea72dfe Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:40:00 -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
Vishal Das 6f294457da fix issue #5172 (#5198) 
Signed-off-by: Vishal Das <dvishal485@gmail.com>
 2021-11-04 12:11:31 -07:00
AMZN-Phil b6be57d2cf Merge pull request #5264 from aws-lumberyard-dev/MacPMLaunchEditor 
[MacOS] Launching Editor from ProjectManager and other misc. fixes
 2021-11-04 11:11:44 -07:00
Chris Burel 6eeae875e9 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:25 -07:00
Chris Burel 6c7bc7a296 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:24 -07:00
Chris Burel 04652abb8f Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:24 -07:00
Chris Burel 06ec40452e Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:24 -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
AMZN-koppersr 0decc57dfc Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-04 10:39:59 -07:00
bosnichd 600bb5b34e Fix alt-tabbing out of full screen on Windows. (#5288) 
Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-04 11:17:52 -06:00
Danilo Aimini 6bce0a9a8d LYN-7054 + LYN-7704 | Exit Focus Mode when starting Game Mode, correct painting of Prefab capsules in Outliner. (#5280) 
* Add RefreshAllContainerEntities function to ContainerEntityInterface. It refreshes all registered containers so that listeners can refresh their state.

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

* Move Prefab border painting to foreground, and invert foreground painting order. This ensures the Prefab capsules are drawn according to UX.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-04 09:52:35 -07:00
lumberyard-employee-dm 627012840d Update how Project Filepaths are calculated when not supplied via command line (#5194) 
* Fixed the return value of the ConvertToAbsolutePath function

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

* Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)

* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

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

* Removed the platform name from the bootstrap.game.*.setreg

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

* Update how the project related file paths are determined when not
supplied.

The project-path determination now goes back to only detecting a "project.json" file.
It no longer attempts to detect a "Cache" directory

The project-cache-path determination now in addition to checking the
project_cache_path key searches for a "Cache" directory.

The project-path defaults to executable folder if it cannot be detected.

The copying of generated executable folder Registry directory contents
to the product cache is now removed after the archive step.

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

* Updated the invocation of the AssetProcessor in Jenkins to supply an
absolute path to the project.

The project-path is no longer treated as relative to the engine root,
but instead relative to the current working directory at application
startup.

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

* Added constant for the storing the name of Cache directory

Fixed typos and grammatical errors in the SettingsRegistryMergeUtils.cpp

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

* Updated UnitTest prepend the EngineRoot path to "AutomatedTesting" when
setting the project path.

This is needed now that the project-path isn't treated relative to the
EngineRoot if it is not absolute.

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

* Fix AssetSeedManagerTest and PlatformAddressedAssetCatalogManagerTest

Instead of trying to used the AutomatedTesting directory as the project root, the temp directory created during the test is used as the project root.

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

* Moved the setting of the project cache root folder and project
asset platform root folder into the `if (!projectCachePath.empty())`
block

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

* Removing the scan up logic for the "Cache" directory.

This is no longer needed to locate the project cache path in a Project Game Release Layout.

Because the project path defaults to the executable directory if, it is not found, the Cache directory will be set to the "Cache" directory within the executable directory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-04 11:02:18 -05:00