birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,382 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 '4721ef8298'
${ noResults }
Commit Graph

345 Commits (4721ef829835e1d15e413c41cc410ccfa5200ed8)

Author SHA1 Message Date
chcurran 30d27f23ee rename version explorer to view 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5cee8d1892 stubbed out refactor of version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran e3d007319d remove false error from deserializing BC nodes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 9f6d4125b8 Merge branch 'development' into cmake/warn_virtual 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp d836503814 some more fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
carlitosan 52460189aa
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development 
Upgrades and stability fixes for version explorer
 4 years ago
Esteban Papp 91e9c8d81f
Adds unused calls to Trace functions to prevent constant failures in release builds 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 34ca9bd5ba fix Linux error 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Steve Pham e6573766c2
Fixes for release builds for unused variable warnings (#4000) 
Signed-off-by: Steve Pham <spham@amazon.com>
 4 years ago
Esteban Papp f414cd3966 More fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 443bf472cb removed unused function from script event handler node 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp d58bda5bbf WIP 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.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
chcurran 2a810c4845 fix backup file action in version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5c0bbe7ac1 add SC cvar settings cache 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 64ab627f03 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
Esteban Papp 52607ce2c0 Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 4ed7feae5d Keep editor alive when not in focus 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran e1e1779ec6 Fix for file size limit in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran c8ed6d287c Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
chcurran f4dbeb6538 Fix list of manual inspection graphs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran e69a5bc092 fix progress bar for upgrades 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 3822f92882 fix manual inpsection window 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran a353005296 only track dependent assets with valid ids, as sanity check 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 9de22d5e54 Fix dependency errors after conversion to JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran b5a32e1c4c remove temporay files in all cases 
Signed-off-by: chcurran <82187351+carlitosan@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
lumberyard-employee-dm 0ad2fe2294
Set enable gem variants feature (#3631) 
* Implemented the RFC to allow projects to need to specify the Gems

Projects no longer need to specify CMake Targets to associate a Gem
variant with.

In order to associate a CMake Target with a gem variant a new
`ly_set_gem_variant_to_load` function has been added that maps CMake
Targets -> Gem Variants.

This allows CMake Targets to self describe which gem variants they
desire to build and load

This implementation is backwards compatible:
The `ly_enable_gems` function still accepts the TARGETS and VARIANTS
arguments which it will forward to the new `ly_set_gem_variant_to_load`
function to allow the input Targets to be associated with input Gem
Variants

This changes fixes the issue with gems that are required by an
Application regardless of the Project in use, not replicating it's
"requiredness" to the SDK layout

Fixes #3430

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added an LY_PROJECT_NAME property to the Launcher targets

The `ly_enable_gems_delayed` now command queries the LY_PROJECT_NAME property
associated with each target to determine if the gems being enabled are
match the project the target is associated with.
In this case the target only adds dependencies if the gems is being enabled
without a specific project or if the gems is being enabled for the
matching project.

If the LY_PROJECT_NAME property is not set for target, it indicates the
gems for each project can be added as dependencies to the target.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* The INSTALL step now forwards the LY_PROJECT_NAME property for a target

The Install_common.cmake has been updated to support configuring
TARGET_PROPERTIES into the generated CMakeLists.txt for install targets.

Furthermore the indentation of the generated CMakeLists.txt has been
normalized to help with readability

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the Atom_Bootstrap CMakeLists.txt to enable the Atom_Bootstrap Gem


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a deprecation message to ly_enable_gems when supplying TARGETS and
VARIANTS

Added a define_property call for the LY_PROJECT_NAME target property
Removed the .Builders alias for the PrefabBuilder and renamed the
GEM_MODULE target o PrefabBuilder.Builders.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed superflous space from AutomatedTesting Gem CMakeLists.txt

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 4 years ago
AMZN-Igarri 2d45a6b4cb
[Experimental] Asset Picker Flatten View (#3589) 
* Adding Asset Browser Table View to AssetPicker

Signed-off-by: igarri <igarri@amazon.com>

* Adding connections

Signed-off-by: igarri <igarri@amazon.com>

* Adding CVar to hide/show path column

Signed-off-by: igarri <igarri@amazon.com>

* Added Feedback from codereview

Signed-off-by: igarri <igarri@amazon.com>

* Changed m_showColumn name to m_ShownColumns

Signed-off-by: igarri <igarri@amazon.com>
 4 years ago
chcurran f277cf59dc multi threaded fix for upgrader 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 205c09e200 Better upgrade tool messaging and continuity on failure; fix for serialization 
Signed-off-by: chcurran <82187351+carlitosan@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
chcurran 16ed1e1882 More status reporting, fixed widget row index tracking for upgrader tool 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran f5485fa675 merge lastest; add extra data to scan result 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 782c6748ae Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
chcurran 862df096db Add file information to Version; improve Method deserialization warnings; add SC unit test content to builders 
Signed-off-by: chcurran <82187351+carlitosan@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
chcurran 9688832adc Initial fixes for graph update tool 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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
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 3522f622f3 more castings 
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 5044204839 Move JsonUtils.h for support of SC serialization 
Signed-off-by: chcurran <82187351+carlitosan@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
carlitosan 8c21c85972
Merge pull request #3028 from aws-lumberyard-dev/carlitosan/development 
Addes JSON serialization support for properties stored in the EditorScriptCanvasComponent. Add tool tips to explain repeater node behavior, remove empty "User Functions" and "Script Event" headings from Editor.
 4 years ago