birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,658 Commits 3 Branches 3 Tags
75d7c61ba1070cc167ef9fe01bf73eadcbf3a20f
Commit Graph

3649 Commits

Author SHA1 Message Date
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
AMZN-Phil 443e8071e7 Show link to log while building for currently building build. 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-07-09 09:32:40 -07: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
evanchia fd6a5134ec Adding C++ retry command 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-07-08 14:02:26 -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
Scott Romero 0730960a4f [development] Mobile settings tool validator and save fixes (#1931) 
Updated and simplified the version number validation regex to support 4-component numerical only version strings
Removed stale WAF reconfigure and replaced save notification dialog to inform the user a manual reconfigure of the project may be required for the settings to be propagated
 2021-07-08 11:28:42 -07:00
Esteban Papp c132b00f6e Removing some unused files from Code/Editor/Plugins (#1943) 
* fix path

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

* remove some unused files from Code/Editor/Plugins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-08 09:46:31 -07:00
mgwynn 82d2fb9244 Adding header to resolve undefined type error (#1938) 
Signed-off-by: mgwynn <mgwynn@amazon.com>
 2021-07-08 09:26:56 -07:00
Chris Galvan 15acb6b85a Merge pull request #1422 from aws-lumberyard-dev/nvsickle/CameraInputHardening 
Switch RenderViewportWidget to Qt based events instead of AzFramework ones
 2021-07-08 11:23:31 -05:00
chcurran c287ae83e9 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-08 08:54:43 -07:00
chcurran 3f231075fe Remove last of Great ScriptCanvas purge code, fix purity categorization handler connection control 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-08 08:53:19 -07:00
Qing Tao 6d9230e292 ATOM-15939 Add support to capture attachment for ParentPass (#1887) 
* ATOM-15939 Add support to capture attachment for ParentPass
- Moved the attachment read back support to Pass class so it supports both ParentPass and RenderPass.
- Added support to output input or output state of an InputOutput attachment.
- Enabled showing ParentPass attachments in PassTree tool.

Signed-off-by: Tao <qingtao@amazon.com>
 2021-07-08 08:23:37 -07:00
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 2021-07-08 10:19:11 +01:00
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 18:43:26 -05:00
SJ 9ca7a698df Fix Mac Editor crash when adding PhysX Collider component to an entity. (#1930) 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-07-07 18:17:40 -05:00
nvsickle c8fb453760 Fix copyright header copy/paste issue. 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 14:40:59 -07:00
Chris Galvan 30f8c75613 Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons 
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
 2021-07-07 16:39:46 -05:00
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 16:37:25 -05:00
Chris Burel 80bdd4e17b Clang compile fixes (#1876) 
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-07-07 14:34:45 -07:00
Terry Michaels 24d21cadae Merge pull request #1475 from aws-lumberyard-dev/nvsickle/ViewportInfoDpiScaling 
Make IMGUI & viewport info scale with DPI
 2021-07-07 15:55:46 -05:00
nvsickle 964b4247f7 Update license header 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:13 -07:00
nvsickle fa9a12eac3 Forward double click events as well 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:11 -07:00
nvsickle 4babf69361 Address a few more review things 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:09 -07:00
nvsickle 049ef81fe9 Address some review feedback, fix license 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:07 -07:00
nvsickle 52ae7433b3 Use synthetic keyboard and mouse devices instead of synthetic input channels 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:06 -07:00
nvsickle 8dc59a13da Revert "Add InputChannel API to disable forwarding events to the underyling device" 
This reverts commit c4be5021116fd7f4944ac300056031b7d5be25be.

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:04 -07:00
nvsickle 042e465622 Harden a few pieces of viewport controller logic 
-Don't eat mouse/keyboard release events in the ViewportManipulatorController
-Do a key activity check in the LegacyViewportCameraController instead of checking state (this could be done elsewhere but it seems to be working as-is and is scheduled to go away)
-Ignore idle mouse delta updates sent to the modular camera controller

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:02 -07:00
nvsickle f4c96fc9df -Rework input handling to filter through a global event filter 
-Attempt to support remote desktop for viewport cursor capture

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:00 -07:00
nvsickle 15248e7c12 Add QtEventToAzInputManager 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:49:57 -07:00
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911) 
* fix for [LYN-4828], message box style changes

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

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-07 13:49:55 -07:00
nvsickle 8e51a4763f Add InputChannel API to disable forwarding events to the underyling device 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:49:55 -07:00
Jose e18bcc63f2 Fixed a bug in the ReflectedPropertyError that was preventing groups from opening correctly 
Signed-off-by: Jose <jotamkin@amazon.com>
 2021-07-07 15:30:58 -05:00
AMZN-ScottR 34f70cb324 [mobile-settings-fixes] removed stale WAF reconfigure process on settings save 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-07 13:17:00 -07:00
kberg-amzn 68d2536b3b Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons 2021-07-07 13:11:17 -07:00
AMZN-ScottR 11d36b0b5b [mobile-settings-fixes] simplified and updated version validation regex to support 4 component strings 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-07 12:49:34 -07:00
Jose 36dee3d492 Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch 2021-07-07 14:31:23 -05:00