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

1106 Commits

Author SHA1 Message Date
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
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
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
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
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
greerdv 504201aef2 Merge pull request #2036 from aws-lumberyard-dev/lua-scene-queries 
Lua scene queries
 2021-07-12 11:57:51 +01: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
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
greerdv 08c3bb6bd7 some tidying up 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-09 19:39:07 +01: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 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
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
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
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
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
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
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 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
nvsickle 2fefa80937 Use AZ::DynamicModuleHandle 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:18 -07:00
nvsickle 21dbe8b48f Address review feedback 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:16 -07:00