chcurran
30bcddc694
fixed unit testing code
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-23 23:57:03 -08:00
chcurran
205b2c27ee
SC Editor serialization update in JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-22 16:04:49 -08:00
Chris Galvan
1937e1ea51
Fixed asset completer model for source handle picker.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 16:20:54 -06:00
Chris Galvan
6e14713ea6
Added property handler for SourceHandle type.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:52:45 -06:00
Chris Galvan
06e3fa4bef
Made PropertyAssetCtrl more extensible.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:51:41 -06:00
Chris Galvan
27fbbded4a
Added logic to AssetPickerDialog to pre-select by file paths.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:49:56 -06:00
Chris Galvan
d91d5a079f
Added method to AssetCompleterModel for specifying a filter directly.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:48:56 -06:00
Chris Galvan
5f29891dfa
Added asset selection model option for a source asset type based on regex.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:48:12 -06:00
Chris Galvan
81f8071038
Added regular expression filter for asset browser entries.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 09:07:31 -06:00
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