birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,137 Commits 3 Branches 3 Tags
640f4980cd2c664233bcfe3def857e169ca2ac5d
Commit Graph

22 Commits

Author SHA1 Message Date
Chris Galvan ad38c788f9 Merge pull request #6250 from BytesOfPiDev/issue6198 
Prevent some slice-related commands from being enabled when the slice…
 2021-12-27 16:31:46 -06:00
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>
 2021-12-16 09:35:23 +00:00
Andre Mitchell 82ebca8261 Disable unused HideActionWhileEntitiesDeselected function in EditorListener. 
It is only used when the slice editor is enabled, which causes build errors when it is not enabled.

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
 2021-12-13 07:16:14 -05:00
Andre Mitchell 8b1e14cc7e Prevent some slice-related commands from being enabled when the slice editor is not. 
Fixes o3de/o3de#6198

Fixes an additional menu option that was visible (Resave all slices)

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
 2021-12-08 08:29:41 -05:00
Chris Galvan e56396a817 Improvements to C++/Python tool gemplates 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-28 14:30:14 -05:00
John 1cdb34326b Merge branch 'development' into LYN-5265_state_tracker_impl 2021-10-11 08:38:54 +01:00
John 863a7c8382 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-07 17:21:45 +01:00
hultonha 3f2881ea46 Simplify viewport interaction model reset functionality (#4524) 
* simplify entity reset functionality

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

* remove reference to removed shortcuts

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-07 10:00:18 +01:00
John 5308a0fbbb Remove redundant editor mode notifications. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-06 11:57:42 +01:00
Esteban Papp 058f6e0f22 PR comments/fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-25 14:06:26 -07:00
Esteban Papp eaefc580d6 Code/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:53:14 -07:00
hultonha 70ae5c2d40 Editor code: tidy up BOOLs,NULLs and overrides pt1. 
Merge pull request #2872 from nemerle/tidy_up_editor_code_a_bit_split1
 2021-08-06 09:44:14 +01:00
Nemerle b8bed115f0 Editor code: tidy up BOOLs,NULLs and overrides pt1. 
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 1 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
 2021-08-05 16:37:43 +02:00
aaguilea d06ec45aaa changes to the move rotate and scale 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-08-04 13:05:00 +01:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-07-16 15:25:48 -07: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 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
aaguilea b07ed7817d Fixed small bug with edit menu 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-09 12:00:11 +01:00
AMZN-Alexandre Corcia Aguilera 4f523e496f Cherry Picking (lyn1751) (#1854) 
* Cherry Picking (lyn1751)

Problem with DCO so we need to cherry pick this branch.

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

* Cherry picking #2

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

* Cherry picking 3

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

* Changed variables reverseurls
This was just changing some name variables.

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

* Changes from past PR

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

* changes from past PR and fixed small bug:
Also removed some legacy code from Resources.h

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

* couple of changes from actual PR

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

* fixed copyright issues for AR

Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-07 13:28:59 +01:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693) 
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
 2021-06-30 19:51:55 -07:00
Esteban Papp e34e36cb35 git mv Code\Sandbox\Editor Code/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 13:55:28 -07:00