Commit Graph

3947 Commits (37bb001040ecdde784eaa99f8538ccd25bb9ae2d)

Author SHA1 Message Date
Mike Balfour 37bb001040
Merge pull request #6517 from aws-lumberyard-dev/mbalfour/gitflow_211220_stabilization_2111RTE
Merge from stabilization/2111RTE
4 years ago
John Jones-Steele 219653a75b
Fixes rounding error display in Slider control (#6477)
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago
Mike Balfour 1845eba6ee Fixed compile error.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Mike Balfour f23798a10a Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE 4 years ago
Mike Balfour f6faad4adb Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE 4 years ago
Mike Balfour a07534ea51 Merge commit '7e5115114ca9500abf67095acb71fbb6087d06c8' into mbalfour/gitflow_211220_stabilization_2111RTE 4 years ago
Mike Balfour 22df3a843e Merge commit '6613030fe691d87c3a870f17c448746616c44787' into mbalfour/gitflow_211220_stabilization_2111RTE 4 years ago
AMZN-Igarri bb14675db7
Fix tests Debug (#6405)
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
4 years ago
bosnichd d5b9cf10cf
Collection of miscellaneous PAL changes required for restricted platforms. (#6482)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
amzn-sean fea4d0e6b1
adding TimeSystem unit tests (#6446)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Michael Pollind 2ddf55474e
chore: remove "using namespace " from AZCore Memory (#6373)
* chore: remove "using namespace " from AZCore Memory

REF: https://github.com/o3de/o3de/issues/6281

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix formatting

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix indentation for AllocatorBase.cpp

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix formatting

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: address minor checkstyle problems

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Benjamin Jillich d20aa935ba
Quaternion to scaled-axis angle representation (and back) helpers (#6421)
Direct conversion helpers for quaternion to the scaled axis-angle representation and back without the need to convert them first to the axis-angle format and manually scale (or normalize on the way back). This also avoids having to deal with the special case of an identity representation which is 0,0,0 in the scaled axis-angle format while our convention for axis-angle is 0,1,0 for the axis and 0 for the angle.

Added unit tests that check the conversion round-trips from quaternion -> (scaled) axis-angle -> quaternion as well as comparing the scaled axis-angle representations from the direct helper functions as well as the axis-angle while manually scaling/normalizing.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
amzn-mike 18cfcd659b
Fix missing parent class reflection for ProceduralPrefabSystemComponent (#6413)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
tjmgd f4ae3a5b7d
Fix: Find function reports code with a line offset of 1 (#6331)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
4 years ago
Tom Hulton-Harrop 01770a1574
Fixes for `CameraInput` handling (#6425)
* add temporary optimize off calls

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix + tests for camera input issue

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* simplify boolean expression (PR feedback)

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop d065eb9498
Initial improvements to fix viewport icon selection and draw order (#6284)
* wip fixes for entity viewport icons displaying in the correct order and handling selection correctly

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add additional comment about z value

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* move manual sorting and some small tidy-up

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update comment

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following initial round of PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* additional changes to support tests for entity icon intersection

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add support to enable/disable icons separately from helpers

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* final tests added and small tidy-up to display EntityId correctly

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update some manipulator test framework calls after utility functions were moved

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for implicit cast

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* move icon scale values to AZ_CVARS

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix failing tests caught in AR and update some naming conventions for tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update naming convention for members of ProjectedViewportRay

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update other references to ProjectedViewportRay

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update more references to ProjectedViewportRay change

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update menus for python tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
AMZN-Phil 105524b7c0 Add a missing comma to fix generator
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
amzn-sean 33bfdc0bd3
corrected implementation of GetRealElapseTime (#6422)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Chris Galvan e2679aad57
Merge pull request #6195 from tjmgd/bug-keyword-22
keyword bug fixed
4 years ago
Chris Galvan 50e06ea8c5
Merge pull request #6328 from tjmgd/bug-lua-debugging-62
Fix: Lua script debugging loading problem
4 years ago
Chris Galvan 0a31483faa
Merge pull request #6333 from tjmgd/bug-lua-breakpoint-67
Fix: Lua breakpoint error
4 years ago
AMZN-Phil 2fa10d7e6a
Merge pull request #6397 from aws-lumberyard-dev/Prism/PMVS2022Check
Force Project Manager to generate VS2019 projects on Windows
4 years ago
Nicholas Van Sickle 7e5115114c
Merge pull request #6403 from aws-lumberyard-dev/nvsickle/FixAmbiguousTypeSerialization
Ensure StoreTypeName stores the correct type for generic types
4 years ago
Jeremy Ong f3d426e638
Merge pull request #4965 from aws-lumberyard-dev/APTetherLifetimeOnByDefault
Enable lifetime tethering of the AP by default
4 years ago
Chris Galvan 8b7cdd45a3
Merge pull request #6344 from aws-lumberyard-dev/daimini/ReadOnly/TransformResetFix
Disable invalid operations related to procedural prefabs in the Inspector
4 years ago
Tom Hulton-Harrop 197e7b95e1
Fix for change with axis gizmo labels not appearing (#6256) (#6387)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
Nicholas Van Sickle f71b134a84 Ensure JsonSerializer::StoreTypeName stores the correct type for generic types
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
AMZN-Phil 98fa18558e Force Project Manager to use VS2019
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
michabr d951e1f652
LyShine cleanup of TODOs (#6138)
* LyShine cleanup pass for Atom conversion

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

* Add GHI numbers to comments

Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
Steve Pham 04669544cc
Remove unused trait AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS (#6389)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
Tommy Walton 7188529652
Fix for GHI-4644: mesh optimization breaking skin influences (DCO fix) (#6336)
* Average incoming skin influences when multiple vertices have been welded. This is one option which will average out the weights even if two welded vertices have differing boneIds, but we probably also need to add the influences earlier in the process and enforce a process where the vertices do not get welded if they have influences with differing boneIds

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Move skin influences from MeshBuilderSkinningInfo to the vertex attribute layers so they are considered when choosing which vertices can be welded and so they are not duplicated when compatible vertices have been welded

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Updating unit tests

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Remove unused functions

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Update based on feedback from burelc

Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
amzn-mike 71bb200e0a
[LYN-7064] Hot Loading of Procedural Prefabs (#4923)
* Prefab hotloading - load and maintain asset references

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Working hotloading

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Clean up code, add comments

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing includes

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add event for template removal.

Clear ProceduralPrefabSystemComponent lookup when templates are removed.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add unit test.

Fix missing include, make sure source name is set

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update comments to make ebus event behavior more clear

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix missing includes

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix temp directory usage which doesn't work on linux

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix temp directory usage which doesn't work on linux

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Use AZ::IO::Path for comparison.  Print paths on failure

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix unit test - register asset with catalog so it can be looked up later

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-mike 45abb9f88e
Proc Prefabs: Remove feature toggle (#6348)
* Disable feature flag - redirect proc prefab check to IsPrefabSystemEnabled.

Procedural Prefabs are now on by default when the prefab system is enabled.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Bump scene builder version to cause all procedural prefabs to rebuild

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to lambda for ebus call

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unused const

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Danilo Aimini 0dfb8d42c4
Disable the ability to instantiate into closed prefabs, and to move the root prefab in focus mode. (#6320)
* Disable "Move Up" and "Move Down" for focused prefab containers.

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

* Disable the ability to instantiate prefabs inside closed prefab instances.

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

* Minor comment fix.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
John Jones-Steele 586f146a84
Fixed nullptr error (#6386)
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago
AMZN-Phil ae3dedfe59
Merge pull request #6172 from aws-lumberyard-dev/Prism/RefactorProjectSettings
Refactor Project Manager Settings
4 years ago
moraaar f941d03f9e
Fix namespace Az for AZ in ProcessWatcher for iOS (#6382)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
Danilo Aimini c06b697c6b Revert part of the fix as it would break unit tests. Verified the remaining code still achieves the same purpose on the UI side without impacting the backend.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Steve Pham 4670003aaf
Fix failed Atom rpi tests linux (#6319)
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS
- Add template specialization for ConstantsData::SetConstant<Color> and ConstantsData::GetConstant<Color>
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS from source code
- Fix ConstantsData::SetConstantArray<bool> to pass unit test SetConstant_GetConstant_FalsePackedInGarbage_Bool on Linux, cause by an unwanted optimization (comments describe the situation). This will make this behavior consistent across platforms

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
Danilo Aimini 502578293b Merge branch 'development' of https://github.com/o3de/o3de into daimini/ReadOnly/TransformResetFix 4 years ago
John Jones-Steele 3ae6b601a2
Focus issue in editor settings menu #3921 (#6296)
* Changes to fix DCO

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Moved the keyEvent to a helper function for ease of testing

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Split definition and declaration of WidgetHandleKeyPressEvent

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago
Danilo Aimini d1533914ab Disable the additional transform context menu items in the inspector. Prevent the user from reparenting entities under procprefabs using the entity picker.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
chcurran 8357fa34e9 fixed unit testing code
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 23267fd862 SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan ca5424dd7b Fixed asset completer model for source handle picker.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan befd84cf0b Added property handler for SourceHandle type.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan b4407e5044 Made PropertyAssetCtrl more extensible.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 42382cd8d1 Added logic to AssetPickerDialog to pre-select by file paths.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan d9ee02fddf Added method to AssetCompleterModel for specifying a filter directly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 231aaa5bf5 Added asset selection model option for a source asset type based on regex.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago