01933f45b1
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
f1b688f435
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# CMakeLists.txt
# Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
# Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
# cmake/LYWrappers.cmake
# cmake/SettingsRegistry.cmake
# scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
5942cf066d
Merge pull request #983 from aws-lumberyard-dev/LYN-1914
...
Changed editor icon
2021-05-27 17:41:14 +01:00
7cd325bad9
Adding ProjectManager as an Editor runtime dependency
...
The project manager is needed by the editor if it does not know what project to use
2021-05-27 09:40:48 -07:00
fd8fe8b939
Fixed newly created level having the right source field set ( #986 )
...
* Fixed an issue with the source field a newly created level not being set correctly
2021-05-27 11:40:16 -05:00
072f6e194e
Changed editor icon
2021-05-27 14:02:01 +01:00
9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders ( #949 )
2021-05-26 19:17:17 -05:00
5ed4454e8b
Moved Create New Level logic out from SaveToStream ( #967 )
2021-05-26 17:52:34 -05:00
76fe7f3666
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere
2021-05-25 23:48:55 -05:00
19adbf2f41
Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES
2021-05-25 15:12:17 -07:00
ec1d129100
Merge branch 'main' into transform-float-scale
2021-05-25 19:21:32 +01:00
50f5976e59
Rename and move ModernViewportCameraController ( #866 )
...
* rename ModernViewportCameraController to ModularViewportCameraController and move to AtomToolsFramework
* update names and includes after file moves
2021-05-25 17:28:51 +01:00
d8b74110ff
Merge branch 'main' into transform-float-scale
2021-05-25 16:28:28 +01:00
a037062a07
move trackview changes to another branch
2021-05-25 13:31:39 +01:00
576356684b
Merge branch 'main' into LYN-2139
2021-05-24 16:32:39 +01:00
945f55378e
merge from main
2021-05-24 11:27:43 +01:00
5be021a6de
Added comment.
2021-05-21 14:42:46 +01:00
74a2735766
Add better support for mouse deltas with camera system ( #846 )
...
* add better support for mouse deltas with camera system
* small fixes spotted during review
* rename after review feedback
* small refactor to reduce duplication
2021-05-21 10:35:33 +01:00
032201a66b
Make goto button primary.
2021-05-21 10:31:47 +01:00
bbafd8843d
Adjusted dialog size.
2021-05-21 09:56:25 +01:00
2d550cc994
Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes
2021-05-20 11:07:45 -07:00
3788aa4eec
LYN-2139 UX: Goto Position modal is unnecessarily massive
2021-05-20 17:48:18 +01:00
eb31d90ad9
Updates to fix BoxSelect when using Orbit with the new Camera ( #825 )
...
* update camera controller to block box select during orbit
* simplify update for modern viewport camera controller
* wip working lmb box select with orbit
* add test for changes to click detector
* add unit test for camera system to validate events
* remove debugging code, tidy-up changes for PR
* small updates before posting PR
* fix for linux build failure
2021-05-20 15:54:36 +01:00
1654553e9c
Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes
2021-05-19 19:12:07 -07:00
8d4fb4d67d
Fix dummy rendering pipeline being created for the Editor
...
-This ensures OnBootstrapSceneReady still fires even if the bootstrap system component doesn't create a default scene
-This also disables default scene creation for non-game projects by default to ease tools development
Tested with the Editor, AtomSampleViewer, the Material Editor, and the AtomTest launcher
2021-05-19 19:11:23 -07:00
815e750439
Merge pull request #94 from aws-lumberyard-dev/LY-113714
...
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
2021-05-19 16:05:35 +01:00
7def4741cd
merge from main
2021-05-19 12:14:25 +01:00
43258be51c
Merge pull request #786 from aws-lumberyard-dev/hultonha_LYN-2215_camera-viewport-3
...
Add new orbit functionality for camera
2021-05-18 15:37:38 +01:00
e2f5677bbc
Remove a number of unused CryCommon interfaces and docs related folders. ( #788 )
2021-05-17 14:32:44 -06:00
bb05993355
add new orbit functionality for camrea
2021-05-17 18:25:13 +01:00
f4106fe73f
Add 'Goto entity' support for the new Editor camera ( #743 )
...
* add find entity in viewport functionality to new camera
* fix AZ_CVAR usage
* updates following review feedback
- updated comment styles from /// to //!
- retrieve fov of camera (add test for fov access)
* update namespace naming, fix AZ_CVAR usage
* update missed namespace and use AZ::Transform::CreateLookAt
* add missing include
* move EditorViewportSettings to EditorLib
* update DLL import/export API and rename namespace usage
2021-05-17 18:21:38 +01:00
749ffcfff2
Merge pull request #708 from aws-lumberyard-dev/Atom/breja/FixDefaultDebugDrawId
...
Fix AzFramework::g_defaultSceneEntityDebugDisplayId not working for the AtomDebugDisplayViewportInstance
2021-05-17 10:26:40 -05:00
0a8621ba0a
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-16 11:51:00 -05:00
46c0c35c26
Merge pull request #734 from aws-lumberyard-dev/nvsickle/DebugInfoDisplay
...
Restore debug rendering to the viewport
2021-05-14 15:20:05 -07:00
9ecbbe471b
Remove lots of unused things from CrySystem ( #765 )
...
Remove lots of unused things from CrySystem
2021-05-14 15:38:59 -06:00
1426052a5f
Address a bit more review feedback
...
-Use aznumeric_cast for enum <-> int casts
-Short circuit logic a bit more nicely
2021-05-14 13:01:46 -07:00
cc986f563a
Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay
2021-05-14 10:27:33 -07:00
a9d986c10f
Red code legacy MemoryManager, StreamEngine, ResourceManager, ImageHandler, AsyncPakManager, and more ( #758 )
...
Remove from CryCommon and CrySystem:
- MemoryManager and all related classes/files
- StreamEngine, ResourceManager, ImageHandler, and AsyncPakManager
- Various other related interfaces/files/classes etc. that are all now unused
2021-05-14 08:53:56 -06:00
3d84902b24
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). ( #741 )
...
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used).
2021-05-13 11:10:44 -06:00
debbfc38d8
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-13 11:25:03 -05:00
26b8181cc1
Merge branch 'main' into LYN-1099
2021-05-13 09:18:13 +01:00
8fd5c30e13
Address some build/review feedback
2021-05-12 17:47:10 -07:00
cb09d542d1
Use the new Atom API instead of the removed r_displayInfo for ViewportTitleDlg
2021-05-12 15:59:21 -07:00
7cec2d8b07
Remove more unused things from CryCommon and CrySystem. ( #709 )
...
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
2021-05-12 08:30:15 -06:00
552ebea135
Added Simulate button
2021-05-12 11:40:36 +01:00
f9fb61cc5d
Fix issue with viewport interaction ordering and viewport matrix changed handler ( #695 )
...
* fix for ctrl+mouse-wheel to cycle transform modes in the viewport
* ensure correct callback function is invoked
* remove redundant check in CameraInput
2021-05-12 09:40:37 +01:00
0cad668f31
Merge branch 'main' into LYN-1099
2021-05-12 08:58:43 +01:00
2558801a24
Commit before merging main
2021-05-12 08:58:16 +01:00
d9ae94ee77
Merge remote-tracking branch 'upstream/main' into Atom/breja/FixDefaultDebugDrawId
2021-05-11 16:24:49 -05:00
85e4f0d65f
Fix AzFramework::g_defaultSceneEntityDebugDisplayId not working for the AtomDebugDisplayViewportInstance
2021-05-11 16:24:28 -05:00
pappeste
jjjoness
Alex Peterson
Terry Michaels
John Jones-Steele
lumberyard-employee-dm
greerdv
Tom Hulton-Harrop
sphrose
nvsickle
bosnichd
hultonha
rgba16f
phistere