Commit Graph

1616 Commits

Author SHA1 Message Date
greerdv 655d71e0dd update compatibility of atom components with NonUniformScaleService 2021-05-12 22:16:14 +01:00
greerdv 059f69e5e6 tidy up NonUniformScaleService compatibility 2021-05-12 21:20:23 +01:00
Guthrie Adams e915133bbf Merge pull request #687 from aws-lumberyard-dev/Atom/guthadam/ATOM-15128
ATOM-15128 replacing material editor icon
2021-05-11 13:10:09 -05:00
Guthrie Adams ff9d8f7a87 Merge pull request #660 from aws-lumberyard-dev/Atom/guthadam/ATOM-15486
ATOM-15486 Material Editor: Implement layout and user settings
2021-05-11 13:09:39 -05:00
greerdv f40bbb4be3 Merge pull request #693 from aws-lumberyard-dev/shape_collider_editor_body
fixing bug with shape collider editor body not being deleted when it …
2021-05-11 18:59:31 +01:00
Terry Michaels 4a5d773034 Removed environment and debug mode buttons 2021-05-11 12:55:00 -05:00
Nicholas Lawson 1cbcfa75e8 Fixes a crash on mac in the SourceFileRelocatorTest (#688)
Note that this test should crash on windows too
but its a read-beyond-the-edge-of-array memory issue
which could be intermittent.
2021-05-11 10:40:31 -07:00
Mike Balfour 9ccddab552 Merge pull request #694 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
Fix up incorrect autoDelete use and handling.
2021-05-11 12:02:28 -05:00
Alex Peterson 26d886792d Initial Python bindings pass for ProjectManager
Adds dependency on pybind and interface to call o3de.py functions from c++
2021-05-11 09:48:11 -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
Ken Pruiksma 02d88bc8da Merge pull request #676 from aws-lumberyard-dev/pruiksma/ATOM-15515
ATOM-15515 Fixing nullptr reference in OnShapeChanged() in light delegates.
2021-05-11 11:02:52 -05:00
greerdv dff8de94a5 making both colliders and shape colliders check m_simulating in IsPhysicsEnabled 2021-05-11 16:57:23 +01:00
bosnichd 3defbce31b Remove legacy serialization and QPropertyTree (#684)
Remove:
- CryCommon/CryExtension/*
- CryCommon/Serialization/*
- Sandbox/Plugins/EditorCommon/QPropertyTree/*
- All related CryCommon interfaces
- All CrySystem implementations
- Various related Editor classes
2021-05-11 09:31:02 -06:00
mbalfour 704443ac89 Fix up incorrect autoDelete use and handling.
Several UI property handlers were incorrectly using the autoDelete feature by calling UnregisterPropertyType and deleting the pointer themselves, which caused double-delete crashes on application shutdown.  PropertyManagerComponent now gracefully handles that condition but also explicitly asserts explaining how the code should be changed, and the "known offenders" have been fixed up to use autoDelete correctly.
2021-05-11 10:25:03 -05:00
greerdv 8e90e87bc8 fixing bug with shape collider editor body not being deleted when it is recreated 2021-05-11 16:17:23 +01:00
greerdv a009e38064 Merge pull request #679 from aws-lumberyard-dev/debug_draw_transform
applying debug draw transform stack to DrawLines and DrawTriangles
2021-05-11 14:51:23 +01:00
Tom Hulton-Harrop b185a94519 Remove all references to old CGrid system (#672)
* 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

* restore grid and angle snapping

* add overload to ActionManager to support capturing an AZStd::function

* remove old legacy CGrid code

* fix build after merge

* review feedback changes - remove 1.0f multiplies
2021-05-11 14:09:09 +01: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
darapan-ly-sdets 7b2e19c86e Merge pull request #572 from aws-lumberyard-dev/script_canvas
"VariableManager_UnpinVariableType_Works"
2021-05-11 04:55:52 -07:00
AMZN-AlexOteiza 591ad7f824 Added xml output for tests (#664)
Added test reporting information for jenkins
2021-05-11 12:44:27 +01:00
greerdv 27d6e5b848 formatting tidy up 2021-05-11 11:41:33 +01:00
greerdv 619f71cc19 fixing some bugs with debug draw not taking entity scale into account 2021-05-11 11:39:14 +01:00
Benjamin Jillich d49135659f [LYN-2520] Added link and tag widgets (#663) 2021-05-11 12:19:56 +02:00
greerdv 793af49457 Merge branch 'main' into debug_draw_transform 2021-05-11 09:50:51 +01:00
darapan 805f447d41 "Resolving merge conflicts" 2021-05-11 01:41:52 -07:00
darapan ffd2187722 Merge branch 'main' into script_canvas 2021-05-11 01:39:52 -07:00
darapan a82d22a718 "Resolving merge conflicts" 2021-05-11 01:39:14 -07:00
balibhan 23744f27c1 Merge pull request #638 from aws-lumberyard-dev/sc_automation_del_searchtext
Node palette search box text deletion
2021-05-11 14:04:33 +05:30
darapan f21d3da9ee "Fixing review Comments" 2021-05-11 01:30:39 -07:00
balibhan f8fe5eebfa merge from main 2021-05-11 12:13:02 +05:30
balibhan 4fa8e8cf2e Merge branch 'main' into sc_automation_del_searchtext 2021-05-11 11:57:22 +05:30
Danilo Aimini d61c93a7b6 Merge pull request #431 from aws-lumberyard-dev/Prefab/Create/IgnoreLevel
LYN-3211 | Create Prefab can be triggered on the Level Container, generating an invalid level hierarchy
2021-05-10 23:09:51 -07:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05: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
jromnoa f21637f471 Merge pull request #685 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6728-fix-material-editor-launcher
SPEC-6728: azlmbr.materialeditor test fix for Atom hydra tests.
2021-05-10 17:51:23 -07:00
pruiksma 7957d3f8b6 Merge branch 'main' into pruiksma/ATOM-15515 2021-05-10 19:45:09 -05:00
mrieggeramzn d7c72a249c Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
Atom/mriegger/pls
2021-05-10 17:13:39 -07:00
jromnoa d26c4614ba add unit tests for WinGenericLauncher class 2021-05-10 16:48:38 -07:00
Vicky 01b2798fe1 Integrate from 1.0 to main: LYN-3436 AutomatedTesting.GameLauncher crashes at launch if assets are not all processed (#612)
* Atom/qingtao/lyn 3436 (#558)

* LYN-3436 AutomatedTesting.GameLauncher crashes at launch if assets are not all processed

Change RPISystem so that the application would exit if the RPI system couldn't load critical assets.
Added code to avoid the GetLayout crash when layout for each platforms were not ready.
Added LoadCriticalAsset function to force compile and load critical assets.
Added default value to viewport size for ViewportContext.

* Change RPISystem asset initialization order so it returns earlier when those critical assets are not ready
2021-05-10 16:46:25 -07:00
jromnoa a1b4844f6a Merge branch 'main' into Atom/jromnoa/SPEC-6728-fix-material-editor-launcher 2021-05-10 16:30:47 -07:00
jromnoa 757a26825a adds new HOST_OS_GENERIC_EXECUTABLE constant and adds error handling if the executable doesn't exist in the path provided 2021-05-10 16:27:30 -07:00
evanchia-ly-sdets e237d88dbe Merge pull request #678 from aws-lumberyard-dev/test_tools_ap_fix
Test tools dedicated server ap fix
2021-05-10 16:13:17 -07:00
guthadam cf0d3af78e ATOM-15128 replacing material editor icon 2021-05-10 18:02:26 -05:00
bosnichd 7fd356751b Remove the ImageProcessing Gem. (#677)
Remove the ImageProcessing Gem. This was supposed to have happened as part of [21d96e7], but looks like I only removed it from the CMakeLists.txt file and forgot to delete the actual folder!
2021-05-10 16:17:24 -06:00
kberg-amzn b12cc5b1e5 Merge pull request #674 from aws-lumberyard-dev/MultiplayerComponents
Potential fix for build failures in main
2021-05-10 14:49:11 -07:00
jromnoa 5885899497 fix tabbing, add WinGenericLauncher class import to ly_test_tools.launchers.__init__ 2021-05-10 14:44:47 -07:00
jromnoa 8766790f48 re-add WinGenericLauncher for custom .exe launchers instead of the hard-coded ones (i.e. able to use 'MaterialEditor.exe' instead of 'Editor.exe' for a WinLauncher class) 2021-05-10 14:28:02 -07:00