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

3464 Commits

Author SHA1 Message Date
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
SergeyAMZN aee52d1677 Merge pull request #5533 from aws-lumberyard-dev/LYN-8169_ServerShouldNotLoadClientCfg 
Removing Old Cry Code that Causes ServerLauncher to Load Client.cfg
 2021-11-11 16:06:06 +00:00
AMZN-AlexOteiza edefb57cfd Fixed crash when typing asset name and clicking browse (#5495) 2021-11-11 13:58:00 +00:00
Gene Walters 161600a412 Removing old cry code that would load client.cfg for server launcher. Client.cfg should not be loaded by default. If you want to load a cfg then you should provide it via commandline (--console-command-file). 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-10 16:24:55 -08:00
amzn-mike 61d0ec9d6b Remove debug messages. (#5429) 
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-10 13:22:47 -06: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
Scott Romero ab37eb138c [development] removed CryLibrary (#5474) 
* [redcode_crylibrary] replaced CrySystem loading in launcher and editor with new custom wrapper that uses AZ::DynamicModuleHandle

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] removed all remaining references to CryLibrary

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] migrate CrySystem loading to use AZ::DynamicModuleHandle directly instead

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] clean up of CrySystemModuleHandle and old CrySystem module [un]init functions

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] added trailing newline to DllMain.cpp in CrySystem

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-10 09:43:13 -07:00
Benjamin Jillich 838970206b Animation Editor: Remove preview label (#5449) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-10 16:23:43 +01: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
Scott Romero e30b0f51d1 [development] Android compatibility fixes (#5424) 
- Added support for NDK r23
 - Added support for the versioned Android 'cmdline-tools' package which replace the deprecated 'tools' package
 - Updated max Gradle version to latest point release of 7.0 to fix volume query bug during sync in some configurations
 - Updated min Android Gradle plugin version to latest point release of 4.2
 - Fixed issue with Gradle task chaining for some custom copy tasks
 - Replaced use of deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template
 - Increased debug logging around adb calls in Android deployment script
 - Fixed a couple try/except cases that were looking for the wrong exception when invoking adb_* functions
 - Fixed issue where asset cache would get deleted when regenerating an existing Android Gradle project with --overwrite-existing
 - Fixed issues with running Android project generation scripts on Unix systems

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-11-09 10:32:44 -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
Tom Hulton-Harrop 089dd681b9 Merge stabilization/2110 as of dcc2890da3 into development 2021-11-09 17:32:36 +00:00
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-09 08:53:25 -08:00
AMZN-ScottR 5f7aee0814 Merge branch 'development' into android_compat_fixes 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-09 07:53:13 -08:00
Michael Pollind 3b05e6ab1e bugfix: correctly center quick access bar (#5396) 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-09 10:13:09 +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
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
AMZN-ScottR c5cd7f7fb8 [android_compat_fixes] replaced deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:40 -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
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
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
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
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
kberg-amzn 479ff188a0 merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-11-05 15:05:23 -07:00