Commit Graph

8860 Commits

Author SHA1 Message Date
chcurran 66e744785f EditorCOmponent build pipeline WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:41 -08:00
chcurran 23267fd862 SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:41 -08:00
chcurran 5db535d1dd Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 2021-12-10 11:56:40 -08:00
chcurran d9f849b03e File state change include external delete detection
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:40 -08:00
Chris Galvan 1797354560 Merge pull request #282 from aws-lumberyard-dev/cgalvan/SourceHandleCompleterFix
Fixed asset completer model for source handle picker.
2021-12-10 11:56:39 -08:00
Chris Galvan ca5424dd7b Fixed asset completer model for source handle picker.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:39 -08:00
Chris Galvan b44541c440 Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker
Added property handler for SourceHandle type
2021-12-10 11:56:38 -08:00
chcurran 805bd8ef56 fix graph tab selection:
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:37 -08:00
Chris Galvan 31304ee9b1 Fixed issue when clearing out source handle property.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:37 -08:00
Chris Galvan c36d827fc5 Updated Script Canvas component to use source handle property.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:36 -08:00
Chris Galvan befd84cf0b Added property handler for SourceHandle type.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:36 -08:00
Chris Galvan b4407e5044 Made PropertyAssetCtrl more extensible.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:35 -08:00
Chris Galvan 42382cd8d1 Added logic to AssetPickerDialog to pre-select by file paths.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:35 -08:00
Chris Galvan d9ee02fddf Added method to AssetCompleterModel for specifying a filter directly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:34 -08:00
Chris Galvan 231aaa5bf5 Added asset selection model option for a source asset type based on regex.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:33 -08:00
Chris Galvan 772cb30c57 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into cgalvan/SCSourceFilePicker 2021-12-10 11:56:33 -08:00
Chris Galvan 3f6824571f Added regular expression filter for asset browser entries.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-12-10 11:56:32 -08:00
chcurran ad8cfa5f99 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-12-10 11:56:31 -08:00
chcurran b772db5e73 remove typo
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:30 -08:00
chcurran 727d1b3815 more aggressively release graph memory in version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:56:30 -08:00
chcurran 4342501804 fixed unit test running system
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:33 -08:00
chcurran f8fdf4b306 fixed version explorer issue
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:32 -08:00
chcurran 4484b69036 isolate the loading problem during version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:31 -08:00
chcurran 015185f9d6 fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:31 -08:00
chcurran e34c6e55df fix scoped compile error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:30 -08:00
chcurran b7d8c1a644 make default names NOT the default name of a previously existing file
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:30 -08:00
chcurran 921f675df2 restore source file deleted behavior
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:29 -08:00
chcurran d8e8cdba60 multi tab close fixed
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:28 -08:00
chcurran 5558be2aeb new source file close button works, but not on multiple tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:27 -08:00
chcurran 6c1d1dc2e2 new source file button works
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:27 -08:00
chcurran 65814e65cc source file save-as
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:26 -08:00
chcurran 5cd8eb648c source save in place first pass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:25 -08:00
chcurran 1ea245e46c source save asset-free WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:24 -08:00
chcurran d40b9fc809 add file state for graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:24 -08:00
chcurran 20147ddafb it renders!
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:23 -08:00
chcurran cbbd6df0c5 clean up open pipeline to render graph
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:22 -08:00
chcurran bc342df6b4 initial compile of detailed path of change to regular sc files
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:54:18 -08:00
chcurran c5cd854172 Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:52:37 -08:00
chcurran 31c627defc initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-10 11:52:36 -08:00
Alex Peterson 6613030fe6 Fix Visual Studio requirements text and doc link (#6312)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-12-10 10:15:39 -08:00
srikappa-amzn ac03b6f50b Improve error messaging when duplicating entities before they are created (#4922) (#6279)
* Improved error messaging when user tries to duplicate before entities are created

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
2021-12-09 11:25:23 -08:00
Luis Sempé 667512c7ff Merge pull request #6233 from o3de/scripting/rte_02
Script Canvas node translation system and naming consistency
2021-12-08 13:39:25 -08:00
lumberyard-employee-dm cd65d8a5ac Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504) (#6234)
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Revert previous change. Remove the exclude filter for the Install directory.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Prepend a ./ to the relative path in order to match the exclude patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing ? and remove whitespace

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* More fixes to regex patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove assert that's not needed since it's a valid scenario

Signed-off-by: amzn-sj <srikkant@amazon.com>

Co-authored-by: amzn-sj <srikkant@amazon.com>
2021-12-08 11:12:25 -06:00
lsemp3d 72bfd8bdf8 Script Canvas node translation system and naming consistency
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-12-07 15:40:04 -08:00
moraaar 8d096ebf61 Fixed critical json property. (#6205)
* Fixing critical tag as it needs a boolean, not a string.

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

* Marking blast material library assets as criticals since it's necessary to be ready before the editor opens

Signed-off-by: moraaar <moraaar@amazon.com>
2021-12-07 16:44:45 +00:00
Mikhail Naumov c5615f812c Fixing pivot offset when performing undo on Transform component (#6150)
* Fixing undo offest on transform component

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

* Fixining possible issue with firing an unnecessary OnTransformChanged event when entity is manually disabled/enabled

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

* Adding better comments

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

* Unit tests

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

* Cherrupicking changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-12-06 14:46:47 +00:00
moraaar dc8f9dc233 Add additional check to check material library is loaded when trying to retrieve names (#6165)
* Add additional check to ensure material library is loaded when trying to retrieve names.

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

* Mark physmaterial assets as critical

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

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

Signed-off-by: moraaar moraaar@amazon.com
2021-12-06 13:26:23 +00:00
Chris Galvan 7b22bc64f3 Merge pull request #6044 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de_rte
Merged `stabilization/2110` to `stabilization/2111RTE`
2021-11-30 14:11:41 -06:00
AMZN-Phil 6480041944 Merge pull request #6012 from aws-lumberyard-dev/InstallerRuntimeFix2
Remove LyShineExample Gem's dependency on LmbrCentral and address feedback from previous PR with similar fix for ScriptCanvas
2021-11-29 15:09:11 -08:00
amzn-sj 64139b7636 Add new-line to end of file
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-11-29 14:30:15 -08:00