Commit Graph

25 Commits

Author SHA1 Message Date
Steve Pham 62356b811f Non unity compile fixes (#2365)
* Add missing RTTI include to fix non-unity build error
* Add missing includes that were automatically added as part of unity builds

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-22 17:01:01 -07: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 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
Pip Potter 0edf0e74bc AWS: Migrate attribution endpoint (#1838)
* Migrate attribution endpoint and update unit tests
2021-07-02 16:54:01 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
amzn-hdoke 74de7f785c Fix reading AWSAttribution checkbox state (#1698)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-01 09:51:32 -07: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
amzn-hdoke be519bb36a Allow overriding of AWSAttribution settings to skip consent dialog for automated testing (#1650)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-06-30 12:17:45 -07:00
Vincent Liu f7c96e44b0 [LYN-4848] Migrate remaining doc links to o3de.org (#1632) 2021-06-29 14:56:09 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
amzn-hdoke 4a3f4f6f14 [AWS][Attribution] Consent dialog is generated on first launch (#1593)
* Adding AWSAttribution Consent panel

* Remove commented code

* Create AWSCoreAttributionConsentDialog class. Move hard coded strings to static const variables

* Remove #pragma from cpp
2021-06-25 16:36:52 -07:00
rppotter 703d4f5c50 Rework AWSCore Menu. Fix links etc. 2021-06-24 08:19:32 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
John Jones-Steele 5e4f021d55 Cherry picked from development 2021-06-21 15:28:41 +01:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Chris Burel 7486488b60 Update to PhysX 4.1.2.29882248 (#1411)
* Update to PhysX-4.1.2.29882248

* Add maybe_unused attribute for variable not used in the release config
2021-06-18 09:53:22 -07:00
amzn-hdoke b74a153f75 Update AWSAttribution endpoint to prod endpoint (#1335) 2021-06-16 14:25:26 -07:00
John Jones-Steele 0983d1ba45 Changes made to address comments. 2021-06-16 11:22:59 +01:00
John Jones-Steele 40cdcb63b8 Finished work on LYN-4195 2021-06-15 16:13:02 +01:00
John Jones-Steele ed47bb07ab Menu icon behaviour fixed. 2021-06-11 14:52:01 +01:00
amzn-hdoke bf29b27937 Add AWSAttribution feature (#1164)
* LYN-3601: Provide skeleton classes for AWS Attribution (#31)

Provide skeleton classes for AWS Attribution, along with some basic unit tests

* Add AWS Attribution UI and settings (#56)

* Adding AWS Attributions UX and corresponding editor preference s setting

* Fix serialized field description

* Fixed update frequency to be  a day

* Handling editor startup with default values for AWSAttribution

* Add missing header and remove AWSCoreSystemComponentMock fron test

* Generate and post AWSAttribution metric (#69)

* Adding AWS Attribution Api service job

* Adding support for config endpoint override

* Update Api endpoint formatting, fix default region

* Remove extra header

* Fixes for link issues

* Fix Unittest namespace

* Instantiating AWSAttributionSystemComponent in AWS.Editor module

* Update AttributionMetric with engine version and AWS enabled gems (#77)

* Update AttributionMetric with engine version and AWS enabled gems

* Fix warnings

* Undoing accidental change

* Saving level PrefabLevel_OpensLevelWithEntities

* Remove overriding editorprefrences.setreg

* Revert "Saving level PrefabLevel_OpensLevelWithEntities"

This reverts commit 529af70c55ece70fc6bc29ceb83bef60413713a3.

* Move AWS preferences to its own temp settings file

* Undo accidental file add

* Add missing string params in warning messages

Co-authored-by: Pip Potter <61438964+lmbr-pip@users.noreply.github.com>
2021-06-04 20:48:35 -07:00
Vincent Liu 9fb4ce59c4 [LYN-2151] Add argument to override aws profile and config file path (#994) 2021-05-28 12:19:17 -07:00
Vincent Liu eee7bb219a [LYN-3996] Update core editor menu (#1030) 2021-05-28 10:50:23 -07:00
Vincent Liu 9f9b8f70b4 [LYN-3149] Update AWSCore Editor menu to invoke resource mapping tool through engine python environment (#318)
## Details
After migrating to engine python environment, there is no extra step required to launch resource mapping tool in editor.
1. This change is to migrate the editor tool launching process to engine python environment.
2. Add messagebox to show errors while using the tool
3. Note - as Qt binaries are not well organized in build directory, so separate out *AWSCore.ResourceMappintTool* target to group Qt binaries into independent build sub folder to solve the issue (temporarily, fix can be tracked by https://jira.agscollab.com/browse/LYN-2669, once fix is done, we can just remove this individual target)

## Testing
Runs AWSCore.Editor.Tests
```
[----------] Global test environment tear-down
[==========] 8 tests from 4 test cases ran. (161 ms total)
[  PASSED  ] 8 tests.
```
2021-04-28 11:28:23 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00