birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,407 Commits 3 Branches 3 Tags
eb94d5b7a003339b5cc5a092889b2a297dadeab3
Commit Graph

2048 Commits

Author SHA1 Message Date
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
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
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
srikappa b7e3db9d82 Make prefab patch application use a best effort mechanism 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-07-12 11:58:14 -07:00
AMZN-nggieber 2fad7f37db Added a Warning When VS2019 is not Installed with Link to Download it (#2042) 
* Added a warning when VS2019 is not installed with link to download it

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

* Widden VSWarning dialog

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

* Fix issue with checking for Visual Studio

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

* PALify compiler detection

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

* Changed windows compiler check to waitForFinished instead of waitForReadyRead

Signed-off-by: nggieber <nggieber@amazon.com>
 2021-07-12 11:54:36 -07:00
SergeyAMZN c4a50b961e Merge pull request #2102 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp 
Added an option to character component not use auto-apply velocities on a physics tick
 2021-07-12 19:49:50 +01:00
Chris Galvan 2fc1062802 Removed deprecated graphics settings/performance menu options. Updated automated test accordingly. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-12 13:42:08 -05:00
puvvadar a48a0d1f8a Fix positional desync of network objects plus related log spam 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-07-12 11:15:38 -07:00
Gene Walters e7b44b7d6b Git Issue 1948: LoadLevel Console Command Requires Full Asset Path Instead of Level Name (#1952) 
* Update LoadLevel to also search inside the Level folder for a spawnable if LevelName isnt a fullpath to a spawnable

Signed-off-by: Gene Walters <genewalt@amazon.com>

* A better check to see if users provided a file extension

Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-07-12 11:03:19 -07:00
pereslav 39daa9f361 Added an option to not use auto-apply velocities on a physics tick 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-07-12 18:29:02 +01:00
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-12 10:45:23 -05:00
aaguilea 36a8c0a8cc changed all amazon to o3de 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-12 16:34:01 +01:00
John Jones-Steele 13879665df Change from PR feedback. 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-12 15:50:29 +01:00
John Jones-Steele a573d859c7 One minor change. 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-12 14:25:21 +01:00
John Jones-Steele 5bdbf0baa3 Merge branch 'development' into LYN-4501 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-12 14:24:05 +01:00
John Jones-Steele c7d1117ebf Text changed and default behaviour changed 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-12 12:19:01 +01:00
greerdv 504201aef2 Merge pull request #2036 from aws-lumberyard-dev/lua-scene-queries 
Lua scene queries
 2021-07-12 11:57:51 +01:00
Benjamin Jillich c9ff634080 Aftermath for PR-1956 and PR-2025 (#2035) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-07-12 08:30:07 +02:00
Alex Montgomery 372ac2707f fix outliner sorting using incorrect types for comparisons (#2052) 
* fix outliner sorting using incorrect types for comparisons, fixes for [LY-122258] and [LYN-3666]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix annoying but necessary Qt type cast

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-09 19:37:57 -07:00
Nicholas Van Sickle 8eb8088a36 Remove Cry -> Atom camera sync. (#2047) 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-09 16:25:13 -07:00