birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,814 Commits 3 Branches 3 Tags
ecc26a24a5e13d7f4083f6e50c034fb507f7ec82
Commit Graph

1837 Commits

Author SHA1 Message Date
Dayo Lawal f215011de4 Copyright header and whitespace fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-15 12:44:26 -05:00
Dayo Lawal 8f22bff1fb QEditorApplication inheriting from AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-15 12:16:18 -05:00
Dayo Lawal 54947791d2 Fixing copyright header 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:51:58 -05:00
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
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
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 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
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
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
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
Danilo Aimini 1d022907dc Prefabs | Introduce sanitation of prefab doms on loading (#1929) 
* Update PrefabLoader to sanitize ingested prefabs and have core systems operate with default values

Signed-off-by: sconel <sconel@amazon.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove IsExplicitDefault implementation to avoid confusion (since the function isn't virtual).
Avoid copying PrefabDoms over in SanitizeLoadTemplate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Address naming and commenting concerns from PR reviews.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix to error detection code

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add support for all uuid formats for zero check.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Co-authored-by: sconel <sconel@amazon.com>
 2021-07-09 16:22:38 -07:00
carlitosan 70810dfbb9 Merge pull request #1969 from aws-lumberyard-dev/carlitosan/thecleansing 
Fix parser crash related to ebus handler control, and compile time null check
 2021-07-09 15:30:40 -07:00
sconel 22a52bc7b2 Fix issue where game and editor entities could exist simultaneously while exiting game mode (#2015) 
Signed-off-by: sconel <sconel@amazon.com>
 2021-07-09 15:39:17 -05:00
moraaar 4475528df2 Fixed Event Hander's copy constructor and copy assignments 
It was missing to save the event before connecting to it. (#2026)

Signed-off-by: moraaar <moraaar@amazon.com>
 2021-07-09 11:48:04 -07:00