birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
66e50dfbc1fc20d585c736bd85acfc5aa99c4ba6
o3de/Code/Editor
T
History
Chris Galvan c15ead9c30 Removed unused bone name class. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-04 10:32:52 -06: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
Clang/Clazy pass over AzCore (#5045)
2021-11-18 10:09:22 +00:00
AzAssetBrowser
Starting to remove MTL asset references
2021-11-11 19:20:04 -06: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
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
Core
Merge pull request #6250 from BytesOfPiDev/issue6198
2021-12-27 16:31:46 -06:00
Dialogs
Clang/Clazy pass over AzCore (#5045)
2021-11-18 10:09:22 +00:00
EditMode
PR comments/fixes
2021-08-25 14:06:26 -07:00
Export
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
Geometry
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
Include
Fix compile issues blocking adoption of Pix 2108
2021-12-21 13:52:20 -07:00
Launcher
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Lib/Tests
Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label
2022-01-03 14:21:44 -06: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
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
Platform
[Linux] Unify Editor and Game raw mouse event handling
2021-11-03 17:06:36 -07:00
Plugins
Fix compile issues blocking adoption of Pix 2108
2021-12-21 13:52:20 -07:00
QtUI
Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label
2022-01-03 14:21:44 -06: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
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
Translations
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Undo
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
Util
Fix compile issues blocking adoption of Pix 2108
2021-12-21 13:52:20 -07:00
WelcomeScreen
[LYN-8041] Enable relocation of the Project Game Release Layout (#5380)
2021-11-09 12:03:52 -06:00
2DViewport.cpp
Updates and fixes to viewport placement (#5712)
2021-11-18 10:58:18 +00:00
2DViewport.h
Merge commit 'e34ea3bcaa0306699804072c6bce6eb01f65fc52' into puvvadar/gitflow_211118_o3de
2021-11-18 09:37:30 -08:00
AboutDialog.cpp
Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label
2022-01-03 14:21:44 -06:00
AboutDialog.h
Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label
2022-01-03 14:21:44 -06:00
AboutDialog.ui
Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label
2022-01-03 14:21:44 -06:00
ActionManager.cpp
Improved look for viewport ui border close button (#5757)
2021-11-19 11:04:49 +00:00
ActionManager.h
Improved look for viewport ui border close button (#5757)
2021-11-19 11:04:49 +00:00
AnimationContext.cpp
Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)
2021-11-15 12:11:58 +00: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
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
BaseLibrary.h
Code/Editor
2021-09-10 20:15:16 -07:00
BaseLibraryItem.cpp
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
BaseLibraryItem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryManager.cpp
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -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
Merge commit '4ac8b5dc429b6c87b3bd9e743839c47f7a02c0ce' into junbo/gitflow_211123_o3de
2021-11-23 13:29:30 -08: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
Merge pull request #6250 from BytesOfPiDev/issue6198
2021-12-27 16:31:46 -06:00
CryEdit.h
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00:00
CryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditDoc.cpp
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
CryEditDoc.h
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -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
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00: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 unused bone name class.
2022-01-04 10:32:52 -06: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
Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label
2022-01-03 14:21:44 -06: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
Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)
2021-11-15 12:11:58 +00:00
EditorEnvironment.cpp
Merged the Editor.Camera.Tests with the Editor.Tests (#5463)
2021-11-10 08:57:39 -08: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
Prevent the camera from easily being set to an invalid orientation (#6203)
2021-12-08 09:42:40 +00:00
EditorModularViewportCameraComposer.h
Improvements to feedback for default camera orbit point (when no entity is selected) (#5397)
2021-11-08 13:37:35 +00: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
The Groups and Ungroups shortcut keys in Script Canvas Editor do not
2021-12-09 16:46:18 +00: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
Focus issue in editor settings menu #3921 (#6296)
2021-12-10 22:34:41 +00:00
EditorPreferencesDialog.h
Focus issue in editor settings menu #3921 (#6296)
2021-12-10 22:34:41 +00: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
Update default camera orbit behavior (#5301)
2021-11-08 09:19:40 +00:00
EditorPreferencesPageViewportCamera.h
Update default camera orbit behavior (#5301)
2021-11-08 09:19:40 +00: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
Manipulator Bounds updates (#5959)
2021-12-03 14:46:15 +00:00
EditorPreferencesPageViewportManipulator.h
Manipulator Bounds updates (#5959)
2021-12-03 14:46:15 +00: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
Manipulator Bounds updates (#5959)
2021-12-03 14:46:15 +00:00
EditorViewportSettings.h
Update default camera orbit behavior (#5301)
2021-11-08 09:19:40 +00:00
EditorViewportWidget.cpp
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00:00
EditorViewportWidget.h
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00: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
Preapre codebase for FileRequest compiletime improvements (#6192)
2021-12-10 13:08:24 +00:00
GameEngine.h
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
GameExporter.cpp
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07: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
Prevent the camera from easily being set to an invalid orientation (#6203)
2021-12-08 09:42:40 +00:00
GotoPositionDlg.h
Prevent the camera from easily being set to an invalid orientation (#6203)
2021-12-08 09:42:40 +00: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
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
IconManager.h
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -07:00
IEditor.h
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00:00
IEditorImpl.cpp
Fix compile issues blocking adoption of Pix 2108
2021-12-21 13:52:20 -07:00
IEditorImpl.h
Cry Legacy: the Lessening (#5961)
2021-11-29 11:21:06 -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
Fix clang 13 compilation problems (#5791)
2021-11-25 09:24:39 +00: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
Animation Editor: Remove preview label (#5449)
2021-11-10 16:23:43 +01:00
main.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainStatusBar.cpp
[development] removed CryLibrary (#5474)
2021-11-10 09:43:13 -07: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
Merge pull request #6250 from BytesOfPiDev/issue6198
2021-12-27 16:31:46 -06: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
Fix compile issues blocking adoption of Pix 2108
2021-12-21 13:52:20 -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
Fix compile issues blocking adoption of Pix 2108
2021-12-21 13:52:20 -07: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
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00: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
Merge commit 'a8dcfbbb1390bca0a2ed3629b0c47c1af6358e77' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:29 -08:00
Settings.h
Merge commit 'a8dcfbbb1390bca0a2ed3629b0c47c1af6358e77' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:29 -08: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
Updated splash screen and about dialog with development name
2021-11-16 10:07:45 -06: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
LYN-4946 | Merge Game Mode buttons in the Play Controls toolbar (#5557)
2021-11-11 17:36:12 -08:00
ToolbarManager.h
LYN-4946 | Merge Game Mode buttons in the Play Controls toolbar (#5557)
2021-11-11 17:36:12 -08: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
Update intersect behavior for positioning entities in the viewport (#5906)
2021-11-30 15:07:40 +00:00
Viewport.h
Update intersect behavior for positioning entities in the viewport (#5906)
2021-11-30 15:07:40 +00:00
ViewportManipulatorController.cpp
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00:00
ViewportManipulatorController.h
Improvement for click detection when clicking quickly between mouse moves (#5786)
2021-11-19 16:52:44 +00:00
ViewportTitleDlg.cpp
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00:00
ViewportTitleDlg.h
Initial improvements to fix viewport icon selection and draw order (#6284)
2021-12-16 09:35:23 +00: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