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

4529 Commits

Author SHA1 Message Date
Dayo Lawal 9c63968833 Style fixing 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:40 -05:00
Dayo Lawal 986ee5aa9b Changing cmake 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:37 -05:00
Dayo Lawal 92ead794fa Removal of AzQtAppWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:35 -05:00
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:32 -05:00
Dayo Lawal 27466154be AzQtApplication Window 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:30 -05:00
Dayo Lawal 656a4bb097 o3de.com to o3de.org 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:28 -05:00
Dayo Lawal c86535f892 Styling fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:25 -05:00
Dayo Lawal c63c42c7f4 Adding comments and changing QApplication org/app names 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:23 -05:00
Dayo Lawal 6f44393f3a Moved logging to AzToolsFramework, working with MatEditor and SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:21 -05:00
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:19 -05:00
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:17 -05:00
Dayo Lawal f930185077 WriteStartupLog() implemented in base class (unresolved external) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:14 -05:00
Dayo Lawal ecede42501 Fixing logging and cleaning up AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:12 -05:00
Dayo Lawal 96153aa8d7 On output change 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:08 -05:00
Dayo Lawal 60c89d28cc New class: AzQtTraceLogger 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:05 -05:00
Dayo Lawal 31a2ccb041 Addressing change requests for pull request 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:01 -05:00
Dayo Lawal 1cadf34dc3 Removing commenting and unnecessary header files 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:58 -05:00
Dayo Lawal 290567cfd7 Fixed cmake, AzQtApplication working with other tools 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:56 -05:00
Dayo Lawal 5872138671 AzQtApplication 2 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:53 -05:00
Dayo Lawal d3d9b600f9 AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:51 -05:00
Dayo Lawal 975be6a480 MaterialEditor inheriting from ToolsApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:49 -05:00
Dayo Lawal 326dcc3d10 ToolsApplication constructor 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:47 -05:00
Esteban Papp 289f236cab Gems/LyShine 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-13 16:42:51 -07:00
Esteban Papp 098c5a07c1 Gems/LyShine 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-13 16:03:15 -07:00
AMZN-ScottR 7937ece773 [mobile-settings-crash-fix] update mobile settings editor tool to support new project path structure 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-13 15:07:16 -07:00
Esteban Papp 31a9f22d38 Gems/Gestures 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-13 14:15:38 -07:00
Jose bc9d0eb0e1 Added unit tests for groups and toggle groups, fixed comments and syntax 
Signed-off-by: Jose <jotamkin@amazon.com>
 2021-07-13 14:55:05 -05:00
Jose bbf9a06133 Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch 2021-07-13 14:51:56 -05:00
srikappa da11424119 Merge branch 'development' into Prefab/BestEffortPatching 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-07-13 11:52:07 -07:00
Junbo Liang 177f532ffa [Android] SSL certificate error when run the AWS gem sample levels (#2060) 
[Android] Add AWS CA Cert handling to fix SSL errors.
 2021-07-13 11:25:57 -07:00
Esteban Papp 2f2bbc7d43 no message 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-13 11:02:16 -07:00
SergeyAMZN 9b6d207163 Merge pull request #2105 from aws-lumberyard-dev/mp_phys_desync_merge 
Fix positional desync of network objects plus related log spam
 2021-07-13 17:58:39 +01:00
hultonha b0707d3295 ensure the final vertex in a spline cannot be deleted using a manipulator 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-13 17:51:06 +01:00
hultonha 1220ea6539 Merge pull request #2093 from aws-lumberyard-dev/Renaming_Urls_Names 
Changed all amazon reverse urls to o3de reverse urls
 2021-07-13 10:13:08 +01:00
hultonha 5bdb73b064 Merge pull request #2024 from aws-lumberyard-dev/lyn5017_LockSelection/UnlockAll_bug 
Fixed small bug with edit menu
 2021-07-13 10:11:52 +01:00
sphrose 4c627405f2 Merge branch 'development' into LYN-3705-2 2021-07-13 09:42:54 +01:00
Esteban Papp 4e84738ff2 Ordering file alphabetically 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-12 20:32:08 -07:00
Esteban Papp 1dec9d4a9a Fix tests in AzToolsFramework now that the Trace bus is hooked 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-12 18:08:35 -07:00
Esteban Papp c13720e255 fixes and cmake changes to get it to compile 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-12 18:08:30 -07:00
Esteban Papp afd97abdcf Move files to AzFramework/Test and AzToolsFramework/Test accordingly 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-12 18:08:24 -07:00
evanchia b1a1f78ca6 Moved retry command to after the test fails 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-07-12 16:54:57 -07:00
chcurran 83fc1989ac Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-12 16:05:19 -07:00
Scott Romero b7723ad0ea [stabilization/2106] Auto generate installer 3rd party license URL from version string (#2111) 
3rd party license URL is now auto generated from the version string (which should be synchronized with the GitHub release tags) and pulled directly from the source repo it originated from, but only when the version is non-zero.  This also fixes an issue where configure would fail when the previous 3rd party URL wasn't supplied
Fixed an issue where CrashHandler required version strings to be 4 components

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-07-12 15:34:11 -07:00
chcurran 11eb920e40 Removal of dead code and bug fixes for reflection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-12 15:29:56 -07:00
srikappa 86a6d75b40 Remove an additional check during patch application to report errors 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-07-12 15:01:11 -07:00
Chris Galvan df9358c492 Merge pull request #2109 from aws-lumberyard-dev/cgalvan/RemoveDeprecatedGraphicsMenuItems 
Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.
 2021-07-12 16:57:34 -05:00
AMZN-Phil 17fd577056 Merge pull request #2032 from aws-lumberyard-dev/PM-viewbuildlog 
Show link to log while building in Project Manager.
 2021-07-12 14:57:18 -07:00
srikappa c494adba88 Use a utility function to compare json document and expected string 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-07-12 14:21:04 -07:00
AMZN-ScottR aeae1555fe [installer/2106-3p-license-fix] fixed issue with CrashHandler requiring 4-component version strings 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-12 12:29:27 -07:00
Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712 
Merged stabilization/2106 to development
 2021-07-12 14:05:19 -05:00