birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,726 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 '546ce377f0'
${ noResults }
Commit Graph

184 Commits (546ce377f04e9fb45a4f8db839f33e189db0acdb)

Author SHA1 Message Date
Steve Pham e6573766c2
Fixes for release builds for unused variable warnings (#4000) 
Signed-off-by: Steve Pham <spham@amazon.com>
 4 years ago
Alex Peterson 9f06bffc1b
Fix ebus node slots not checked for vars (#3994) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Esteban Papp 26d277cc14 Merge branch 'development' into issues/3202 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 3b119b6f32 hot fix for json event input serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp c128760ed0 removes leftover of performance build 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Steve Pham fa0f2a1007
Fix unused warnings release (#3677) 
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS

Signed-off-by: Steve Pham <spham@amazon.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
chcurran 214700a73e Finish repair for scanning for upgrade tool 
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
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development 
JSON serialization of SC Editor Assets
 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 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 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
lsemp3d 98f9f9ecbb Fixed category attribute application on NodeableNodes 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.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 de9e991ccc merge development 
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
Esteban Papp 14e7754334 More fixes for warnings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
pappeste 67a5bc98ce ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp f914f7680a Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
pappeste b52516cdec ScripCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Chris Galvan 88bef1074b Replaced some Lumberyard references with O3DE. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
lsemp3d 9ecb746563 Completed namespace support for the ScriptCanvasGrammar template 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran a56be14677 JSON saving of SC editor assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran fe21b89d8e working support for editor property json serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran d2c87fd21f initial json serialization for editor sc properties 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 584c125fbc rename serializer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago