birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2c464c3ee0dc79775d77c32780b8cc2e9212c833
o3de/Code/Editor
T
History
hultonha 7a58b72f15 Add remaining integration tests for viewport selection (box select) (#4075) 
* updates to viewport box select tests

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

* add interface for querying keyboard modifiers

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

* remove redundant casts

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

* update formatting options for trace functions in ActionDispatcher

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

* remove redundant GetKeyboardModifiers call

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

* update how trace/log functions have been fixed to output during tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-13 15:19:46 +01:00
..
Animation
Removal of unused files from Code/Editor
2021-08-05 12:43:46 -07:00
AssetDatabase
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssetEditor
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
[Experimental] Asset Picker Flatten View (#3589)
2021-09-01 09:39:44 +01:00
Commands
Fixes clang cases
2021-09-03 13:27:31 -07:00
Common
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Controls
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
Core
Potential Memory Corruption in Release Build (#3559)
2021-08-26 15:59:40 -07:00
Dialogs
Editor code: tidy up BOOLs,NULLs and overrides pt1.
2021-08-05 16:37:43 +02:00
EditMode
PR comments/fixes
2021-08-25 14:06:26 -07:00
Export
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
Geometry
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
Include
Various terrain improvements: (#3942)
2021-09-09 12:56:16 -05:00
Launcher
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Lib/Tests
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -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
Various terrain improvements: (#3942)
2021-09-09 12:56:16 -05:00
Platform
Updated legacy Editor and Asset Processor icons on Mac to O3DE icons.
2021-09-02 09:39:15 -05:00
Plugins
Enabling warnings around format security
2021-09-07 15:17:40 -07:00
QtUI
Code/Editor
2021-08-16 16:42:30 -07:00
RenderHelpers
Code/Editor
2021-08-20 17:53:14 -07:00
res
Create config files automatically and UX style updates (#3514)
2021-08-31 11:15:04 -07:00
Style
Merge branch 'development' into Prefab/SaveAllPrefabs
2021-09-02 23:40:54 -07:00
TimeOfDay
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackView
fixes windows warnings
2021-09-03 11:11:28 -07:00
Translations
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Undo
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
Util
Enabling warnings around format security
2021-09-07 15:17:40 -07:00
WelcomeScreen
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
2DViewport.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
2DViewport.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AboutDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05: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
Fix unused warnings release (#3677)
2021-08-30 13:10:41 -07:00
ActionManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AnimationContext.cpp
Updating PR to change lower API to return AZStd::string instead of const char* for safety.
2021-08-25 15:28:42 -05:00
AnimationContext.h
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
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
BaseLibrary.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryItem.cpp
more fixes, will merge fixes for w4245 and w4389
2021-08-16 16:06:22 -07:00
BaseLibraryItem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
BaseLibraryManager.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
BaseLibraryManager.h
More fixes for Code/Editor
2021-08-16 16:42:05 -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
Set enable gem variants feature (#3631)
2021-09-01 11:01:50 -05:00
ConfigGroup.cpp
More fixes for Code/Editor
2021-08-16 16:42:05 -07:00
ConfigGroup.h
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07: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
Used actual types instead of auto and some more minor changes
2021-09-03 12:34:32 -07:00
CryEdit.h
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
CryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditDoc.cpp
Initialize prefab interface pointers only when prefabs are enabled
2021-09-08 23:19:05 -07:00
CryEditDoc.h
Merge branch 'development' into Prefab/SaveAllPrefabs
2021-09-08 14:11:50 -07:00
CryEditLiveCreate.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CryEditPy.cpp
Added debugger attachment utilities to the engine, fixed crash when showing console variables, improvements to timeout handling and small cleanup (#3591)
2021-08-31 10:27:14 +02: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
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05: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
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
Code/Editor
2021-08-16 16:42:30 -07:00
DisplaySettings.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DisplaySettingsPythonFuncs.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DisplaySettingsPythonFuncs.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DocMultiArchive.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DPIAware.xml
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
editor_core_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_core_test_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_darwin_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_headers_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_lib_files.cmake
updates after file renames
2021-09-06 18:24:45 +01:00
editor_lib_terrain_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_lib_test_files.cmake
Fix issue with mouse input for viewport camera (#3210)
2021-08-19 09:06:24 +01:00
editor_lib_test_terrain_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
editor_win_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorCryEdit.rc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorDefs.h
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
EditorEnvironment.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorEnvironment.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorFileMonitor.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
EditorFileMonitor.h
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
EditorModularViewportCameraComposer.cpp
Remove unused lambda capture variable (#3634)
2021-08-27 13:06:56 +01:00
EditorModularViewportCameraComposer.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
EditorModularViewportCameraComposerBus.h
Expose camera input channels to the UI and ensure the cached values are refreshed when updated (#3607)
2021-08-27 09:29:08 +01:00
EditorPanelUtils.cpp
unnecessary pragmas incompatible with clang
2021-08-30 16:51:31 -07:00
EditorPanelUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesDialog.cpp
updates after file renames
2021-09-06 18:24:45 +01:00
EditorPreferencesDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
EditorPreferencesPageAWS.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageAWS.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageExperimentalLighting.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageExperimentalLighting.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageFiles.cpp
Merge branch 'develop' into LYN-4700
2021-08-02 09:27:21 +01:00
EditorPreferencesPageFiles.h
Merge branch 'develop' into LYN-4700
2021-08-02 09:27:21 +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
updates after file renames
2021-09-06 18:24:45 +01:00
EditorPreferencesPageViewportCamera.h
updates after file renames
2021-09-06 18:24:45 +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
Code/Editor
2021-08-16 16:42:30 -07:00
EditorPreferencesPageViewportGeneral.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPreferencesPageViewportManipulator.cpp
updates after file renames
2021-09-06 18:24:45 +01:00
EditorPreferencesPageViewportManipulator.h
updates after file renames
2021-09-06 18:24:45 +01:00
EditorPreferencesTreeWidgetItem.cpp
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
Expose setting to adjust angular manipulator circle bound (#3932)
2021-09-06 14:22:57 +01:00
EditorViewportSettings.h
Expose setting to adjust angular manipulator circle bound (#3932)
2021-09-06 14:22:57 +01:00
EditorViewportWidget.cpp
Add remaining integration tests for viewport selection (box select) (#4075)
2021-09-13 15:19:46 +01:00
EditorViewportWidget.h
Add remaining integration tests for viewport selection (box select) (#4075)
2021-09-13 15:19:46 +01: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
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
ErrorReport.h
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
ErrorReportDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
ErrorReportDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ErrorReportDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
ErrorReportTableModel.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
ErrorReportTableModel.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FBXExporterDialog.cpp
Code/Editor
2021-08-23 13:00:27 -07:00
FBXExporterDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FBXExporterDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
FileTypeUtils.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FileTypeUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameEngine.cpp
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
GameEngine.h
[redcode/crythread-2nd-pass] post merge include fixes
2021-08-11 21:04:19 -07:00
GameExporter.cpp
More fixes for Code/Editor
2021-08-16 16:42:05 -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
Code/Editor
2021-08-16 16:42:30 -07:00
GotoPositionDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GotoPositionDlg.ui
Resolved merge conflicts
2021-07-02 12:42:44 -05:00
GridUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IconListDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
IconManager.cpp
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
IconManager.h
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
IEditor.h
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06:00
IEditorImpl.cpp
Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)
2021-09-13 09:36:34 +01:00
IEditorImpl.h
Legacy code cleanup - part 3 (#3903)
2021-09-07 12:14:16 -06: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
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
Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
2021-08-09 13:06:29 -05:00
LayoutConfigDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LayoutConfigDialog.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LayoutConfigDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LayoutWnd.cpp
Code/Editor
2021-08-20 17:53:14 -07:00
LayoutWnd.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
LevelFileDialog.cpp
Code/Editor
2021-08-23 13:00:27 -07:00
LevelFileDialog.h
Code/Editor
2021-08-20 17:53:14 -07:00
LevelFileDialog.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LevelFileDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
LevelIndependentFileMan.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelIndependentFileMan.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelInfo.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
LevelInfo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelTreeModel.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LevelTreeModel.h
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
Fixes clang cases
2021-09-03 13:27:31 -07:00
LogFile.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFileImpl.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LogFileImpl.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LyViewPaneNames.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
main.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MainStatusBar.cpp
Added context menu on game folder status bar item to open project path in file explorer.
2021-08-26 13:14:30 -05: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
PR comments/fixes
2021-08-25 14:06:26 -07: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
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
NewLevelDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
NewLevelDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
NewTerrainDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
NewTerrainDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
NewTerrainDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
o3de_logo.svg
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
PakManagerDlg.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
PakManagerDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
particles_tree_07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Plugin.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
Plugin.h
Legacy cleanup (#3383)
2021-08-25 15:04:38 -06:00
PluginManager.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
PluginManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PreferencesStdPages.cpp
updates after file renames
2021-09-06 18:24:45 +01:00
PreferencesStdPages.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PythonEditorFuncs.cpp
Fixes clang cases
2021-09-03 13:27:31 -07:00
PythonEditorFuncs.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07: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
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QtViewPaneManager.cpp
Code/Editor
2021-08-20 17:53:14 -07:00
QtViewPaneManager.h
Code/Editor
2021-08-20 17:53:14 -07:00
QuickAccessBar.cpp
runtime fixes (Editor running)
2021-08-05 19:31:12 -07:00
QuickAccessBar.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
QuickAccessBar.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
RenderViewport_mac.mm
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Report.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ResizeResolutionDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
ResizeResolutionDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ResizeResolutionDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
Resource.h
changes to the move rotate and scale
2021-08-04 13:05:00 +01:00
SelectEAXPresetDlg.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
SelectEAXPresetDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectEAXPresetDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
SelectLightAnimationDialog.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectLightAnimationDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SelectSequenceDialog.cpp
Code/Editor
2021-08-02 17:56:56 -07:00
SelectSequenceDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Settings.cpp
Merge branch 'development' into Prefab/SaveAllPrefabs
2021-09-08 14:11:50 -07:00
Settings.h
Merge branch 'development' into Prefab/SaveAllPrefabs
2021-09-08 14:11:50 -07: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_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
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02: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
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
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
Code/Editor
2021-08-20 17:53:14 -07:00
ToolbarManager.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolBox.cpp
Code/Editor
2021-08-16 16:42:30 -07:00
ToolBox.h
Editor code: tidy up BOOLs,NULLs and overrides pt6.
2021-08-05 16:52:43 +02:00
ToolsConfigPage.cpp
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
ToolsConfigPage.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ToolsConfigPage.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TopRendererWnd.cpp
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-25 11:47:19 -07:00
TopRendererWnd.h
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
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
More fixes for Code/Editor
2021-08-16 16:42:05 -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
Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)
2021-09-13 09:36:34 +01:00
Viewport.h
Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)
2021-09-13 09:36:34 +01:00
ViewportManipulatorController.cpp
Fix mouse capture behavior for Editor Viewport (#3417)
2021-08-25 09:28:41 +01:00
ViewportManipulatorController.h
Fix for events that should have been consumed by manipulators (#3108)
2021-08-17 17:09:17 +01:00
ViewportTitleDlg.cpp
Legacy cleanup, part 2 (#3659)
2021-08-30 14:40:02 -06:00
ViewportTitleDlg.h
Audio legacy cleanup - Move global functions to be handled by AudioSystemComponent (#3283)
2021-08-17 17:59:09 -05: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
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