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

122 Commits

Author SHA1 Message Date
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
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 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
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
chcurran 214700a73e Finish repair for scanning for upgrade tool 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-24 17:38:34 -07:00
lsemp3d 4545e2fb33 Improved layout and behavior of the SlotTypeSelector widget 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-24 16:27:55 -07:00
chcurran 26f6a714c8 initial fix for version scan 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-24 15:14:20 -07:00
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 11:49:35 -07:00
Esteban Papp 5361cf3b26 Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 11:49:07 -07:00
chcurran 794c22c02e merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-23 16:02:58 -07:00
Esteban Papp 31addc43dc Windows and Linux compiling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 14:02:45 -07:00
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-20 19:35:38 -07:00
Esteban Papp 2e228d94f0 push/pop mismatch 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 18:39:40 -07:00
Esteban Papp 323d642e65 Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 18:01:54 -07:00
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
 2021-08-19 08:53:41 -07:00
Jeremy Ong cf44a4ad67 Address additional PR feedback 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 19:16:05 -06:00
Jeremy Ong a5f072f7a9 Remove statistics profiler 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:10 -06:00
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>
 2021-08-18 17:33:09 -06:00
chcurran c701522adc update error messaging, remove unnecessary comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-18 13:28:01 -07:00
chcurran 1ad182105b fix memory leak and possible nullptr read 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 16:40:48 -07:00
chcurran 88121f3bb4 move JsonUtils to AzCore 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 14:06:24 -07:00
chcurran 0270fb7fbe Initial saving/loading of JSON serialization of sc editor assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 13:47:20 -07:00
Esteban Papp 3522f622f3 more castings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:06:20 -07:00
chcurran 5044204839 Move JsonUtils.h for support of SC serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-13 21:53:20 -07:00
chcurran a56be14677 JSON saving of SC editor assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-13 17:25:01 -07:00
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.
 2021-08-12 12:38:40 -07:00
chcurran fe21b89d8e working support for editor property json serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-12 10:24:16 -07:00
lsemp3d 2b4bd10028 Updated path to icon that was emitting a warning 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-11 17:08:09 -07:00
chcurran 3374b82360 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-08-11 14:48:24 -07:00
chcurran aaa847a569 Remove empty User Functions and Script Event sections 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-11 14:40:34 -07:00
Artur K 4cee263033 Minimal TypeInfo header/reduce std interdependencies. (#2688) 
* Minimal TypeInfo header/reduce std interdependencies.

TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

* Windows build fixed

Removed algorithm.h from string_view.h

smoke-test passed

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

* Resotore dynamic_pointer_cast in intrusive_ptr

Requested by reviewer.

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

* Fix CI build

string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h

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

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
 2021-08-10 19:07:01 -05:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
chcurran 893a80a54e Fix variables names in the property window 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-30 11:37:40 -07:00
chcurran 3633bf2ed0 remove accidental submission of commented out event handling 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-30 10:07:23 -07:00
chcurran 0313b16a85 display unused variables in the editor; bump builder version for recent change to EntityId nodes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-30 09:50:54 -07:00
chcurran 43dfffa3fd fix dangling component variables on cleared script, fix EntityIDNode reflection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-28 20:58:49 -07:00
pappeste e3344bdf8d ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-27 19:31:25 -07:00