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

2266 Commits

Author SHA1 Message Date
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
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
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
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
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
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
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-09 08:53:25 -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
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
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
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
nvsickle 47c02f555a Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering 2021-11-08 09:12:51 -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
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
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-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