birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '33cbc2db21'
${ noResults }
o3de/Code/Editor/Plugins/ProjectSettingsTool
History
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
 		4 years ago
..
icons git mv Code\Sandbox\Plugins Code/Editor/Plugins 5 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DefaultImageValidator.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DefaultImageValidator.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
FunctorValidator.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
FunctorValidator.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
LastPathBus.h Merge branch 'development' into cmake/SPEC-7179 4 years ago
PlatformSettings.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformSettings_Android.cpp Fixes for incorrect nullptr placement. 4 years ago
PlatformSettings_Android.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformSettings_Base.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PlatformSettings_Base.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformSettings_Ios.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PlatformSettings_Ios.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformSettings_common.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Platforms.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlistDictionary.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PlistDictionary.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ProjectSettingsContainer.cpp fixing no unity builds 4 years ago
ProjectSettingsContainer.h Merge branch 'development' into cmake/SPEC-7179 4 years ago
ProjectSettingsSerialization.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ProjectSettingsSerialization.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ProjectSettingsTool.qrc git mv Code\Sandbox\Plugins Code/Editor/Plugins 5 years ago
ProjectSettingsToolWidget.ui git mv Code\Sandbox\Plugins Code/Editor/Plugins 5 years ago
ProjectSettingsToolWindow.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ProjectSettingsToolWindow.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ProjectSettingsValidator.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ProjectSettingsValidator.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyFileSelect.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PropertyFileSelect.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyFuncValBrowseEdit.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PropertyFuncValBrowseEdit.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyFuncValLineEdit.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PropertyFuncValLineEdit.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyImagePreview.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PropertyImagePreview.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PropertyLinked.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
PropertyLinked.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Utils.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
Utils.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ValidationHandler.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ValidationHandler.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ValidatorBus.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Validators.cpp Editor code: tidy up BOOLs,NULLs and overrides pt2. 4 years ago
Validators.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Validators_impl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
main.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
projectsettingstool_files.cmake Merge branch 'development' into cmake/SPEC-7179 4 years ago