749df7d977
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-12 11:16:44 -05:00
671f26bed4
fixing debug configuration and how we declare IMPORTED targets (instead of UNKNOW we use the actual type)
2021-05-11 19:06:07 -07:00
5eecd2d5f7
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-11 17:27:10 -05:00
083849b444
Fixing initialization of LyShin and removing a macro and ISystemEventListner that were not doing anything
2021-05-11 14:41:28 -07:00
0114a82294
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-11 10:52:47 -05:00
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
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
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
7b2e19c86e
Merge pull request #572 from aws-lumberyard-dev/script_canvas
...
"VariableManager_UnpinVariableType_Works"
2021-05-11 04:55:52 -07:00
591ad7f824
Added xml output for tests ( #664 )
...
Added test reporting information for jenkins
2021-05-11 12:44:27 +01:00
27d6e5b848
formatting tidy up
2021-05-11 11:41:33 +01:00
619f71cc19
fixing some bugs with debug draw not taking entity scale into account
2021-05-11 11:39:14 +01:00
d49135659f
[LYN-2520] Added link and tag widgets ( #663 )
2021-05-11 12:19:56 +02:00
793af49457
Merge branch 'main' into debug_draw_transform
2021-05-11 09:50:51 +01:00
805f447d41
"Resolving merge conflicts"
2021-05-11 01:41:52 -07:00
ffd2187722
Merge branch 'main' into script_canvas
2021-05-11 01:39:52 -07:00
a82d22a718
"Resolving merge conflicts"
2021-05-11 01:39:14 -07:00
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
f21d3da9ee
"Fixing review Comments"
2021-05-11 01:30:39 -07:00
f8fe5eebfa
merge from main
2021-05-11 12:13:02 +05:30
4fa8e8cf2e
Merge branch 'main' into sc_automation_del_searchtext
2021-05-11 11:57:22 +05:30
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
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -05:00
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
d7c72a249c
Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
...
Atom/mriegger/pls
2021-05-10 17:13:39 -07:00
d26c4614ba
add unit tests for WinGenericLauncher class
2021-05-10 16:48:38 -07:00
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
a1b4844f6a
Merge branch 'main' into Atom/jromnoa/SPEC-6728-fix-material-editor-launcher
2021-05-10 16:30:47 -07:00
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
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
b3ae71a5d8
misc fixes
2021-05-10 16:03:00 -07:00
232f81b4ea
wrong trait
2021-05-10 16:02:21 -07:00
f222590d77
fixing debug
2021-05-10 16:02:07 -07:00
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
c2a1365279
removing debugging messages
2021-05-10 15:05:38 -07:00
03bde5c244
getting CMakeTestbed to build again
2021-05-10 15:05:17 -07:00
c5b6878e91
removing more mentions to a gone cvar
2021-05-10 14:55:24 -07:00
65e0bd270e
Fixing runtime dependencies (including qt deploy). Running AP/Editor again
2021-05-10 14:55:03 -07:00
89fc1483fe
removing unused var
2021-05-10 14:52:26 -07:00
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
5885899497
fix tabbing, add WinGenericLauncher class import to ly_test_tools.launchers.__init__
2021-05-10 14:44:47 -07:00
5838436e31
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# CMakeLists.txt
2021-05-10 14:36:20 -07:00
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
fb6c6e2468
Merge branch 'main' into debug_draw_transform
2021-05-10 22:02:27 +01:00
45055ab3cc
applying debug draw transform stack to DrawLines and DrawTriangles
2021-05-10 22:01:41 +01:00
12cea5d029
Fixing headers and interface build dependencies
2021-05-10 13:58:22 -07:00
b6890eef5c
removed debugging text
2021-05-10 13:36:05 -07:00
8044760613
ATOM-15446 ImGui assert with Editor debug build ( #622 )
...
Disable the assert as short term solution. A proper fix will be addressed in ATOM-15495
2021-05-10 13:33:51 -07:00
33872f9e2c
Merge pull request #670 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6574-increase-test-timeout-for-debug-builds
...
Increase Atom AutomatedTesting tests timeout so that it passes in debug builds.
2021-05-10 13:33:19 -07:00
fc03734b41
Fixes dedicated servers in LyTestTools
2021-05-10 13:16:06 -07:00
phistere
pappeste
greerdv
Tom Hulton-Harrop
darapan-ly-sdets
AMZN-AlexOteiza
greerdv
Benjamin Jillich
darapan
balibhan
balibhan
Danilo Aimini
Terry Michaels
jromnoa
mrieggeramzn
jromnoa
Vicky
evanchia-ly-sdets
bosnichd
kberg-amzn
evanchia