birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6db748893919f1345cb0e985a52ec5699e17c381
o3de/Code/Editor/TrackView
T
History
Esteban Papp 6db7488939 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
2021-08-06 10:08:37 -07:00
..
2DBezierKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
AssetBlendKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
AtomOutputFrameCapture.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AtomOutputFrameCapture.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
bmp00016_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
bmp00016_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CaptureKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
CharacterKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
clapperboard_cancel.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
clapperboard_ready.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
CommentKeyUIControls.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
CommentNodeAnimator.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
CommentNodeAnimator.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ConsoleKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
DirectorNodeAnimator.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DirectorNodeAnimator.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorTrackViewEventsBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EventKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
GotoKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
ScreenFaderKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
SelectKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
SequenceBatchRenderDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
SequenceBatchRenderDialog.h
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
SequenceBatchRenderDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
SequenceKeyUIControls.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
SoundKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
spline_edit_bar_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_08.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_09.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_10.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_11.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_12.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_13.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_14.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_15.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
spline_edit_bar_16.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TimeRangeKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackEventKeyUIControls.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
trackview_keys_00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
trackview_keys_01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
trackview_keys_02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
trackview_keys_03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewAnimNode.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
TrackViewAnimNode.h
Sandbox
2021-07-27 19:32:01 -07:00
TrackViewCurveEditor.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewCurveEditor.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewCurveEditor.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackViewDialog.h
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackViewDialog.qrc
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewDopeSheetBase.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
TrackViewDopeSheetBase.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewDoubleSpinBox.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewDoubleSpinBox.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewEventNode.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewEventNode.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewFindDlg.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
TrackViewFindDlg.h
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackViewFindDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewKeyPropertiesDlg.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackViewKeyPropertiesDlg.h
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackViewNode.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewNode.h
Sandbox
2021-07-27 19:32:01 -07:00
TrackViewNodeFactories.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewNodeFactories.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewNodes.cpp
Merge branch 'development' into cmake/SPEC-7484
2021-08-06 10:08:37 -07:00
TrackViewNodes.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewNodes.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewPythonFuncs.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewPythonFuncs.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewSequence.cpp
Code/Editor
2021-08-02 17:56:56 -07:00
TrackViewSequence.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewSequenceManager.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewSequenceManager.h
Sandbox
2021-07-27 19:32:01 -07:00
TrackViewSplineCtrl.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TrackViewSplineCtrl.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewTimeline.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewTimeline.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewTrack.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewTrack.h
Sandbox
2021-07-27 19:32:01 -07:00
TrackViewTrackPropsDlg.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TrackViewUndo.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TrackViewUndo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TVCustomizeTrackColorsDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TVCustomizeTrackColorsDlg.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TVCustomizeTrackColorsDlg.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TVEventsDialog.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TVEventsDialog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TVEventsDialog.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-08.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-09.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-10.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-11.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvkeys-12.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-08.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvmain-09.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-08.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-09.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-10.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-11.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-12.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-13.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-14.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-15.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-16.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-17.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-18.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-19.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-20.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-21.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-22.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-23.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-24.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-25.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-26.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-27.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-28.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvnodes-29.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-03.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-04.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-05.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-06.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-07.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-08.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-09.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvplay-10.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
TVSequenceProps.cpp
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TVSequenceProps.h
Editor code: tidy up BOOLs,NULLs and overrides pt3.
2021-08-05 16:48:00 +02:00
TVSequenceProps.ui
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvview-00.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvview-01.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00
tvview-02.png
git mv Code\Sandbox\Editor Code/Editor
2021-06-29 13:55:28 -07:00