birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,318 Commits 3 Branches 3 Tags
d7bfd34a671772fe2ffe204207e7da0928ca723f
Commit Graph

4318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AMZN-Olex d7bfd34a67 IFilterEntityManager work 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-06-30 19:18:06 -04:00
Gene Walters bafcdfe037 Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628 
Merging Stabilization/2106 into Development
 2021-06-30 11:07:30 -07:00
Tom Hulton-Harrop 8d35f31fa6 API documentation pass for CameraInput types (#1681) 
* add api comments for new camera system

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:16:35 +01:00
Gene Walters dd206caf37 Updating pytest to work with new project_property::edit_project_props parameters 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 23:27:27 -07:00
alexmontAmazon 69f2e06134 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-06-29 17:31:27 -07:00
Gene Walters 9814e9dc6c Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 16:31:06 -07:00
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 15:40:46 -07:00
Gene Walters f905b71844 Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 13:48:45 -07:00
jonawals 9e85caa352 Merge pull request #1648 from aws-lumberyard-dev/TIF/Runtime 
Tif/runtime
 2021-06-29 21:13:54 +01:00
John c145a9a74a Add missing files from addressing PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 19:46:21 +01:00
John 4d265a24ab Merge branch 'TIF/Runtime' of https://github.com/aws-lumberyard-dev/o3de into TIF/Runtime 2021-06-29 19:36:31 +01:00
John ea2115089b Correct tiaf output path to use foward slash dirs 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:44:00 +01:00
John 6067ab38c8 Parameterize build dir and make job explicit profile 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:58 +01:00
Royal OBrien 4f45211c85 Migrated templates 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:56 +01:00
amzn-sean 6db3650d45 fix possible double connect of the Collider m_debugDisplayDataChangedEvent (#1518) 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:54 +01:00
John aa94effd26 Fix snapshot choice that was incorrectly added 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:53 +01:00
IgnacioMartinezGarrido b87e3eb1d6 LYN-4863: Item data not copied on drag-n-drop if column is hidden in Asset Browser Tree View. (#1616) 
* Fixed: Item returning null in drag and drop when column is hidden

* Added explanation about why this approach is needed

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:51 +01:00
jiaweig 1e8465f1cc address comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:49 +01:00
jiaweig c246aa074d Break long line 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:48 +01:00
jiaweig 0193062de4 Fix validation errors 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:46 +01:00
Alex Peterson e310581e59 Updating LFS config to new endpoint (#1623) 
Signed-off-by: AMZN-alexpete
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:44 +01:00
John ee537ae8fa Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:42 +01:00
John 773fb4ea74 Add python test case to hydra test utils editor launcher 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:40 +01:00
John fd1bb483c0 Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:38 +01:00
John 1cf1301a07 Add extra comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:37 +01:00
John 478ffeeac6 Remove PythonCoverage runtime component 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:35 +01:00
John 0e0f266fdd Provisional implementation of PythonCoverage gem 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:33 +01:00
John cfe4a49136 Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:31 +01:00
John 3c31424e92 Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:29 +01:00
John 992e8500ea Add snapshot selection to PR and non-PR builds. 
PR builds will detect the destination branch and check if that branch
is one of the snapshot branches, otherwise it defaults to the 'development'
snapshot.

Non-PR builds use the user-selected snapshot from the list of available
snapshots.

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:28 +01:00
Yuriy Toporovskyy 41a5a5b4f4 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:26 +01:00
Yuriy Toporovskyy 592a8cad6d Don't block main thread to load data from file 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:24 +01:00
yuriy0 fd4f363fe2 Don't give a broken copy constructor to BehaviorContextObject. (#1002) 
* Don't give a broken copy constructor to BehaviorContextObject.

This used to be required by the serialization system, now it handles non-copyable and non-moveable types.

* Explicitly delete the copy constructor instead of defaulting, which implicitly deletes it.

Some compilers complain about such an implicit deletion, and we should be explicit about our intent anyways

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:22 +01:00
yuriy0 9f034b90a2 Generate texture thumbnails in a job thread (#1571) 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:21 +01:00
puvvadar 0fb23a9708 Fix order of ops issue in MP Session Termination 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:19 +01:00
Junbo Liang 0a2b51c32d Address the comments on the CDK application (#1560) 
[LYN-3649] Address the comments on the CDK application

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:17 +01:00
Vincent Liu 4c65fecb57 Merge 'gameliftfeature' branch into 'development' branch (#1534) 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:15 +01:00
John Jones-Steele 497a93014b Entity Outliner - Sort Order options don't show current selection 
Also fixes the menus that have checkmark and icon

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:13 +01:00
jromnoa 3e659b5107 fixes the nightly GPU test 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:11 +01:00
Royal OBrien 0ea1e5b07d Migrated templates 2021-06-29 08:17:41 -07:00
jonawals a8a7265d52 Merge pull request #1614 from aws-lumberyard-dev/jonawals_FixMissingSnapshotParameter 
Fix snapshot choice that was incorrectly added
 2021-06-29 11:57:19 +01:00
IgnacioMartinezGarrido db5d03b588 LYN-4863: Item data not copied on drag-n-drop if column is hidden in Asset Browser Tree View. (#1616) 
* Fixed: Item returning null in drag and drop when column is hidden

* Added explanation about why this approach is needed
 2021-06-29 12:41:35 +02:00
amzn-sean c1a79b183d fix possible double connect of the Collider m_debugDisplayDataChangedEvent (#1518) 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 10:27:48 +01:00
John c83d117b32 Fix snapshot choice that was incorrectly added 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 10:27:46 +01:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
jiaweig 9a77eb2a53 Merge pull request #1542 from aws-lumberyard-dev/Atom/jiaweig/ValidationErrors1 
ATOM-15744 ATOM-15745 [Atom][RHI][Vulkan][Android] Validation Error: Buffer usage flagFix validation errors
 2021-06-28 17:37:07 -07:00
Alex Peterson 7b618d9db2 Updating LFS config to new endpoint (#1623) 
Signed-off-by: AMZN-alexpete
 2021-06-28 11:15:04 -07:00
Alex Peterson c7d000e14b Updating LFS config to new endpoint (#1619) 
Signed-off-by: alexpete <alexpete@amazon.com>
 2021-06-28 11:08:21 -07:00
sharmajs-amzn deadf448c9 Fix for module file path (#1598) 2021-06-28 09:45:05 -07:00
Terry Michaels 7a2a2dc0d7 Updated branding for application names (#1617) 2021-06-28 11:35:13 -05:00