birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
10f950b726ca9e6d8fe7f3c776b6094d9027dcce
o3de/Code/Editor
T
History
pappeste 97354ce90a Sandbox 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:43:50 -07:00
..
Animation
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssetDatabase
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssetEditor
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssetImporter
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AzAssetBrowser
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Commands
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Common
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Controls
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
Core
changes to the move rotate and scale
2021-08-04 13:05:00 +01:00
Dialogs
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditMode
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Export
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Geometry
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Include
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
Launcher
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Lib/Tests
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Sandbox
2021-07-27 19:32:01 -07:00
Platform
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Plugins
more fixes for w4267
2021-07-27 19:32:11 -07:00
QtUI
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
RenderHelpers
Sandbox
2021-07-27 19:32:01 -07:00
res
[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
2021-07-07 11:29:18 -05:00
Style
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TimeOfDay
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackView
Sandbox
2021-07-27 19:32:01 -07:00
Translations
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Undo
Sandbox
2021-07-27 19:32:01 -07:00
Util
Fixing typos in comments in AffineParts.h file (#2407)
2021-07-28 08:56:46 -07:00
WelcomeScreen
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
2DViewport.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
2DViewport.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AboutDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AboutDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AboutDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ActionManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ActionManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AnimationContext.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AnimationContext.cpp.rej
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
AnimationContext.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibrary.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryItem.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryItem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Create RUN target as helpers for the project-centric workflow (#2520)
2021-07-28 15:53:14 -07:00
ConfigGroup.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ConfigGroup.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ConsoleDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ConsoleDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ControlMRU.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ControlMRU.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CrtDebug.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryEdit.cpp
Changes to update where some viewport actions are called from (legacy removal)
2021-08-05 09:56:56 +01:00
CryEdit.h
Erased some legacy function that are no longer necessary
2021-08-04 14:44:50 +01:00
CryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditDoc.cpp
GetActivePathName was using default - constructed enum DocumentEditingMode()
2021-08-04 21:01:52 +02:00
CryEditDoc.h
GetActivePathName was using default - constructed enum DocumentEditingMode()
2021-08-04 21:01:52 +02:00
CryEditLiveCreate.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditPy.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CustomAspectRatioDlg.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CustomResolutionDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorFileMonitor.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPanelUtils.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageFiles.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageGeneral.cpp
Merge branch 'development' into LYN-3705-2
2021-07-21 08:55:58 +01:00
EditorPreferencesPageGeneral.h
Merge branch 'development' into LYN-3705-2
2021-07-21 08:55:58 +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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportGeneral.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportGizmo.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportGizmo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportMovement.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportMovement.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesTreeWidgetItem.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorToolsApplication.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorViewportCamera.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorViewportSettings.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorViewportSettings.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorViewportWidget.cpp
Make camera controller priority customizable (#2826)
2021-08-05 09:45:03 +01:00
EditorViewportWidget.h
Sandbox
2021-07-27 19:32:01 -07:00
ErrorDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorReport.h
Sandbox
2021-07-27 19:32:01 -07:00
ErrorReportDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorReportTableModel.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FBXExporterDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Merge branch 'development' into LYN-3705-2
2021-07-21 08:55:58 +01:00
GameEngine.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameExporter.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameExporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameResourcesExporter.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameResourcesExporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GenericSelectItemDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IconManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IEditor.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IEditorImpl.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IEditorImpl.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IEditorPanelUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
KeyboardCustomizationSettings.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LayoutConfigDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LayoutWnd.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LegacyViewportCameraController.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LegacyViewportCameraController.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelFileDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelFileDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFile_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFile.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainStatusBar.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainStatusBarItems.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainWindow_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainWindow.cpp
changes to the move rotate and scale
2021-08-04 13:05:00 +01:00
MainWindow.h
changes to the move rotate and scale
2021-08-04 13:05:00 +01:00
MainWindow.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
NewLevelDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Plugin.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PluginManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PluginManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PreferencesStdPages.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PreferencesStdPages.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ProcessInfo.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ProcessInfo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PythonEditorEventsBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PythonEditorFuncs.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PythonEditorFuncs.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtUtil.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtUtilWin.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtViewPane.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtViewPaneManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtViewPaneManager.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
QuickAccessBar.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
RenderViewport.cpp
Sandbox
2021-07-27 19:32:01 -07:00
RenderViewport.h
Sandbox
2021-07-27 19:32:01 -07:00
Report.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ResizeResolutionDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
ResourceSelectorHost.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ResourceSelectorHost.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectEAXPresetDlg.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectSequenceDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Settings.cpp
Bunch of small bug fixes (#2813)
2021-08-05 14:10:08 -07:00
Settings.h
Merge branch 'development' into LYN-3705-2
2021-07-21 08:55:58 +01:00
SettingsManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SettingsManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SettingsManagerDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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_developer_preview.jpg
Updated splash and about screens (#1839)
2021-07-02 18:38:28 -05:00
splashscreen_background_gradient.jpg
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
StartupLogoDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StartupLogoDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StartupLogoDialog.qrc
Updated splash and about screens (#1839)
2021-07-02 18:38:28 -05:00
StartupLogoDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
StartupTraceHandler.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolbarCustomizationDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ToolbarManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolbarManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolBox.cpp
Removed legacy ObjectIcons and shelve icons from Editor.
2021-08-02 12:27:03 -05:00
ToolBox.h
Removed legacy ObjectIcons and shelve icons from Editor.
2021-08-02 12:27:03 -05:00
ToolsConfigPage.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TopRendererWnd.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
UndoViewRotation.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewManager.h
Sandbox
2021-07-27 19:32:01 -07:00
ViewPane.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewPane.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Viewport.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Viewport.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewportManipulatorController.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewportManipulatorController.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewportTitleDlg.cpp
Sandbox
2021-08-05 19:43:50 -07:00
ViewportTitleDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ViewportTitleDlg.ui
Added tooltips to the viewport title buttons (#1691)
2021-06-30 16:47:59 -05: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
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
WipFeatureManager.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
WipFeaturesDlg.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
WipFeaturesDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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