birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,214 Commits 3 Branches 3 Tags
02bc89cd9250626e129bc8cf80dc1601e51a31df
Commit Graph

2830 Commits

Author SHA1 Message Date
kberg-amzn 0a829f9661 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-27 15:50:22 -07:00
Chris Galvan 527508ce66 Merge pull request #4270 from aws-lumberyard-dev/daimini/FocusMode/selection 
LYN-5297 | Focus Mode - When a Prefab is selected other entities outside the Prefab hierarchy should not be selectable
 2021-09-27 13:02:34 -05:00
Danilo Aimini 8e92ed14df Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/selection 2021-09-27 09:29:49 -07:00
Danilo Aimini b9bd17f2ae Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup_tests 2021-09-27 08:39:36 -07:00
AMZN-Igarri c75f3690da Product/Source differentiation AssetBrowser Search View. (#4144) 
* Added whole row highlight

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

* Applied code review changes

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

* Addressed code review comments

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

* fixed QPointers

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

* Added indentation to child items

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

* Added Branch Icons

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

* Loading icons and keeping a reference.

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

* Fixed typos

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

* Fixed TableView Header

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

* Cleaned up Delegate Paint

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

* Fixed view style

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

* small tweaks

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

* Added Assert

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

* Small tweak in Table Model

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

* Code Review Feedback

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

* Code review Comments

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

* Removed Comment

Signed-off-by: igarri <igarri@amazon.com>
 2021-09-27 10:43:08 +01:00
Danilo Aimini 6753fdf799 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/selection 2021-09-24 16:46:57 -07:00
Danilo Aimini f7e964c91d Better replacement for EntityId checks 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-24 16:35:48 -07:00
Danilo Aimini 80e6a6903a Remove unused CreateEditorEntity function 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-24 15:55:02 -07:00
lumberyard-employee-dm 2ce7bbd945 Moved the SettingsRegistryFileReader class to more general IO Reader (#4189) 
The new FileReader class allows using either a FileIOBase or SystemFile
classes for reading files.
If a non-nullptr FileIOBase is supplied, the FileIOBase is used,
otherwise SystemFile is used.

Updated the SettingsRegistryMergeUtils
`MergeSettingsToRegistry_ConfigFile` function to use the FileReader.

This allows .cfg such as the autoexec.cfg to be read using FileIO,
therefore allowing it to be read from the engine.pak file.

Because the AZ::Console::ExecuteConfigFile uses the
`MergeSettingsToRegistry_ConfigFile` function for merging *.cfg files to
the SettingsRegistry, this allows the AZ::Console to run console
commands from files within pak files thanks to the ArchiveFileIO being
the default FileIOBase instance

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-09-24 17:36:26 -05:00
Danilo Aimini 72110e40cf Add Unit tests for EditorFocusMode and PrefabFocus. Minor change to PrefabFocusHandler to avoid instantiating a new AZ::EntityId() for checks. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-24 15:05:34 -07:00
SergeyAMZN 66a875bf79 Merge pull request #4261 from aws-lumberyard-dev/MPSpawnableHolderUpdate 
Updated NetworkSpawnableHolderComponent to use TransformBus instead o…
 2021-09-24 19:06:21 +01:00
AMZN-nggieber 9b14d49f87 Adds Inspector to Gem Repo Screen (#4242) 
* Adds the gem repo screen with the UI built but with mocked data and not connected to the o3de scripts

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

* Changed name of added to enabled, disabled define, removed unused functions

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

* Added Repo Screen Inspector UI

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

* Addressed minor PR feedback

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

* Add some more minor PR changes

Signed-off-by: nggieber <nggieber@amazon.com>
 2021-09-24 10:50:45 -07:00
Alex Peterson 43244d30e1 Project Manager Gem Dependencies (#4132) 
* Fix engine API change and add gem dependencies

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Add GemCatalog dependency test

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Clarify display name and fix missing const

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Moving a couple helper functions into private scope

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Update gem count when unselecting a gem #4074

This addresses the following issue https://github.com/o3de/o3de/issues/4074

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Active/Inactive filter and dependency tooltips

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Accessors for previously added and dependencies

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Cart displays gem dependency changes

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Shorten titles to fit in summary popup

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Remove QString::number

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Remove extra space

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Consolidate source model accesor helpers

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Addressing minor feedback

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Remove unused local variable

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-09-24 09:01:17 -07:00
pereslav 4d11025d64 Fixed Entity::GetTransform to work for the components of an activating entity. Made the cached transform lazy evaluated. 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-09-24 13:00:40 +01:00
kberg-amzn efda2c91e9 Cleaning up tcp socket changes 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-23 18:28:11 -07:00
kberg-amzn f837f0494b many bug fixes 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-23 18:25:46 -07:00
Guthrie Adams 05b75ea33c Merge pull request #4273 from aws-lumberyard-dev/Atom/amzn-tommy/ExposeTransformLookAtToBehaviorContext 
Expose Transform::CreateLookAt to behavior context
 2021-09-23 15:04:09 -05:00
Danilo Aimini 03372d2ea9 Made IsInFocusSubTree const, and other minor refactorings. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-23 12:50:49 -07:00
Danilo Aimini 23357b4c93 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/selection 2021-09-23 12:28:31 -07:00
Danilo Aimini d10cf1e495 Add guard against edge case. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-23 10:47:21 -07:00
Danilo Aimini 3fdf1f052a Minor comments and whitespace fixes. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-22 16:46:21 -07:00
amzn-tommy 1e5e6094f5 Expose Transform::CreateLookAt to behavior context to use with hydra tests 
Signed-off-by: amzn-tommy <waltont@amazon.com>
 2021-09-22 15:46:29 -07:00
Danilo Aimini 1dd58511c1 Remove FocusModeFramework nested namespace 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-22 14:18:19 -07:00
Danilo Aimini 368c325613 Disable selection of "out of focus" entities in both Outliner and Viewport. Refactor hover/selection rect painting for branches in the Outliner to fix disabled hover state. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-22 14:18:16 -07:00
Chris Galvan e0eeb6369c Merge pull request #4222 from aws-lumberyard-dev/daimini/FocusMode/setup 
LYN-6796 | Focus Mode - Setup
 2021-09-22 15:44:52 -05:00
Steve Pham cfc9ec2530 Implement Project Manager 'build' button for Mac and Linux(#4248) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-09-22 13:44:21 -07:00
Danilo Aimini 4ae95719de Initialization changes to pass unit tests. Some interfaces are now retrieved on demand and there's clearer failure paths that don't involve asserts to better handle test/headless initializations. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-22 12:44:18 -07:00
Danilo Aimini 305e62380a Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-22 10:03:42 -07:00
hultonha b865d2aec1 Add support for camera reference frames to support camera yaw in certain situations (#4088) 
* proof of concept change for fixing camera yaw rotation being ignored

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to fully support camera roll

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes for PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* undo changes in EditorCameraComponent

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to verify interaction between editor viewport view entity change and modular camera controller

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add additional tests for updated camera behaviors

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* revert change to Camera Gem Output Name

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* move location of new files

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix tab/spaces issue

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove static from potentially unused functions

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* set camera lib name in CMakeLists.txt file

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* cosmetic CMakeLists.txt change

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-22 09:08:24 +01:00
kberg-amzn e8aeb9b101 Format fixing 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-21 19:37:54 -07:00
kberg-amzn d28bcbe027 Reverts changes to component application and adds further client migration handling hookup 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-21 19:33:59 -07:00
Danilo Aimini ceed8f692b Do not assert if m_focusModeInterface can't be initialized 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-21 17:16:27 -07:00
Danilo Aimini f14e8d6eac Fix header formatting to pass validation 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-21 15:06:29 -07:00
Danilo Aimini 107732d057 Remove pragma once from cpp file 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-21 13:45:39 -07:00
kberg-amzn a3aaebe83e merging latest main 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-21 11:55:40 -07:00
Danilo Aimini df10b56f2a ClearFocusRoot implementation 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-21 10:47:02 -07:00
Danilo Aimini 271bd3c2a6 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-21 10:45:40 -07:00
Chris Burel 19747cb5c6 Link to xcb as system-provided targets, instead of by direct library path (#4221) 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-09-21 12:31:42 -05:00
Danilo Aimini 5a4476a0e4 Minor fixes to variable names and comments. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-21 10:26:41 -07:00
Danilo Aimini b8c78caa2f Remove nested FocusModeFramework namespace 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-21 09:48:09 -07:00
Danilo Aimini 29d7fcb55e Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-21 09:41:36 -07:00
AMZN-Igarri 7fca57a169 Fixed Assert (#4234) 
Signed-off-by: igarri <igarri@amazon.com>
 2021-09-21 14:55:10 +01:00
kberg-amzn ff1482bb03 merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 13:53:30 -07:00
Danilo Aimini 9c400bbd9d Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-20 13:44:41 -07:00
Danilo Aimini 489a93cf91 Remove assert for edge case that can actually happen in normal circumstances, simply return false in those cases. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-20 13:44:25 -07:00
lumberyard-employee-dm b9d1af9f46 Fixed calculation of each archive file data offset. (#4204) 
* Fixed calculation of each archive file data offset.

The location of a file entry in a Zip file is calculated after the local file
header + the length of the filename + the length of the extra field
length per the ZIP file spec.
https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed bIndependentBlocks variable

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-09-20 15:44:07 -05:00
kberg-amzn 011bd5d10e merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 13:28:57 -07:00
kberg-amzn 8401ee409b merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-09-20 13:27:45 -07:00
Danilo Aimini 71bf614912 Changed FocusOnOwningPrefab to return Outcome. Added comments and error checking. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-09-20 12:18:23 -07:00
Danilo Aimini bd6705a06e Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-20 11:58:39 -07:00