Commit Graph

234 Commits (4a15f55f789a8c3e9cae506e43b4482c20b303c7)

Author SHA1 Message Date
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
5 years ago
pappeste 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
5 years ago
jjjoness 5942cf066d
Merge pull request #983 from aws-lumberyard-dev/LYN-1914
Changed editor icon
5 years ago
Alex Peterson 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
5 years ago
Terry Michaels 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
5 years ago
AMZN-stankowi 9d94977b2c
FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support (#933)
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)"

This reverts commit 58adcf168f.

* Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"

This reverts commit 798d96f1a2, reversing
changes made to eb31d90ad9.

* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""

This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.

* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)""

This reverts commit 978477097892a22e83519646527ff52ba6532f35.

* Fixed how FbxImportRequestHandler is loaded

* Bumped version to force FBX to rebuild + removed unused variable

* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)""

This reverts commit 978477097892a22e83519646527ff52ba6532f35.

* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""

This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.

* Fixed a bad revert

* Better error reporting at AP launch

* AZ_CRC -> AZ_CRC_CE and removed delayed reload of settings registry file now that it's available at startup

* fixed typo in comment
5 years ago
John Jones-Steele 072f6e194e Changed editor icon 5 years ago
Terry Michaels 9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders (#949) 5 years ago
Terry Michaels 5ed4454e8b
Moved Create New Level logic out from SaveToStream (#967) 5 years ago
pappeste a421b4cb71 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948
# Conflicts:
#	scripts/o3de.py
5 years ago
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 5 years ago
pappeste df44f782f2 More dependencies fixes 5 years ago
pappeste 19adbf2f41 Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES 5 years ago
greerdv ec1d129100 Merge branch 'main' into transform-float-scale 5 years ago
Tom Hulton-Harrop 50f5976e59
Rename and move ModernViewportCameraController (#866)
* rename ModernViewportCameraController to ModularViewportCameraController and move to AtomToolsFramework

* update names and includes after file moves
5 years ago
greerdv d8b74110ff Merge branch 'main' into transform-float-scale 5 years ago
greerdv a037062a07 move trackview changes to another branch 5 years ago
sphrose d15cbdbbc8
Merge pull request #865 from aws-lumberyard-dev/LYN-2139
LYN-2139 UX: Goto Position modal is unnecessarily massive
5 years ago
pappeste db0db5c1c0 Proper dependencies to LmbrCentral/LmbrCentral.Editor, mixing those two can cause Editor modules to load non-Editor modules 5 years ago
greerdv 42c5801c52 Merge branch 'main' into transform-float-scale 5 years ago
rgba16f d4bad61f9a
DebugDraw gem fixes for Atom (#885)
* Work in progress on adapting the DebugDraw gem to use AzFramework::DebugDisplayRequests API

* Cleanup fixes for DebugDisplayRequestBus & DebugDraw gem.

Remove SandboxIntegration implementation of the DebugDisplayRequestBus
Add DrawWireCylinder & DrawWireCone to the DebugDisplayRequestBus interface
Remove SetFillMode & DrawTexture functions from the DebugDisplayRequestBus interface
Fixup uses of the SetFillMode api, replace with new Draw[Wire|Solid]X functions.
Fixes to the DebugDraw gem to get it compiling with new warnings settings.

* Changes to get the DebugDraw gem working with Atom/RHI/Code/Include/Atom/RHI

Add GetWidth, GetHeight, GetDepth utility accessors to RHI::Viewport
Start cleaning out unnecessary Cry includes from DebugDraw gem
Fixes for AtomFont FFont.cpp 3d screen aligned text drawing.
Clean out no longer supported code for 3d text to render multiple strings for the same entity location

* Cleanup some unused or commented code

* Update with PR feedback from Nick Van Sickle
5 years ago
sphrose 576356684b Merge branch 'main' into LYN-2139 5 years ago
greerdv 945f55378e merge from main 5 years ago
cgalvan 6f23138338
Merge pull request #809 from aws-lumberyard-dev/cgalvan/DuplicateEntities
[LYN-2255] Implemented duplication of entities with prefabs.
5 years ago
Terry Michaels d785b3310f
Make sure to autoscroll to a selected entity after a rename (#872) 5 years ago
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
sphrose 5be021a6de Added comment. 5 years ago
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
5 years ago
sphrose 032201a66b Make goto button primary. 5 years ago
sphrose bbafd8843d Adjusted dialog size. 5 years ago
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
nvsickle 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 5 years ago
sphrose 3788aa4eec LYN-2139 UX: Goto Position modal is unnecessarily massive 5 years ago
Chris Galvan 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
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
5 years ago
nvsickle 1654553e9c Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 5 years ago
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
5 years ago
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.
5 years ago
greerdv 7def4741cd merge from main 5 years ago
Chris Galvan 0959756f73 [LYN-2255] Implemented duplication of entities with prefabs. 5 years ago
Tom Hulton-Harrop 43258be51c
Merge pull request #786 from aws-lumberyard-dev/hultonha_LYN-2215_camera-viewport-3
Add new orbit functionality for camera
5 years ago
bosnichd e2f5677bbc
Remove a number of unused CryCommon interfaces and docs related folders. (#788) 5 years ago
hultonha bb05993355 add new orbit functionality for camrea 5 years ago
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
5 years ago
rgba16f 749ffcfff2
Merge pull request #708 from aws-lumberyard-dev/Atom/breja/FixDefaultDebugDrawId
Fix AzFramework::g_defaultSceneEntityDebugDisplayId not working for the AtomDebugDisplayViewportInstance
5 years ago
phistere 0a8621ba0a Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
Nicholas Van Sickle 46c0c35c26
Merge pull request #734 from aws-lumberyard-dev/nvsickle/DebugInfoDisplay
Restore debug rendering to the viewport
5 years ago
bosnichd 9ecbbe471b
Remove lots of unused things from CrySystem (#765)
Remove lots of unused things from CrySystem
5 years ago
nvsickle 1426052a5f Address a bit more review feedback
-Use aznumeric_cast for enum <-> int casts
-Short circuit logic a bit more nicely
5 years ago
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 5 years ago