Commit Graph

342 Commits

Author SHA1 Message Date
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-14 10:27:33 -07:00
phistere 99c2c3b07b Updates the settings registry visitor that walks through 'engines' from the manifest 2021-05-13 19:04:20 -05:00
Mike Balfour 0ae123eae6 Fix AssetContainer behavior with immediate load errors
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing. This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 16:08:47 -05:00
mbalfour 7866178f3e Fix AssetContainer behavior with immediate load errors
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing.  This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 14:10:45 -05:00
phistere debbfc38d8 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-13 11:25:03 -05:00
bosnichd 4aff32e719 More red code (#732)
Remove:
- Code/CryEngine/CryCommon/Platform
- Some unused Code/CryEngine/CryCommon/Mock files
- Code/Tools/CryXML and almost all of Code/Tools/CryCommonTools
- Code/Tools/TestBed/ResourceCompilerImage
- Tools/DeepBandwidthToExcel
- Various .p4ignore files
2021-05-13 08:55:36 -06:00
Mike Balfour 2679826421 Change SerializeContextTools into a ToolsApplication so that it can correctly read in slice data 2021-05-12 16:03:52 -05:00
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
sharmajs-amzn 7f5962d1ba disable AssetJobsFloodTest.ContainerCoreTest_BasicDependencyManagement_Success test (#703) 2021-05-11 15:23:43 -07:00
mbalfour 21dfcfed74 Fix bug where setting autoLoad to false for one gem will prevent every gem after it from loading as well. 2021-05-11 15:26:07 -05:00
nvsickle fe29318293 Make ScriptTimePoint::Get const correct 2021-05-11 12:18:49 -07:00
sconel 2e32b2ee57 Merge pull request #671 from aws-lumberyard-dev/Prefabs/AssetPreload
Asset Preload fix for json serialization and prefab game mode
2021-05-11 09:35:06 -07:00
phistere 0114a82294 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-11 10:52:47 -05:00
Tom Hulton-Harrop b5e5a3bfee More camera fixes for the new CameraInput system (#667)
* use new ViewportContext interface to set camera transform on load

* WIP fixes for camera viewport handler callbacks

* disable synchonization with old camera when new camera system is enabled

* further updates to camera-input

* ensure event is signalled when camera transform is set

* updates to ModernViewportCameraController

* fix for right click menu appearing with camera

* updates following review feedback

* convert std:: usage to AZStd::
2021-05-11 13:38:09 +01:00
sconel 286a1aafa9 Clang build fix 2021-05-10 19:11:51 -07:00
sconel 5cff7994bf Small update to AssetJsonSerializer result assignment 2021-05-10 19:00:24 -07:00
sconel 12fb07c3e3 Fix for failing AssetJsonSerializer conformity tests 2021-05-10 18:56:29 -07:00
sconel 36911723c2 Addressed PR feedback 2021-05-10 18:17:39 -07:00
pappeste 5838436e31 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
2021-05-10 14:36:20 -07:00
sconel 9255e4c191 Added non const getter to SerializedAssetTracker 2021-05-10 13:05:29 -07:00
sconel 2e9ae76596 Removed print statement, adding in new files that were missed 2021-05-10 12:11:53 -07:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00
sconel b04bfc459f Asset Preload fix for json serialization and prefab game mode 2021-05-10 11:46:58 -07:00
Tom Hulton-Harrop b2523217c3 Update snapping settings to be stored in the Settings Registry (#646)
* add overload to ActionManager to support capturing an AZStd::function

* move snapping settings to new settings registry

* remove unneeded reference in ViewportSettings

* move viewport setting function implementations to .cpp file

* add more sensible default values for snapping

* fix variable name for angle snapping

* remove const from function prototype value parameters

* add import/export api for free functions

* change from std::bind to a lambda

* remove redundant const for constexpr string_view

* add AZStd alias for std::abs
2021-05-10 18:40:32 +01:00
karlberg eb7a8b386a Fixes for unit tests where component application might be null 2021-05-07 20:40:23 -07:00
phistere 92c74a1aaa Fixing minor spacing, spelling, and print formatting. 2021-05-07 20:06:12 -05:00
karlberg 1df2fe1d48 Merging latest origin 2021-05-07 16:28:11 -07:00
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 19:55:26 +01:00
karlberg d2df379fa4 Fixes for AR issues 2021-05-07 11:26:59 -07:00
pappeste 6ab9d68e69 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Code/Tools/ProjectManager/CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog.cpp
#	Code/Tools/ProjectManager/Source/GemCatalog.h
#	Code/Tools/ProjectManager/Source/GemCatalog.ui
#	Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.h
#	Code/Tools/ProjectManager/Source/ScreenFactory.cpp
#	Code/Tools/ProjectManager/project_manager_files.cmake
#	Code/Tools/ProjectManager/source/Qt/GemCatalog.h
2021-05-07 11:05:20 -07:00
karlberg a8fa7a59d4 CR feedback 2021-05-07 10:03:07 -07:00
karlberg 05a39a4412 Fix several build failures 2021-05-07 09:54:49 -07:00
jackalbe 347073cbcd {LYN-2257} Helios - Add Matrix math type for JSON Serialization system (#561)
* {LYN-2257} Helios - Add Matrix math type to the JSON Serialization system

* Helios/Systems - Add Matrix math type to the JSON Serialization system
* supports both YPR+scale+translation and array of values
* supports Matrix3x3, Matrix3x4, Matrix4x4

Jira: https://jira.agscollab.com/browse/LYN-2257
Tests: Added Serialization/Json/MathMatrixSerializerTests.cpp

* clang compile fixes

* removed typename

* fixing both tests and some default conformity impls

* stablized the comformity test values; rotations drift too much
2021-05-07 09:31:48 -05:00
greerdv 4202f646e4 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 15:20:29 +01:00
greerdv 2c6d04f673 feedback from PR 2021-05-07 15:03:57 +01:00
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-06 19:40:09 -07:00
jonbeer 8947abcbb7 PR fixes and recommendations 2021-05-06 16:35:01 -07:00
jonbeer bf38935e85 Updating conformity tests 2021-05-06 14:49:44 -07:00
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-05 20:07:49 -07:00
AMZN-koppersr 4661da23bb Cleaned up the flags in the BaseJsonSerializer.h 2021-05-05 17:51:22 -07:00
AMZN-koppersr ec52e51476 Additional unit tests for the Json Serialization to make sure custom json serializer work if they're the first used through the higher Load/Store calls. 2021-05-05 17:22:57 -07:00
AMZN-koppersr 6ad135f35c Fix for smart pointers being loaded through the main load point with a default JSON object. 2021-05-05 16:41:54 -07:00
pappeste 9fe893830c sine fixes to AP model handling, still getting some sporadic asserts in debug 2021-05-05 16:22:13 -07:00
AMZN-koppersr 790e41f675 Reverted previous fix. 2021-05-05 14:21:53 -07:00
greerdv a49017ec23 merging from main 2021-05-05 13:26:08 +01:00
jonbeer 7963924b6a Removing extra commented code 2021-05-04 18:27:09 -07:00
jonbeer 5e6d058a43 Removing default case to fix crash and updating tests 2021-05-04 18:23:02 -07:00
AMZN-koppersr 2d4a17a2fb Merge branch 'main' into JsonSerializationPointerFix 2021-05-04 13:53:03 -07:00
AMZN-koppersr afcbe4e02b Small updates based on PR feedback. 2021-05-04 13:51:08 -07:00
Aaron Ruiz Mora f770e4aa7a Unifying operators in Matrix3x3, Matrix3x4 and Matrix4x4
- Add operators +, -, * and / too all matrix classes
- Add RetrieveScaleSq and GetReciprocalScaled to all matrix classes
- Add unit tests to all matrix classes
- Fix a bug that causes release configuration not to compile.
2021-05-04 19:12:01 +01:00