birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,532 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd40af1c70c'
${ noResults }
Commit Graph

246 Commits (d40af1c70c852aae6e8e4e3fd91f55d8fea8ec99)

Author SHA1 Message Date
Chris Galvan d590a91fe7 Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Esteban Papp ae4cfc3bd3 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
 4 years ago
Esteban Papp b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have 4 years ago
Esteban Papp 058f6e0f22 PR comments/fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp b8aab28759 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
 4 years ago
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
 4 years ago
carlitosan 803bff70e4
Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development 
Bug fixes for SC editor asset scan in version explorer widget
 4 years ago
Luis Sempé 63cad40db2
Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget 
Improved layout and behavior of the SlotTypeSelector widget
 4 years ago
chcurran be9ad98b24 remove commented out debugging artifacts 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 214700a73e Finish repair for scanning for upgrade tool 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
lsemp3d 4545e2fb33 Improved layout and behavior of the SlotTypeSelector widget 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 26f6a714c8 initial fix for version scan 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Jeremy Ong 5e04c3737f Add preliminary budget tracking system and remove driller integration 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 4 years ago
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 5361cf3b26 Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development 
JSON serialization of SC Editor Assets
 4 years ago
Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h
 4 years ago
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
 4 years ago
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 794c22c02e merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 13188f8958 Simplify codegen of baseclass 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Luis Sempé 6ab776a3a6
Merge pull request #3354 from aws-lumberyard-dev/scripting/autogenfixes 
Fixed categories not being properly applied for Nodeables & removed old code generator tags

> LG, I guess old NodeableCodegen definitions have all been migrated to new xml format file?

correct
 4 years ago
chcurran 95a812b238 fixup codegen, remove android errors 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 31addc43dc Windows and Linux compiling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 23f99aeb94 more gems changes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 2e228d94f0 push/pop mismatch 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 323d642e65 Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp ea2f74dc0f more fixes for Gems 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
lsemp3d fd97a7688c Added missing reflection tag 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 15af7e692e Removed old codegen tags and documented the only required Nodeable preprocessor definition 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
lsemp3d ec7b76c1e9 Fixed typo in previous commit 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
 4 years ago
Jeremy Ong cf44a4ad67 Address additional PR feedback 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 4 years ago
lsemp3d 98f9f9ecbb Fixed category attribute application on NodeableNodes 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Jeremy Ong a5f072f7a9 Remove statistics profiler 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 4 years ago
Jeremy Ong df9b4d4a2f Deprecate profiler categories based on global enum 
(to be supplanted by registered budgets in the future)

Signed-off-by: Jeremy Ong <jcong@amazon.com>
 4 years ago
Luis Sempé 7814d7679c
Merge pull request #3127 from aws-lumberyard-dev/scriptcanvas/codegenfix_namespace 
Completed namespace support for the ScriptCanvasGrammar template
 4 years ago
chcurran c701522adc update error messaging, remove unnecessary comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran ca8a148b63 fix Linux compile error 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran b813f2fbf4 add compiler flag for object stream support of SC editor assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 1ad182105b fix memory leak and possible nullptr read 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran de9e991ccc merge development 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 778ebc39a2 add listener to cmake files 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 88121f3bb4 move JsonUtils to AzCore 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 0270fb7fbe Initial saving/loading of JSON serialization of sc editor assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp f22d2d736b Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago