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

1814 Commits

Author SHA1 Message Date
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
Chris Galvan b65c972392 Merge pull request #2007 from aws-lumberyard-dev/daimini/NewsBuilder/removal 
Remove NewsBuilder project from Editor solution.
 2021-07-09 13:42:26 -05:00
greerdv 08c3bb6bd7 some tidying up 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-09 19:39:07 +01:00
jackalbe 7ce6eec39e {SPEC-7645} Disabling FileWatcherUnitTests for Linux (#2012) 
* Disabling FileWatcherUnitTests for Linux

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* added comments to explain the update

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2021-07-09 13:36:33 -05:00
greerdv c7b3a06c6b expose scene queries to lua 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-09 19:24:09 +01:00
lumberyard-employee-dm 6ebf3a93d1 Added protection in the register python script queries of the default folders against a non-existent key causing a KeyError in python (#1946) 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-09 12:56:29 -05:00
lumberyard-employee-dm 8a76ec713e Updated the SettingsRegistry Specialization tag name max size to 64 (#2016) 
The tag name max size should match the maximum size of a project name,
since the project name is automatically added as a specialization tag in
the settings registry when loading .setreg files from within the
<ExecutableDirectory>/Registry directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-09 12:41:43 -05:00
jjjoness 1b530195fc Clarify ImGui activation in Editor viewport (#1765) 
* Clarify ImGui activation in Editor viewport

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* All working following changes from comments in PR

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* One more change

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* fixes from comments in PR.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed git merge error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added header to ImGuiBus.h

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fix for Jenkins error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Minor typo fix

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-09 12:03:20 -05:00
Benjamin Jillich 76cef6e91f Project Manager: Showing a progress bar when copying projects (#2025) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-07-09 18:38:11 +02:00
Esteban Papp e3be8b4c46 Enable AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER for Mac/Linux (#2017) 
Validated it opens the project manager in Mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-09 09:01:35 -07:00
Benjamin Jillich 595ac3fb08 Project Manager: Feature tag filtering for header of the gem catalog (#1956) 
* [LYN-4440] Added new feature tag remove icon

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Added new gem filter tag widget

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Added feature tag widget used for showing the filtered tags in the gem catalog header

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Added filter tag widget container to the gem catalog header and connected it to the gem model

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Syncing the feature tag filters on the left panel with the tag widgets in the header and styling the item delegates

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-07-09 17:18:35 +02:00
AMZN-nggieber 5b44ea9b9a Project Manager: Added Per Project Template Previews and Icon Overlays (#1994) 
* Project Manager: Added Per Project Template Previews and Icon Overlays

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

* Remove template icon overlays and bake them into template preview

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

* Remove unused variables and headers

Signed-off-by: nggieber <nggieber@amazon.com>
 2021-07-09 17:15:34 +02:00
aaguilea 01ed7d70aa Merge branch 'development' into lyn5017_LockSelection/UnlockAll_bug 2021-07-09 13:47:22 +01:00
aaguilea b07ed7817d Fixed small bug with edit menu 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-09 12:00:11 +01:00
Danilo Aimini 2cc9095702 Remove unused functions referencing the News ErrorCode class 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-07-08 21:35:17 -07:00
Danilo Aimini 92ff99c6a0 Remove NewsShared includes in the WelcomeDialog class 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-07-08 18:11:08 -07:00
Esteban Papp d7c8c0192f SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742) 
* copy frameworks to output for loose file case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* patching lrelease

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for python in loose files and bundles

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* found what the problem is, setting a version just in case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Trying to ignore other files to solve Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix some qt stuff for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of cstemp files to prevent signature failures

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-08 17:20:20 -07:00
Terry Michaels 9ea9cbf589 Merge pull request #1989 from aws-lumberyard-dev/cgalvan/gitflow_210708 
Merged stabilization/2106 to development
 2021-07-08 18:03:30 -05:00
Danilo Aimini 242b4923ae Remove NewsBuilder project from Editor solution, as it is no longer used. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-07-08 15:51:53 -07:00
Vincent Liu 43a0e89c20 [LYN-4820] Add more logs for gamelift workflow (#1651) 
* [LYN-4820] Add more logs for gamelift workflow

Signed-off-by: onecent1101 <liug@amazon.com>

* Address feedback

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-07-08 15:18:13 -07:00
jonawals 06c65be40a Add handling for integrity failures when applying and resolving change lists (#1993) 
* ApplyAndResoveChangeList integration failure policy

Signed-off-by: John <jonawals@amazon.com>

* Default integrity failure policy for TIAF sequences

Signed-off-by: John <jonawals@amazon.com>

* Fix superfluous quotation marks

Signed-off-by: John <jonawals@amazon.com>

* Remove superfluous args parse

Signed-off-by: John <jonawals@amazon.com>

* Fix broken storage of last commit hash

Signed-off-by: John <jonawals@amazon.com>
 2021-07-08 15:59:05 -05:00
bosnichd 0ebd5810e3 Fix "GameLauncher Log is Saved with Wrong File Extension" (LYN-3972). (#1984) 
I'm pretty sure that CryString::Format is broken, but it's slated for removal along with the rest of CrySystem, so I'm just addressing the symptom rather than the likely cause (mainly to save time, but also out of an abundance of caution in case other code is inadvertently depending on the existing behaviour of CryString::Format).

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-07-08 13:14:40 -06:00
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-08 13:56:47 -05:00
Esteban Papp d075d5f7b5 fix AzGenericTypeInfo template handling with clang 12+ (#833) (#1947) 
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: Tom "spot" Callaway <72474383+spotaws@users.noreply.github.com>
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
 2021-07-08 11:29:55 -07:00