Commit Graph

9064 Commits

Author SHA1 Message Date
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 66abd8cd5c Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into cgalvan/SCSourceFilePicker 2021-11-19 12:18:40 -06:00
chcurran f1632b099c editor sc component switched over to source handle, not yet connected to file notifications
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-19 10:03:16 -08: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 487e2fb5bb remove typo
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-18 13:31:00 -08:00
chcurran 62878489a3 more aggressively release graph memory in version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-18 10:41:46 -08:00
chcurran 5b9896d2c4 fixed unit test running system
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-17 13:47:51 -08:00
chcurran 0367a3297f fixed version explorer issue
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-17 12:17:45 -08:00
chcurran 63f98e7dd9 isolate the loading problem during version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-16 09:12:36 -08:00
chcurran 0e7d732c61 fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-15 17:15:05 -08:00
chcurran 89a97a5e49 fix scoped compile error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-12 09:33:39 -08: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
chcurran d9622e74ab make default names NOT the default name of a previously existing file
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-11 12:18:50 -08:00
Luis Sempé 9e2a3226fd Script Canvas, replace the text replacement system to a JSON file based one (#5228)
It is now possible to right click on nodes on the node palette to navigate to the file that holds the text data for any given node, this way it is easy to update and improve the naming of titles, subtitles, categories, tool tips and slots.
2021-11-11 11:53:51 -08:00
chcurran 737ed1b032 restore source file deleted behavior
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-11 10:36:55 -08:00
jromnoa 9d93282e42 Merge pull request #5530 from aws-lumberyard-dev/Atom/scottmur/ssao_p0
SSAO component P0 automation
2021-11-11 10:36:22 -08:00
greerdv 27076cab73 Merge pull request #5135 from aws-lumberyard-dev/tick-tests
Tick tests
2021-11-11 16:36:55 +00:00
SWMasterson 984ea571f4 Add P0 test for Entity Reference component. (#5456)
Signed-off-by: Sean Masterson <semaster@amazon.com>
2021-11-11 10:32:33 -06: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
greerdv 9d05168cfc address feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-11 15:10:46 +00:00
AMZN-AlexOteiza edefb57cfd Fixed crash when typing asset name and clicking browse (#5495) 2021-11-11 13:58:00 +00:00
greerdv 53c6a22ac2 add python test for smoothness of character gameplay component motion
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-11 10:47:43 +00:00
greerdv 06ef037278 fix typo
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-11 10:47:40 +00:00
greerdv 128b3d7ec0 fix copy paste error in test description
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-11 10:47:38 +00:00
greerdv 2ced6011e9 add python test for smoothness of interpolated rigid body motion
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-11 10:47:36 +00:00
sphrose 23faf4d36a Merge pull request #4628 from aws-lumberyard-dev/terrain/sphrose/surface_materials_list_tests
Terrain/sphrose/surface materials list tests
2021-11-11 10:14:00 +00:00
chcurran 47e9d5a117 multi tab close fixed
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-10 17:15:42 -08:00
chcurran eefc3f9a91 new source file close button works, but not on multiple tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-10 16:40:33 -08: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
chcurran 0fa56ba5f8 new source file button works
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-10 15:39:17 -08:00
Allen Jackson 9b393d16fe [lyn3736] adding init files to module paths (#5111)
* fixing class names in PYI files

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-11-10 17:34:20 -06:00
Scott Murray b202bbfbc9 SSAO component P0 automation
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-11-10 15:26:32 -08:00
Guthrie Adams 04326673cb Merge pull request #5514 from aws-lumberyard-dev/Atom/guthadam/add_null_check_to_emfx_systemcomponent
Added a null pointer check to EMFX system component
2021-11-10 17:12:01 -06:00
Guthrie Adams 2bfef84aa2 Merge pull request #5512 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_source_data_loading
cherry pick material source data loading from stabilization to development
2021-11-10 16:10:40 -06:00
Guthrie Adams 246f174528 inverted game mode ptr check
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 16:02:12 -06:00
amzn-mike efe78d035f Updated project path to use absolute path (#5459)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-10 13:48:58 -08:00
Guthrie Adams 41a64b1346 Added a null pointer check to EMFX system component
Material editor and other tools load runtime dependencies from game projects. The EMFX system component is checking for game mode by getting a pointer to the editor interface, which will not exist outside of the main O3DE editor.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 14:56:17 -06:00
Guthrie Adams 6f80aab699 Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 14:42:55 -06:00
rgba16f cebf6e2de3 Atom CPU threading optimization (#5481)
* Small change to make the RasterPass Scope jobs split the work more evenly over the cores

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback. Remove scale of EstimatedItemCount, modify the command list cost threshold instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-11-10 12:08:55 -08:00
santorac 04c6f3cc94 cherry-pick 48f3bb7d
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 13:37:15 -06:00
Guthrie Adams 824da6cabf update comment and error message
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 13:34:35 -06:00
Guthrie Adams c73b6bbe27 Changing lua material functor script loading code to pass the correct sub ID for a compiled script asset
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 13:33:48 -06:00
Guthrie Adams 287f08a33c Fix parent material loading
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 13:33:10 -06:00
Guthrie Adams 086859d49a updated comments and error messages
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 13:32:27 -06:00
Guthrie Adams fbebf04161 cherry-pick c0acbe7b
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 13:31:24 -06: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
Mike Chang 5a8f95a414 Fix Wix root and installer url config (#5500)
Signed-off-by: changml <changml@amazon.com>
2021-11-10 11:21:49 -08:00
Guthrie Adams 6ea951214c Moving material type asset PostInit call to be consistent with material asset
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-10 12:58:47 -06:00