birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f0ba0ff7eb1eccdae2a8cc4beb05f4bb91ee468e
o3de/Code/Editor
T
History
Danilo Aimini 9dc85000a3 LYN-7547 | Focus Mode - It is possible to create a child entity of a closed container (#5193) 
* Disable drag&drop of entities on closed containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Do not show the Create Entity context menu when right clicking a closed prefab container.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable entity creation on closed containers, both via the Create Entity flow and drag/drop of assets.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor changes to modernize old code.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-02 13:21:51 -07:00
..
Animation
Removal of unused files from Code/Editor
2021-08-05 12:43:46 -07:00
AssetDatabase
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssetEditor
Cleanup SerializeContext.h pt.1 (#4264)
2021-09-29 11:31:01 -05:00
AssetImporter
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AzAssetBrowser
Asset Browser Search View fixes (#4814)
2021-10-25 10:35:50 +01:00
Commands
Fixes clang cases
2021-09-03 13:27:31 -07:00
Common
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Controls
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
Core
Improvements to C++/Python tool gemplates
2021-10-28 14:30:14 -05:00
Dialogs
Update the FileIO Aliases (#4186)
2021-10-05 15:12:53 -05:00
EditMode
PR comments/fixes
2021-08-25 14:06:26 -07:00
Export
Code/Editor
2021-09-10 20:15:16 -07:00
Geometry
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
Include
Remove references to legacy visibility system (#4441)
2021-10-04 09:42:16 +01:00
Launcher
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Lib/Tests
Do not clear input channels everytime focus changes (#5044)
2021-11-02 09:19:06 +00:00
LightmapCompiler
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainWindow
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Objects
Add support for border in Focus Mode (#4692)
2021-10-15 12:56:05 +01:00
Platform
[Mac] Fix QtEditorApplication_mac include (#4978)
2021-10-26 08:30:51 -07:00
Plugins
LYN-7547 | Focus Mode - It is possible to create a child entity of a closed container (#5193)
2021-11-02 13:21:51 -07:00
QtUI
Code/Editor
2021-08-16 16:42:30 -07:00
RenderHelpers
Code/Editor
2021-08-20 17:53:14 -07:00
res
Create config files automatically and UX style updates (#3514)
2021-08-31 11:15:04 -07:00
Style
Introduce default font size. This fixes sizing and spacing for text rendered via a painter with not font specified. (#4069)
2021-09-13 14:23:00 -07:00
TimeOfDay
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackView
Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
2021-10-26 15:47:17 -05:00
Translations
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Undo
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
Util
Fix to prevent using legacy windows based logic to create a Path on Linx (#4704)
2021-10-14 12:58:53 -07:00
WelcomeScreen
PerScreenDpi | QLabels incorrectly handle scale for icons (#4070)
2021-09-14 20:35:56 +01:00
2DViewport.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
2DViewport.h
Code/Editor
2021-09-10 20:15:16 -07:00
AboutDialog.cpp
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
AboutDialog.h
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
AboutDialog.ui
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
ActionManager.cpp
Fix unused warnings release (#3677)
2021-08-30 13:10:41 -07:00
ActionManager.h
Code/Editor
2021-09-10 20:15:16 -07:00
AnimationContext.cpp
Updating PR to change lower API to return AZStd::string instead of const char* for safety.
2021-08-25 15:28:42 -05:00
AnimationContext.h
Code/Editor
2021-09-10 20:15:16 -07:00
arhitype_tree_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
arhitype_tree_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
arhitype_tree_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
arhitype_tree_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
BaseLibrary.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
BaseLibrary.h
Code/Editor
2021-09-10 20:15:16 -07:00
BaseLibraryItem.cpp
more fixes, will merge fixes for w4245 and w4389
2021-08-16 16:06:22 -07:00
BaseLibraryItem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryManager.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
BaseLibraryManager.h
Code/Editor
2021-09-10 20:15:16 -07:00
bmp00005_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_08.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00005_09.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00006_07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CheckOutDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CheckOutDialog.h
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
CheckOutDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Clipboard.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Clipboard.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
CMakeLists.txt
Update tiff to the new package revision (fixes IOS TIFF package) (#4638)
2021-10-13 13:46:20 -07:00
ConfigGroup.cpp
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
ConfigGroup.h
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
ConsoleDialog.cpp
Fixes clang cases
2021-09-03 13:27:31 -07:00
ConsoleDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CrtDebug.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
CryEdit.cpp
Fixes for release builds with DCO fix (#5164)
2021-11-02 09:03:38 -07:00
CryEdit.h
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
CryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditDoc.cpp
Fix casing of editor_xml filenames to match casing in .ly files (#4640)
2021-10-12 15:08:07 -07:00
CryEditDoc.h
Merge branch 'development' into Prefab/SaveAllPrefabs
2021-09-08 14:11:50 -07:00
CryEditLiveCreate.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditPy.cpp
Reorganized Prefab tests and standarization (#4786)
2021-10-20 16:16:04 +01:00
CustomAspectRatioDlg.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
CustomAspectRatioDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CustomAspectRatioDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CustomizeKeyboardDialog.cpp
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
CustomizeKeyboardDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CustomizeKeyboardDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CustomResolutionDlg.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
CustomResolutionDlg.h
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
CustomResolutionDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CVarMenu.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CVarMenu.h
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
DimensionsDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DimensionsDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DimensionsDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
DisplaySettings.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
DisplaySettings.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DisplaySettingsPythonFuncs.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DisplaySettingsPythonFuncs.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DocMultiArchive.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DPIAware.xml
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
editor_core_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_core_test_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_darwin_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_headers_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_lib_files.cmake
Removed legacy ColorGradientCtrl.
2021-10-21 10:55:32 -05:00
editor_lib_terrain_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_lib_test_files.cmake
Fix issue with mouse input for viewport camera (#3210)
2021-08-19 09:06:24 +01:00
editor_lib_test_terrain_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_win_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorCryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorDefs.h
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
EditorEnvironment.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorEnvironment.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorFileMonitor.cpp
Update the FileIO Aliases (#4186)
2021-10-05 15:12:53 -05:00
EditorFileMonitor.h
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
EditorModularViewportCameraComposer.cpp
Update naming to CameraInput types (#4527)
2021-10-07 10:01:30 +01:00
EditorModularViewportCameraComposer.h
Update naming to CameraInput types (#4527)
2021-10-07 10:01:30 +01:00
EditorModularViewportCameraComposerBus.h
Expose camera input channels to the UI and ensure the cached values are refreshed when updated (#3607)
2021-08-27 09:29:08 +01:00
EditorPanelUtils.cpp
unnecessary pragmas incompatible with clang
2021-08-30 16:51:31 -07:00
EditorPanelUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesDialog.cpp
bugfix: correct broken layout when searching global preferences (#4689)
2021-10-15 12:56:20 +01:00
EditorPreferencesDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorPreferencesPageAWS.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageAWS.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageExperimentalLighting.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageExperimentalLighting.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageFiles.cpp
Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660)
2021-10-15 09:55:41 +01:00
EditorPreferencesPageFiles.h
Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660)
2021-10-15 09:55:41 +01:00
EditorPreferencesPageGeneral.cpp
Changed parameter names to reflect the recursive nature of functions and some more changes
2021-09-07 14:27:00 -07:00
EditorPreferencesPageGeneral.h
Changed parameter names to reflect the recursive nature of functions and some more changes
2021-09-07 14:27:00 -07:00
EditorPreferencesPageViewportCamera.cpp
changed names
2021-10-18 12:20:04 +01:00
EditorPreferencesPageViewportCamera.h
Added default camera position to viewport settings
2021-10-18 12:16:54 +01:00
EditorPreferencesPageViewportDebug.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportDebug.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportGeneral.cpp
Expose sticky select option to the SettingsRegistry and disable by default (#4149)
2021-09-16 09:14:37 +01:00
EditorPreferencesPageViewportGeneral.h
Expose sticky select option to the SettingsRegistry and disable by default (#4149)
2021-09-16 09:14:37 +01:00
EditorPreferencesPageViewportManipulator.cpp
updates after file renames
2021-09-06 18:24:45 +01:00
EditorPreferencesPageViewportManipulator.h
updates after file renames
2021-09-06 18:24:45 +01:00
EditorPreferencesTreeWidgetItem.cpp
Cleanup SerializeContext.h pt.1 (#4264)
2021-09-29 11:31:01 -05:00
EditorPreferencesTreeWidgetItem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesTreeWidgetItemDelegate.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesTreeWidgetItemDelegate.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorToolsApplication.cpp
Additional test support for Manipulator Ditto commands (#4191)
2021-09-20 09:49:01 +01:00
EditorToolsApplication.h
Additional test support for Manipulator Ditto commands (#4191)
2021-09-20 09:49:01 +01:00
EditorToolsApplicationAPI.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorVersion.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorViewportCamera.cpp
Remove camera LookAtAfterInterpolation (#4391)
2021-09-30 08:43:48 +01:00
EditorViewportCamera.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorViewportSettings.cpp
merge develop
2021-10-18 12:42:00 +01:00
EditorViewportSettings.h
merge develop
2021-10-18 12:42:00 +01:00
EditorViewportWidget.cpp
Set View in viewport fixed
2021-10-18 11:49:05 +01:00
EditorViewportWidget.h
Added Default Camera Location to the Viewport Setting Registry
2021-10-14 12:44:41 +01:00
ErrorDialog.cpp
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
ErrorDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ErrorRecorder.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorRecorder.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorReport.cpp
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
ErrorReport.h
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
ErrorReportDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
ErrorReportDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorReportDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ErrorReportTableModel.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
ErrorReportTableModel.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FBXExporterDialog.cpp
Code/Editor
2021-08-23 13:00:27 -07:00
FBXExporterDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FBXExporterDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
FileTypeUtils.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FileTypeUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameEngine.cpp
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
GameEngine.h
[redcode/crythread-2nd-pass] post merge include fixes
2021-08-11 21:04:19 -07:00
GameExporter.cpp
Update all the hardcoded filenames inside the level.pak file to be lowercase now the editor no longer forces them to be lower case. (#4802)
2021-10-20 10:35:31 -05:00
GameExporter.h
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
GameResourcesExporter.cpp
More fixes for Code/Editor
2021-08-16 16:42:05 -07:00
GameResourcesExporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GenericSelectItemDialog.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
GenericSelectItemDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GenericSelectItemDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
GotoPositionDlg.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
GotoPositionDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GotoPositionDlg.ui
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GridUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IconListDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
IconManager.cpp
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
IconManager.h
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
IEditor.h
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
IEditorImpl.cpp
Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)
2021-09-13 09:36:34 +01:00
IEditorImpl.h
Code/Editor
2021-09-10 20:15:16 -07:00
IEditorPanelUtils.h
Remove ResourceSelectorHost and clean up/refactor related bits (#3050)
2021-08-16 12:41:24 -05:00
InfoBar.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
IObservable.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IPostRenderer.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
KeyboardCustomizationSettings.cpp
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
KeyboardCustomizationSettings.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LayoutConfigDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
LayoutConfigDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LayoutConfigDialog.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LayoutConfigDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LayoutWnd.cpp
Code/Editor
2021-08-20 17:53:14 -07:00
LayoutWnd.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
LevelFileDialog.cpp
Code/Editor
2021-08-23 13:00:27 -07:00
LevelFileDialog.h
Code/Editor
2021-08-20 17:53:14 -07:00
LevelFileDialog.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LevelFileDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LevelIndependentFileMan.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelIndependentFileMan.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelInfo.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
LevelInfo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelTreeModel.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelTreeModel.h
Code/Editor
2021-09-10 20:15:16 -07:00
LogFile_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFile.cpp
Fixes clang cases
2021-09-03 13:27:31 -07:00
LogFile.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFileImpl.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFileImpl.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LyViewPaneNames.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
main.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainStatusBar.cpp
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
MainStatusBar.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainStatusBarItems.h
Added context menu on game folder status bar item to open project path in file explorer.
2021-08-26 13:14:30 -05:00
MainWindow_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainWindow.cpp
Add missing header for non-unity builds on Linux.
2021-10-11 13:28:33 +01:00
MainWindow.h
changes to the move rotate and scale
2021-08-04 13:05:00 +01:00
MainWindow.qrc
Create config files automatically and UX style updates (#3514)
2021-08-31 11:15:04 -07:00
NewLevelDialog.cpp
Small Code/Editor cleanup pass (#4909)
2021-10-29 09:59:18 +01:00
NewLevelDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
NewLevelDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
NewTerrainDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
NewTerrainDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
NewTerrainDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
o3de_logo.svg
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
PakManagerDlg.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
PakManagerDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Plugin.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
Plugin.h
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
PluginManager.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
PluginManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PreferencesStdPages.cpp
updates after file renames
2021-09-06 18:24:45 +01:00
PreferencesStdPages.h
Code/Editor
2021-09-10 20:15:16 -07:00
ProcessInfo.cpp
more replacements of A functions
2021-08-05 19:30:52 -07:00
ProcessInfo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PythonEditorEventsBus.h
Updated the GameApplication to mount the engine.pak (#4128)
2021-09-16 11:01:00 -05:00
PythonEditorFuncs.cpp
Cleanup SerializeContext.h pt.1 (#4264)
2021-09-29 11:31:01 -05:00
PythonEditorFuncs.h
Updated the GameApplication to mount the engine.pak (#4128)
2021-09-16 11:01:00 -05:00
QtUtil.h
Merge branch 'development' into cmake/SPEC-7182
2021-08-11 11:16:24 -07:00
QtUtilWin.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtViewPane.h
Code/Editor
2021-09-10 20:15:16 -07:00
QtViewPaneManager.cpp
Minor formatting.
2021-10-06 13:01:49 +01:00
QtViewPaneManager.h
Address PR comments.
2021-10-07 17:21:45 +01:00
QuickAccessBar.cpp
runtime fixes (Editor running)
2021-08-05 19:31:12 -07:00
QuickAccessBar.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QuickAccessBar.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
RenderViewport_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Report.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ResizeResolutionDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
ResizeResolutionDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ResizeResolutionDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Resource.h
changes to the move rotate and scale
2021-08-04 13:05:00 +01:00
SelectEAXPresetDlg.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
SelectEAXPresetDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectEAXPresetDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
SelectLightAnimationDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectLightAnimationDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectSequenceDialog.cpp
Code/Editor
2021-08-02 17:56:56 -07:00
SelectSequenceDialog.h
Code/Editor
2021-09-10 20:15:16 -07:00
Settings.cpp
Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660)
2021-10-15 09:55:41 +01:00
Settings.h
Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660)
2021-10-15 09:55:41 +01:00
SettingsManager.cpp
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
SettingsManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SettingsManagerDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
SettingsManagerDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SettingsManagerDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ShortcutDispatcher.cpp
fix for focus being removed from main viewport widget when interacting with viewport ui elements
2021-07-20 18:04:08 +01:00
ShortcutDispatcher.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
splashscreen_background_2021_11.jpg
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
splashscreen_background_gradient.jpg
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
StartupLogoDialog.cpp
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
StartupLogoDialog.h
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
StartupLogoDialog.qrc
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
StartupLogoDialog.ui
Update Splashscreen and About Us dialogs for General Availability (#4901)
2021-10-22 12:46:06 -07:00
StartupTraceHandler.cpp
Code/Editor
2021-08-20 17:53:14 -07:00
StartupTraceHandler.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StringDlg.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StringDlg.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
SurfaceTypeValidator.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SurfaceTypeValidator.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolbarCustomizationDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolbarCustomizationDialog.h
Code/Editor
2021-09-10 20:15:16 -07:00
ToolbarCustomizationDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ToolbarManager.cpp
Code/Editor
2021-08-20 17:53:14 -07:00
ToolbarManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolBox.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
ToolBox.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
ToolsConfigPage.cpp
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
ToolsConfigPage.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolsConfigPage.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TopRendererWnd.cpp
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-25 11:47:19 -07:00
TopRendererWnd.h
Code/Editor
2021-09-10 20:15:16 -07:00
TrackViewExportKeyTimeDlg.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewExportKeyTimeDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewExportKeyTimeDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewFBXImportPreviewDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewFBXImportPreviewDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewFBXImportPreviewDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewNewSequenceDialog.cpp
Updating PR to change lower API to return AZStd::string instead of const char* for safety.
2021-08-25 15:28:42 -05:00
TrackViewNewSequenceDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewNewSequenceDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrustInfo.manifest
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
UIEnumsDatabase.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
UIEnumsDatabase.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoConfigSpec.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoConfigSpec.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoDropDown.cpp
Fix "index out of range" error in AssetProcessor (#4324)
2021-10-04 17:41:35 -07:00
UndoDropDown.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoViewPosition.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoViewPosition.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoViewRotation.cpp
Address PR feedback
2021-08-05 10:50:29 -04:00
UndoViewRotation.h
Camera Component, Editor Viewport Widget refactoring.
2021-08-05 10:05:19 -04:00
UsedResources.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UsedResources.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UserMessageDefines.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewManager.cpp
Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
2021-08-06 10:32:38 -04:00
ViewManager.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-06 12:49:05 +01:00
ViewPane.cpp
enable warning 4296: 'operator': expression is always false
2021-08-19 16:16:28 -07:00
ViewPane.h
Code/Editor
2021-08-20 17:53:14 -07:00
Viewport.cpp
Header fix.
2021-10-11 14:28:27 +01:00
Viewport.h
Remove legacy sandbox picking - no longer used (#4472)
2021-10-05 09:58:43 +01:00
ViewportManipulatorController.cpp
Fix mouse capture behavior for Editor Viewport (#3417)
2021-08-25 09:28:41 +01:00
ViewportManipulatorController.h
Fix for events that should have been consumed by manipulators (#3108)
2021-08-17 17:09:17 +01:00
ViewportTitleDlg.cpp
Solve merge issue
2021-09-29 09:58:04 -07:00
ViewportTitleDlg.h
In Slice mode, don't instantiate the handler, and also hide and disable the breadcrumbs widgets.
2021-09-28 21:30:06 -07:00
ViewportTitleDlg.ui
Fix to capitalization in include via the UI
2021-09-30 08:18:12 -07:00
WaitProgress.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
WaitProgress.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
water.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
WindowObserver_mac.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
WindowObserver_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
WinWidgetId.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
WipFeatureManager.cpp
More fixes for Code/Editor
2021-08-16 16:42:05 -07:00
WipFeatureManager.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
WipFeaturesDlg.cpp
More fixes for Code/Editor
2021-08-16 16:42:05 -07:00
WipFeaturesDlg.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
WipFeaturesDlg.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
WipFeaturesDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00