birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
51733f3809c6452c8806c520afab5129106679fe
o3de/Code/Editor
T
History
hultonha 51733f3809 Fix for rotation matching and resetting also scaling the entity transform (#1856) 
* fix issue with rotation matching (ditto)

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for context menu appearing

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor tidy-up in EditorContextMenu

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add option to disable cursor during free-look

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes after PR comments

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-07 15:48:33 +01:00
..
Animation
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AssetDatabase
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AssetEditor
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AssetImporter
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AzAssetBrowser
LYN-4806: Switch Asset Browser Mode Button (Fix) (#1852)
2021-07-07 10:53:21 +01:00
Commands
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Common
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Controls
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Core
Cherry Picking (lyn1751) (#1854)
2021-07-07 13:28:59 +01:00
Dialogs
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditMode
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Export
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Geometry
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Include
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Launcher
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Lib/Tests
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LightmapCompiler
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainWindow
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Objects
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Platform
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Plugins
Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731)
2021-07-01 18:37:44 -07:00
QtUI
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
RenderHelpers
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
res
Update icons and launcher images to the O3DE logo
2021-07-01 17:38:33 -07:00
Style
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TimeOfDay
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackView
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Translations
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Undo
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Util
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WelcomeScreen
LYN-4920 | The project image on the welcome page is disconnected from the Project manager (#1738)
2021-07-01 20:55:29 -07:00
2DViewport.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
2DViewport.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AboutDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AboutDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AboutDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ActionManager.cpp
Cherry Picking (lyn1751) (#1854)
2021-07-07 13:28:59 +01:00
ActionManager.h
Cherry Picking (lyn1751) (#1854)
2021-07-07 13:28:59 +01:00
AnimationContext.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
AnimationContext.cpp.rej
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
AnimationContext.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
BaseLibrary.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
BaseLibraryItem.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
BaseLibraryItem.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
BaseLibraryManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
BaseLibraryManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CheckOutDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CheckOutDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Clipboard.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Clipboard.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CMakeLists.txt
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ConfigGroup.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ConfigGroup.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ConsoleDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ConsoleDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ControlMRU.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ControlMRU.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CrtDebug.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CryEdit.cpp
Cherry Picking (lyn1751) (#1854)
2021-07-07 13:28:59 +01:00
CryEdit.h
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
CryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditDoc.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CryEditDoc.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CryEditLiveCreate.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditPy.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
CustomAspectRatioDlg.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CustomAspectRatioDlg.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CustomAspectRatioDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CustomizeKeyboardDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CustomizeKeyboardDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CustomizeKeyboardDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CustomResolutionDlg.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CustomResolutionDlg.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CustomResolutionDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CVarMenu.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
CVarMenu.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DimensionsDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DimensionsDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DimensionsDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
DisplaySettings.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DisplaySettings.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DisplaySettingsPythonFuncs.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DisplaySettingsPythonFuncs.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DocMultiArchive.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
DPIAware.xml
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
editor_core_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_core_test_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_darwin_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_headers_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_lib_files.cmake
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
editor_lib_terrain_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_lib_test_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_lib_test_terrain_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
editor_win_files.cmake
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorCryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorDefs.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorEnvironment.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorEnvironment.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorFileMonitor.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorFileMonitor.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPanelUtils.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPanelUtils.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesBus.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorPreferencesPageAWS.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageAWS.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageExperimentalLighting.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageExperimentalLighting.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageFiles.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageFiles.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageGeneral.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageGeneral.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportDebug.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportDebug.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportGeneral.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportGeneral.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportGizmo.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportGizmo.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesPageViewportMovement.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
EditorPreferencesPageViewportMovement.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesTreeWidgetItem.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesTreeWidgetItem.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesTreeWidgetItemDelegate.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorPreferencesTreeWidgetItemDelegate.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorToolsApplication.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorToolsApplication.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorToolsApplicationAPI.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
EditorVersion.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorViewportCamera.cpp
Fixed more copyright header issues caused by script replacement
2021-07-02 16:21:26 -05:00
EditorViewportCamera.h
Fixed more copyright header issues caused by script replacement
2021-07-02 16:21:26 -05:00
EditorViewportSettings.cpp
Move camera properties from CVars to the Settings Registry (#1766)
2021-07-05 13:08:05 +01:00
EditorViewportSettings.h
Move camera properties from CVars to the Settings Registry (#1766)
2021-07-05 13:08:05 +01:00
EditorViewportWidget.cpp
Fix for rotation matching and resetting also scaling the entity transform (#1856)
2021-07-07 15:48:33 +01:00
EditorViewportWidget.h
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
ErrorDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ErrorRecorder.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorRecorder.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorReport.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorReport.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorReportDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorReportDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorReportDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ErrorReportTableModel.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ErrorReportTableModel.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
FBXExporterDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
FBXExporterDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
FBXExporterDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
FileTypeUtils.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
FileTypeUtils.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GameEngine.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GameEngine.h
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GameExporter.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GameExporter.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GameResourcesExporter.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GameResourcesExporter.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GenericSelectItemDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GenericSelectItemDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GenericSelectItemDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
GotoPositionDlg.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GotoPositionDlg.h
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GotoPositionDlg.ui
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GraphicsSettingsDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
GraphicsSettingsDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
graphicssettingsdialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
GridUtils.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
IconListDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
IconManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
IconManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
IEditor.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
IEditorImpl.cpp
Fixed several o3de python package and install layout issues (#1714)
2021-07-02 00:22:12 -05:00
IEditorImpl.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
IEditorPanelUtils.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
InfoBar.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
IObservable.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
IPostRenderer.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
KeyboardCustomizationSettings.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
KeyboardCustomizationSettings.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LayoutConfigDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LayoutConfigDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LayoutWnd.h
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
LegacyViewportCameraController.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LegacyViewportCameraController.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelFileDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelFileDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelIndependentFileMan.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelInfo.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelInfo.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelTreeModel.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LevelTreeModel.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LogFile_mac.mm
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LogFile.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LogFile.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LogFileImpl.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LogFileImpl.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
LyViewPaneNames.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
main.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainStatusBar.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainStatusBar.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainStatusBarItems.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainWindow_mac.mm
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainWindow.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
MainWindow.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
MainWindow.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
NewLevelDialog.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
NewLevelDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
NewLevelDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
NewTerrainDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
NewTerrainDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Plugin.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PluginManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PluginManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PreferencesStdPages.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PreferencesStdPages.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ProcessInfo.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ProcessInfo.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PythonEditorEventsBus.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PythonEditorFuncs.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
PythonEditorFuncs.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QtUtil.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QtUtilWin.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QtViewPane.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QtViewPaneManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QtViewPaneManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QuickAccessBar.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QuickAccessBar.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
QuickAccessBar.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
RenderViewport_mac.mm
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
RenderViewport.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
RenderViewport.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Report.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ResizeResolutionDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ResizeResolutionDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ResizeResolutionDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Resource.h
Cherry Picking (lyn1751) (#1854)
2021-07-07 13:28:59 +01:00
ResourceSelectorHost.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ResourceSelectorHost.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SelectEAXPresetDlg.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SelectEAXPresetDlg.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SelectEAXPresetDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
SelectLightAnimationDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SelectLightAnimationDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SelectSequenceDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SelectSequenceDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Settings.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
Settings.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SettingsManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SettingsManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SettingsManagerDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SettingsManagerDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SettingsManagerDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ShortcutDispatcher.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ShortcutDispatcher.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
splashscreen_background_gradient.jpg
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
StartupLogoDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
StartupLogoDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
StartupLogoDialog.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
StartupLogoDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
StartupTraceHandler.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
StartupTraceHandler.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
StringDlg.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
StringDlg.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SurfaceTypeValidator.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
SurfaceTypeValidator.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolbarCustomizationDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolbarCustomizationDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolbarCustomizationDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ToolbarManager.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
ToolbarManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolBox.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolBox.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolsConfigPage.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolsConfigPage.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ToolsConfigPage.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TopRendererWnd.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TopRendererWnd.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TrackViewExportKeyTimeDlg.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TrackViewExportKeyTimeDlg.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TrackViewExportKeyTimeDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewFBXImportPreviewDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TrackViewFBXImportPreviewDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TrackViewFBXImportPreviewDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewNewSequenceDialog.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
TrackViewNewSequenceDialog.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UIEnumsDatabase.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoConfigSpec.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoConfigSpec.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoDropDown.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoDropDown.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoViewPosition.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoViewPosition.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoViewRotation.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UndoViewRotation.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UsedResources.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UsedResources.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
UserMessageDefines.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewPane.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewPane.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Viewport.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Viewport.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewportManipulatorController.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewportManipulatorController.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ViewportTitleDlg.cpp
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
ViewportTitleDlg.h
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
ViewportTitleDlg.ui
Added tooltips to the viewport title buttons (#1691)
2021-06-30 16:47:59 -05:00
WaitProgress.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WaitProgress.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
water.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
WindowObserver_mac.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WindowObserver_mac.mm
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WinWidgetId.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WipFeatureManager.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WipFeatureManager.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WipFeaturesDlg.cpp
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
WipFeaturesDlg.h
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -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