Commit Graph

8836 Commits

Author SHA1 Message Date
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
amzn-sj ba732480d0 Remove LyShineExample Gem's dependency on LmbrCentral and address feedback from previous PR with similar fix for ScriptCanvas
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-11-29 12:41:33 -08:00
carlitosan 4d36fb9c10 Merge pull request #5958 from aws-lumberyard-dev/carlotisan-fix-sc-function-statics
fix sc function static initialization of dependencies
2021-11-26 18:51:19 -08:00
carlitosan 5794fa6c9d non-handler static initialization for runtime assets is made recursive on dependencies
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-26 10:17:14 -08:00
Terry Michaels e3f7b777ab Merge pull request #5923 from aws-lumberyard-dev/InstallerRuntimeDepFix
Remove dependency of ScriptCanvasPhysics on ScriptCanvas gem to fix runtime dependency conflict
2021-11-26 10:51:34 -06:00
amzn-sj 34542337b9 Remove dependency of ScriptCanvasPhysics on ScriptCanvas gem to fix runtime dependency conflict
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-11-24 22:34:04 -08:00
lumberyard-employee-dm 99d0c39273 O3DE.exe Project-Centric "Open Editor" fix (#5852)
* The O3DE.exe Open Editor button now attempts to open the Editor in the
build directory of the project being opened.

If their is no Editor within the build directory of the Project, it uses
the Editor.exe in the current O3DE.exe executable directory if it exists

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Engine .gitignore now ignores the build directory if placed in the
AutomatedTesting project

Previously it was just ignoring a `[Bb]uild` directory if it was
directly within the engine root.
This change matches the behavior of the project templates.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Renamed the ProjectUtils GetEditorDirectory function to
GetEditorExecutablePath

Added a platform specific implementation for retrieving the path to the
Editor executable in the GetEditorExectuablePath function.

It first attempts to locate the Editor via checking the project build
directory for an Editor executable before falling back to checking the
binary directory of the currently running O3DE executable.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correct the MacOS GetEditorExecutablePath to return the Editor path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-23 18:25:00 -06:00
Danilo Aimini 4ac8b5dc42 Display version number correctly in installer builds from branches that properly set the name on Jenkins. (#5856)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-23 13:13:21 -08:00
carlitosan d09171fc53 Merge pull request #5851 from aws-lumberyard-dev/carlitosan-redcode-scripteventref
remove scripteventreference deprecated code
2021-11-23 08:52:44 -08:00
carlitosan 81bf27c4e0 remove scripteventreference deprecated code
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-22 16:57:21 -08:00
Steve Pham ba32937867 Cherry pick release unused warning error into Stabilization/2110 (#5845)
* Fixed unused variable warning in Release configuration in Linux. (#5830)

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

* Fix unused variable errors (#5843)

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: moraaar <moraaar@amazon.com>
2021-11-22 15:32:54 -08:00
Mike Balfour 1f2385ca1a Added missing doc links. (#5841)
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-11-22 15:35:37 -06:00
AMZN-Phil bf3a511806 Merge pull request #5817 from aws-lumberyard-dev/Prism/CMakePATH
Fix Project Manager not finding CMake on Windows
2021-11-22 11:04:27 -08:00
AMZN-Phil d958502f2c Check return value of qputenv
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-22 09:26:34 -08:00
Steve Pham b3c0200345 Restore missing variable 'target_filename_ext' needed to determine if RPATH fix is necessary or not (#5824)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-22 08:58:24 -08:00
AMZN-Phil c2145a6387 Use QStringList to avoid false matches against a partial path
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-22 08:31:12 -08:00
AMZN-Phil def5b3a65d Fix additional left over references to QProcessEnvironment
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-20 10:37:55 -08:00
AMZN-Phil 74e1ee1862 Fix non-Windows platforms
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-20 10:23:50 -08:00
AMZN-Phil e1b6054ff8 Fix Project Manager not finding CMake on Windows
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-19 19:13:19 -08:00
Steve Pham a0ab5920da Add trait to enable/disable the Resource Mapping Tool (#5814)
* Add trait to enable/disable the Resource Mapping Tool

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>

* Moving ly_install_directory(DIRECTIORES Tools/ResourceMappingtool) into of the PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL block

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-19 18:04:15 -08:00
Esteban Papp dbc5d7a8bc Cherry-pick of Linux deb package to stabilization (#5778)
* Cherry-pick 49e8f35858

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Merging differences from development of other changes that need to be there for deb packaging

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Picks a needed change for the installer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Takes version from environment if defined

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not pick up version if it is empty string since that will also break version comparison

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* creating temp directories if they dont exist

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets.
This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-19 14:07:25 -08:00
Steve Pham 3cf3e45b38 Enable Resource Mapping Tool on Linux (#5779)
* Enable and fix AWS Resource Mapping Tool on Linux
- Enable the trait AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED for Linux
- Add additional traits to handle launching o3de local python on Linux
- Update the resource_mapping_tool.py to support preloading the shared libraries for Pyside (like the QtForPython gem) in order to resolve the local pyside2 libraries

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update pyside2 to a RUNTIME dependency

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update special linux preloading comments for clarity

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Add CR at the end of traits files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* - Remove unnecessary extra argument '--executable-path' and use '--binaries-path' instead
- Add linux only loading of pyside modules to 'setup_qt_environment' instead
- Update README.md

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Updated unit tests for test_environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix (more) indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Replace exit with return in setup_qt_environment

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-19 12:09:00 -08:00
amzn-mike af85060856 [SPEC-7644] Cherry Pick - ParallelDeepAssetReferences is failing intermittently (#5797)
* [SPEC-7644] ParallelDeepAssetReferences is failing intermittently (#5721)

* Fixed race condition caused by trying to handle asset ready event before asset container has finished filling out all the data structures.

Added check to only handle asset ready once init is complete
Added unit test to verify fix

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing space to error message

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add comment on sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 56900484fc)

# Conflicts:
#	Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp

* Fix indentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-19 11:22:43 -08:00
Allen Jackson 95da7fcb64 {lyn7060} adding 'Save as Prefab' for ProcPrefab (#5678)
This adds the context menu to the Asset Browser to "Save as Prefab.." so that a Procedural Prefab
asset template can be saved in the source assets folder


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
2021-11-19 13:17:21 -06:00
Danilo Aimini 4be1e68bad Fix oversight from recent change to PrefabFocusHandler internals. (#5794)
* Fix oversight from recent change to PrefabFocusHandler internals.

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

* Introduce check for null instance in case this is called before the Prefab Focus Handler is initialized.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-19 10:45:06 -08:00