birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,805 Commits 3 Branches 3 Tags
cbaa2fcff554ca27fb07b9229b6ea06537166f3e
Commit Graph

287 Commits

Author SHA1 Message Date
chcurran cbaa2fcff5 rename view --> controller 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 21:03:14 -07:00
chcurran fd71704894 rename view files --> controller 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 20:27:01 -07:00
chcurran b6eb9123e5 version explorer refactor wip 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 19:38:28 -07:00
chcurran e0f93ea159 view traits wip before rename 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 13:19:55 -07:00
chcurran e558e7b0ff rename version explorer ui to view 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 12:54:25 -07:00
chcurran 30d27f23ee rename version explorer to view 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 12:52:54 -07:00
chcurran 5cee8d1892 stubbed out refactor of version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-10 10:59:40 -07:00
chcurran e3d007319d remove false error from deserializing BC nodes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-09 14:37:08 -07:00
carlitosan 52460189aa Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development 
Upgrades and stability fixes for version explorer
 2021-09-09 10:42:53 -07:00
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>
 2021-09-09 09:11:19 -07:00
chcurran 34ca9bd5ba fix Linux error 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-08 22:29:32 -07:00
Steve Pham e6573766c2 Fixes for release builds for unused variable warnings (#4000) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-09-08 21:13:36 -07:00
Esteban Papp f414cd3966 More fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-08 16:50:57 -07:00
chcurran 443bf472cb removed unused function from script event handler node 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-08 16:31:46 -07:00
Esteban Papp d58bda5bbf WIP 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-08 13:43:30 -07:00
Alex Peterson 9f06bffc1b Fix ebus node slots not checked for vars (#3994) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-09-08 13:19:03 -07:00
chcurran 2a810c4845 fix backup file action in version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-08 11:36:04 -07:00
chcurran 5c0bbe7ac1 add SC cvar settings cache 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-07 14:32:24 -07:00
chcurran 64ab627f03 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-09-07 09:35:04 -07:00
chcurran 4ed7feae5d Keep editor alive when not in focus 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-03 14:44:19 -07:00
chcurran e1e1779ec6 Fix for file size limit in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-03 14:04:06 -07:00
chcurran c8ed6d287c Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-09-02 18:14:39 -07:00
chcurran f4dbeb6538 Fix list of manual inspection graphs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 18:14:00 -07:00
chcurran e69a5bc092 fix progress bar for upgrades 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 17:44:52 -07:00
chcurran 3822f92882 fix manual inpsection window 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 17:32:53 -07:00
chcurran a353005296 only track dependent assets with valid ids, as sanity check 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 16:43:07 -07:00
chcurran 9de22d5e54 Fix dependency errors after conversion to JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 16:39:04 -07:00
chcurran b5a32e1c4c remove temporay files in all cases 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 13:33:11 -07:00
Esteban Papp 26d277cc14 Merge branch 'development' into issues/3202 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-01 15:19:32 -07:00
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>
 2021-09-01 11:01:50 -05:00
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>
 2021-09-01 09:39:44 +01:00
chcurran f277cf59dc multi threaded fix for upgrader 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-31 18:38:39 -07:00
chcurran 205c09e200 Better upgrade tool messaging and continuity on failure; fix for serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-31 17:24:02 -07:00
chcurran 3b119b6f32 hot fix for json event input serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-31 14:07:19 -07:00
Esteban Papp c128760ed0 removes leftover of performance build 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-31 09:31:42 -07:00
chcurran 16ed1e1882 More status reporting, fixed widget row index tracking for upgrader tool 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-30 18:27:14 -07:00
chcurran f5485fa675 merge lastest; add extra data to scan result 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-30 16:27:55 -07:00
chcurran 782c6748ae Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-08-30 14:33:16 -07:00
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>
 2021-08-30 14:33:01 -07:00
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>
 2021-08-30 13:10:41 -07:00
chcurran 9688832adc Initial fixes for graph update tool 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-30 08:30:56 -07:00
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>
 2021-08-27 11:24:05 -05:00
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
 2021-08-25 15:40:41 -07:00
Esteban Papp b9daf7f7c3 Enabling several warnings on MSVC that are not enabled by default and are good to have 2021-08-25 15:38:09 -07:00
Esteban Papp 058f6e0f22 PR comments/fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-25 14:06:26 -07:00
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
 2021-08-25 11:52:55 -07:00
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
 2021-08-25 11:47:19 -07:00
carlitosan 803bff70e4 Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development 
Bug fixes for SC editor asset scan in version explorer widget
 2021-08-25 11:41:22 -07:00
Luis Sempé 63cad40db2 Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget 
Improved layout and behavior of the SlotTypeSelector widget
 2021-08-25 11:06:41 -07:00
chcurran be9ad98b24 remove commented out debugging artifacts 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-24 17:46:25 -07:00