birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

411 Commits

Author SHA1 Message Date
chcurran 2185505302 Repair upgrade notification after bad automatic merge 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-30 14:59:11 -07:00
chcurran 619948231a fix compile error from bad automatic merge 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-30 14:26:27 -07:00
chcurran a244d429c4 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-09-30 14:05:28 -07:00
Artur K f44169f7fa Cleanup SerializeContext.h pt.1 (#4264) 
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

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

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-09-29 11:31:01 -05:00
chcurran 72ff163ff0 merge system component 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-24 13:05:59 -07:00
chcurran e125462eaa Set logging preference before running tools 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-24 11:56:42 -07:00
Pinfel 6cd770a944 Fixed in-editor "Scripting" category components reference links to o3de.org docs 
Signed-off-by: Pinfel <ppinfel@gmail.com>
 2021-09-19 12:57:57 -04:00
lumberyard-employee-dm 58c227ceb1 Implemented C++23 deleted nullptr_t constructor/assignment for AZStd string classes (#4158) 
* Added string and string_view class constructor overloads which is deleted that prevents initializing them from a nullptr or an integer type

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

* Fixed locations where string and string_view were initialized with
nullptr

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

* Fix IArchive::IsInstalledToHDD signature

Updated calls to ConvertAbsolutePathToAliasedPath to use an
list initialization instead of nullptr

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-09-16 12:50:18 -05:00
chcurran 9196e98ee6 update reporting and logging and make bug fixes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-15 17:03:16 -07:00
chcurran 296fca722e file save finished, not tested 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-15 15:42:54 -07:00
chcurran 0dfcc1ea42 dependency sort finished, UI updated 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-15 12:25:06 -07:00
chcurran 0e2f75492c dependency sort finished, but not tested 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-14 14:05:15 -07:00
chcurran f55737af11 dependency sort WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-14 08:41:11 -07:00
chcurran cb12d31821 Modifier step WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-13 18:01:49 -07:00
chcurran 1badb5a31f scan refactor is in a working state 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-13 15:30:31 -07:00
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
Esteban Papp 711b332ebe Gems/ScriptCanvas* 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-10 20:24:15 -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
Esteban Papp 9f6d4125b8 Merge branch 'development' into cmake/warn_virtual 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-09 11:50:40 -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
chcurran 34ca9bd5ba fix Linux error 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-08 22:29:32 -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 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
Esteban Papp 52607ce2c0 Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 20:38:07 -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 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
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
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
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