Commit Graph

36 Commits

Author SHA1 Message Date
Artur K 80db67e90a Remove many unused variables and unused setting files (#4607)
* Remove many unused variables and unused setting files

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove a few more dead config vars

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-10-12 17:06:15 -05:00
Qing Tao 89e6df1c7f ATOM-16575 clean up image builder presets files (#4611)
ATOM-16575 clean up image builder presets files
Removed unused image builder presets
Deprecating preset UUID and use preset name as unique id
Delete all .exportsettings file which were only used for legacy imageProcessing gem.

Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-11 15:18:39 -07:00
AMZN-Igarri c75f3690da Product/Source differentiation AssetBrowser Search View. (#4144)
* Added whole row highlight

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

* Applied code review changes

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

* Addressed code review comments

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

* fixed QPointers

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

* Added indentation to child items

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

* Added Branch Icons

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

* Loading icons and keeping a reference.

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

* Fixed typos

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

* Fixed TableView Header

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

* Cleaned up Delegate Paint

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

* Fixed view style

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

* small tweaks

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

* Added Assert

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

* Small tweak in Table Model

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

* Code Review Feedback

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

* Code review Comments

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

* Removed Comment

Signed-off-by: igarri <igarri@amazon.com>
2021-09-27 10:43:08 +01:00
Gene Walters c91b0f9d31 Small fix for color node tooltip to ask for values 0-1 instead of 0-255
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-23 13:29:04 -07:00
Danilo Aimini 935bef61b2 Rename NonUniformScale svg icon to fix warning.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-08-11 15:29:42 -07:00
Chris Galvan 1e4c147e0b Fixed asset name for default groundplane.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-04 15:34:22 -05:00
lsemp3d 1f0fcf2aa2 Updates GetDirectionVector nodes to also return the distance between the points
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:42:26 -07:00
lsemp3d 760acdcdcc Updated DirectionTo tooltips in the translation file
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:21:41 -07:00
lsemp3d 6188df4b49 Added Get Direction Vector node for Vector2,3 and 4
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-03 15:36:56 -07:00
Chris Galvan 37c3f01771 Removed legacy ObjectIcons and shelve icons from Editor.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-02 12:27:03 -05:00
sphrose 9639003a7d LYN-4774 Fix missing box icons inside the main Viewport (#2297)
* LYN-4774 Fix missing box icons inside the main Viewport

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* V2 icons

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Bug fixes

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-07-21 16:33:04 -07:00
greerdv 01aa765de2 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-17 16:58:18 +01:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
greerdv 9c1d66f61f improve translations for physics types in Script Canvas
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-15 13:07:34 +01:00
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
Sandeep 4c684b1a10 Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
Initial prefab integration
2021-07-02 14:05:25 -07:00
Terry Michaels d686673427 Removed unneeded binaries (#1767)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-07-02 14:14:47 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
chcurran 2281330a7c merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 20:42:41 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
chcurran 3948497f85 remove unused icon
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 18:05:39 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Terry Michaels e96b87571f Added fly camera input component to default level prefab (#1555) 2021-06-24 10:16:56 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Esteban Papp 2323cdd9e4 LYN-4755 lrelease in debug should have the profile qt libraries 2021-06-22 16:41:43 -07:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
Gene Walters 530573abf3 Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
Steve Pham f91ba1a80b Minor pre-license update cleanup of files (#1437)
- Remove legacy CryEngine.tip file
- Remove legacy WAF files
- Renamed Lumberyard to O3DE
- Updating "Amazon.com" to "Open 3D Foundation"
2021-06-18 16:09:18 -07:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
2021-06-18 11:45:48 +01:00
Gene Walters b9dd7a1ecd Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code 2021-06-17 16:16:38 -07:00
Terry Michaels 4dd08ec21f Added a default level prefab concept for newly created levels (#931)
* Started update for prefab based initial asset inclusion

* Newly Created levels now use a template prefab

* Review feedback changes

* Moved to better asset-based queries to generate the full path.

* Removed pesky pragma

* Replaced with const name instead of literal string
2021-05-25 18:15:19 -05:00
abrmich d98a691994 UI Editor Viewport fixes 2021-05-11 21:38:15 -07:00
greerdv a49017ec23 merging from main 2021-05-05 13:26:08 +01:00
greerdv e1f7d04bc2 adding icon for non-uniform scale component 2021-05-05 13:10:01 +01:00
Terry Michaels 1f6ec22e6e Removed deprecated assets (GeomCache files) 2021-05-04 12:59:49 -05:00
lumberyard-employee-dm 3dec5d3b71 LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00