Commit Graph

1372 Commits (f55ffae99425b95680ba3d10ddc8eb40e1f7a477)

Author SHA1 Message Date
Esteban Papp 3f34fa5636
Some cleanup of platform.h and other CryCommon files 5 years ago
SJ 0f347c11bf
Add header file needed for no unity builds (#3047)
Signed-off-by: amzn-sj <srikkant@amazon.com>
5 years ago
chiyenteng 7e5cbdab1e
Create a new automated test for Prefab basic workflows (#2715)
Adds a new ebus for prefab apis and refactored the apis
Removed an empty test level
Auto delete tmp level when teardown tests
Add Base test level in Prefab folder
Removed unused comments
Checked if absolute path as an input of Create Prefab functions
Changed created prefab file path to support all platfroms
Added missing includes

Signed-off-by: chiyteng <chiyteng@amazon.com>
5 years ago
Esteban Papp 5f22dc817c Merge branch 'development' into cmake/SPEC-7182 5 years ago
Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp
5 years ago
sconel fbcb6510e6
Update storage of Prefab Dom info to be best effort (#2862)
* Update storage of Prefab Dom info to be best effort

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

* Update IssueReporter to Skipped instead of PartialSkip

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

* Address PR feedback

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

* Fix failing Prefab Unit Test that expected default values to be stripped

Signed-off-by: sconel <sconel@amazon.com>
5 years ago
Esteban Papp 3845f43088 missing header include after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 9f7d280a1e Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
5 years ago
AMZN-AlexOteiza da4dfea9ca
Adjustment to property row so the label is more visible (#2866)
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
5 years ago
Esteban Papp fe635d5ab4 Merge branch 'development' into cmake/SPEC-7182 5 years ago
Artur K 4cee263033
Minimal TypeInfo header/reduce std interdependencies. (#2688)
* Minimal TypeInfo header/reduce std interdependencies.

TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

* Windows build fixed

Removed algorithm.h from string_view.h

smoke-test passed

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

* Resotore dynamic_pointer_cast in intrusive_ptr

Requested by reviewer.

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

* Fix CI build

string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h

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

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
5 years ago
AMZN-mnaumov 25844a9ed6
Selecting entities when duplicating prefabs (#2995)
* Selecting entitie when duplicating prefabs

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

* PR feedback

Signed-off-by: mnaumov <mnaumov@amazon.com>
5 years ago
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 5 years ago
Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
5 years ago
carlitosan 1e0a1e1167
Merge pull request #2991 from aws-lumberyard-dev/carlitosan/development
Add JSON serializer support for the Lua component properties
5 years ago
Esteban Papp 3b9044ce5d Addressing missing test identified by @hultonha
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp e3b22f51b2 @lumberyard-employee-dm suggestion to use (w)string_view as the src to simplify functions in conversions.h
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Terry Michaels 9b1ebb220a
Changed locale handling and added tests 5 years ago
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
5 years ago
lumberyard-employee-dm adaeb7c203
Converted the AZStd implementations of unintialized construct to use std (#2843)
* Converted the AZStd implementations of unintialized construct to use std

The uninitialized_default_construct and uninitialized_value_construct
functions implementations have been removed and the Standard library
implementations have been brought into the AZStd namespace scope

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

* Added a default construct to the UninitializedValueConstruct test case
which value initializes the int member which uses zero initialization to
initalize it to zero.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
SJ 44b053df58
[Mac] Building and running game projects from an SDK (#2943)
* 1. Initial support for loading dylibs outside the bundle.
2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified).
3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep.
4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures.
With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK.

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

* 1. Remove debug messages.
2. Fix license
3. Pass parent's environment variables to child processes by default(on Mac).

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

* 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is.

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

* Address some feedback from review

Signed-off-by: amzn-sj <srikkant@amazon.com>
5 years ago
John Jones-Steele 2bf64879da Fixed the SpinBox tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
John Jones-Steele be535172b5 Merge branch 'development' into UsingCommaAsDecimalSeperator
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
chcurran 8571e71d93 Add JSON serializer support for the Lua component properties
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
michabr bb88f1f9df
Fix input not working in Ctrl-G mode after UI Editor is opened (#2948)
* Fix input not working in Ctrl-G mode after UI Editor is opened

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

* Delete environment variable

Signed-off-by: abrmich <abrmich@amazon.com>
5 years ago
Artur K fb3195d996
Reduce size of AllocationInfo struct to 64 bytes ( was 72 ) (#2771)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
5 years ago
John Jones-Steele 86d0ba7e6b Minor changes to tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
John Jones-Steele 3b60862237 Fixed order of tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
John Jones-Steele 12505da6fc Changed locale handling and added tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
hultonha 3d15382fb6
Camera Component, Editor Viewport Widget refactoring.
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
5 years ago
hultonha 1f9e976fe4
Adding Setting to allow the user to choose the max number of items to show in the Search View
Merge pull request #1679 from aws-lumberyard-dev/LYN-4700
5 years ago
hultonha 659e486cd7
Add an integration test to validate pick mode crash (#2935)
* add an integration test to validate pick mode crash

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update to test after review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
igarri 7b5ecfb7d9 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
5 years ago
Esteban Papp 360d0bdd0b removing more unused stuff
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp f4164ef3a3 Merge branch 'development' into cmake/SPEC-2513_w4018 5 years ago
Esteban Papp 7447df3576 Merge branch 'development' into cmake/SPEC-7484 5 years ago
Esteban Papp 6db7488939 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
5 years ago
Esteban Papp 03cf71b12d android fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 8adf8fd7a1 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp ae9d15c977 Mac/iOS fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Jeremy Ong 4ab7aa551d Resolve size_t conversion werrors
Signed-off-by: Jeremy Ong <jcong@amazon.com>
5 years ago
moraaar 9e0b8c564d
Fixed AzToolsFramework tests (#2887)
* Fixed AzToolsFramework unit tests.

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

* Include missing header.

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

* Using util's class to generate temp directory, instead of qt.

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

* Added empty line

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

* Fixed warning in MessageTest fixture that CacheProjectRootFolder was not set

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

* Additional checks in CreateDefaultEditorEntity helper function.

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

* Updated the AzToolsFrameworkTest logic to set the project cache path

The Project Cache Path and Project Path is set through the CommandLine functionality of the ComponentApplication.
This allows those Project Cache Path and Project Path to be set within the Settings Registry during the ComponentApplication constructor

Removed the explicitly calls to delete the temporary directory and fixed the ScopedTemporaryDirectory class to recursively delete the temporary directory

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

* Setup correctly @assets@ alias for PlatformAddressedAssetCatalogManagerTest and AssetSeedManagerTest fixtures.

- These 2 test fixtures need to manually set the @asset@ alias to not include the platform at the end (which it does by default), because they are looping over platforms in their setup.
- Also initializing pointers to nullptr, so if setup fail in the future the teardown doesn't crash trying to delete garbage.

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Jeremy Ong 5a05fe93d4
Merge pull request #2815 from aws-lumberyard-dev/AzCore/JobGraph
Add initial TaskGraph prototype
5 years ago
Yuriy Toporovskyy fd616fdcfb Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
5 years ago
hultonha ff8c4dce00
Ensure we disconnect from EditorInteractionSystemViewportSelectionRequestBus while recreating m_interactionRequests (#2884)
Fixes a crash while selecting an entity in the viewport while in 'pick' mode.
5 years ago
igarri 9d2b99b558 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
5 years ago
Jeremy Ong 4f9c2cf693 Remove TaskGraph::Drain which was only added initially for testing
The drain function was used only before the API gained the ability to
wait on the completion of a graph. This is the correct way to "drain"
the task executor of work.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
5 years ago
Esteban Papp c85e5a6886 Some more build fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
5 years ago
pappeste eb3e0b0998 updates after merging development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago