9d2b99b558
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-06 10:18:26 +01:00
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
7f9c6df67b
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-02 09:27:21 +01:00
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
26d9a3b5b3
Fixed tabs
...
Signed-off-by: igarri <igarri@amazon.com >
2021-07-07 13:54:18 +01:00
2a24680535
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-07-07 12:23:24 +01:00
64697350bc
LYN-4806: Switch Asset Browser Mode Button (Fix) ( #1852 )
...
* Adding dropdown for view
Signed-off-by: igarri <igarri@amazon.com >
* Adding Asset Browser Mode selector button
Signed-off-by: igarri <igarri@amazon.com >
* Added display State Enum
Signed-off-by: igarri <igarri@amazon.com >
* changed over to AZStd::unique_ptr
Signed-off-by: igarri <igarri@amazon.com >
* added pointers
Signed-off-by: igarri <igarri@amazon.com >
* Fixing pointers
Signed-off-by: igarri <igarri@amazon.com >
* Fixing parenting
Signed-off-by: igarri <igarri@amazon.com >
* Changes from Code Review Feedback
Signed-off-by: igarri <igarri@amazon.com >
* Fixed wrong condition
Signed-off-by: igarri <igarri@amazon.com >
* Added Button Icon
Signed-off-by: igarri <igarri@amazon.com >
* Fixing Copyright Header
Signed-off-by: igarri <igarri@amazon.com >
2021-07-07 10:53:21 +01:00
2ccede7435
Merge branch 'develop' into LYN-4700
2021-07-05 15:52:55 +01:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
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
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
igarri
Nemerle
Steve Pham
AMZN-Igarri
Chris Galvan
Esteban Papp