Commit Graph

328 Commits

Author SHA1 Message Date
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-21 10:54:44 -05:00
igarri 5434754def Merge branch 'main' into LYN-1767-AB 2021-05-21 14:54:42 +01:00
sphrose 5be021a6de Added comment. 2021-05-21 14:42:46 +01:00
igarri dfb0d7f9f5 Fixed numeric_cast, style, const variables 2021-05-21 12:33:55 +01:00
Tom Hulton-Harrop 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
sphrose 032201a66b Make goto button primary. 2021-05-21 10:31:47 +01:00
sphrose bbafd8843d Adjusted dialog size. 2021-05-21 09:56:25 +01:00
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 14:44:36 -05:00
nvsickle 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-20 11:07:45 -07:00
sphrose 3788aa4eec LYN-2139 UX: Goto Position modal is unnecessarily massive 2021-05-20 17:48:18 +01:00
Chris Galvan 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 10:40:50 -05:00
Tom Hulton-Harrop 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
nvsickle 1654553e9c Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-19 19:12:07 -07:00
nvsickle 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
sphrose 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
greerdv 7def4741cd merge from main 2021-05-19 12:14:25 +01:00
igarri 0b50b6cc63 Fixed code Style and minor issues from feedback 2021-05-19 12:04:40 +01:00
Chris Galvan 0959756f73 [LYN-2255] Implemented duplication of entities with prefabs. 2021-05-18 15:05:12 -05:00
Tom Hulton-Harrop 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
igarri f49e4b3333 modified code from feedback 2021-05-18 15:26:05 +01:00
igarri 1c2b8f9111 Adding AZ_CVAR for the new feature 2021-05-18 13:33:21 +01:00
bosnichd e2f5677bbc Remove a number of unused CryCommon interfaces and docs related folders. (#788) 2021-05-17 14:32:44 -06:00
hultonha bb05993355 add new orbit functionality for camrea 2021-05-17 18:25:13 +01:00
Tom Hulton-Harrop 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
rgba16f 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
igarri 10ca002ced Checkbox to select view 2021-05-17 14:25:43 +01:00
igarri b9c9811d35 Fixing qobject_cast to the StringFilter 2021-05-17 14:06:01 +01:00
phistere 0a8621ba0a Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-16 11:51:00 -05:00
Nicholas Van Sickle 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
bosnichd 9ecbbe471b Remove lots of unused things from CrySystem (#765)
Remove lots of unused things from CrySystem
2021-05-14 15:38:59 -06:00
nvsickle 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
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-14 10:27:33 -07:00
bosnichd 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
igarri d5591e52ff Merge branch 'main' into LYN-1767-AB 2021-05-14 13:12:29 +01:00
igarri cff9fea535 Switching views with filters 2021-05-14 13:09:14 +01:00
bosnichd 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
jjjoness 5940f2ebbe Merge pull request #739 from aws-lumberyard-dev/LYN-1099
LYN-1099 DEV TASK - Play Controls
2021-05-13 17:35:17 +01: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
jjjoness 26b8181cc1 Merge branch 'main' into LYN-1099 2021-05-13 09:18:13 +01:00
nvsickle 8fd5c30e13 Address some build/review feedback 2021-05-12 17:47:10 -07:00
nvsickle cb09d542d1 Use the new Atom API instead of the removed r_displayInfo for ViewportTitleDlg 2021-05-12 15:59:21 -07:00
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
bosnichd 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
igarri c1e21185b4 Selecting correct indexes from Asset Browser Model 2021-05-12 12:20:23 +01:00
igarri 80684b383b Code cleanup 2021-05-12 11:42:39 +01:00
jjjoness 552ebea135 Added Simulate button 2021-05-12 11:40:36 +01:00
igarri 1c990b2ef6 Filter Sorting Working 2021-05-12 11:03:02 +01:00
Tom Hulton-Harrop 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
jjjoness 0cad668f31 Merge branch 'main' into LYN-1099 2021-05-12 08:58:43 +01:00