birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,202 Commits 3 Branches 3 Tags
13f4f3b37a70f82bbce1acbfdeb2ea3dccfcbb4a
Commit Graph

46 Commits

Author SHA1 Message Date
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
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-12 10:45:23 -05:00
Esteban Papp d7c8c0192f SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742) 
* copy frameworks to output for loose file case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* patching lrelease

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for python in loose files and bundles

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* found what the problem is, setting a version just in case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Trying to ignore other files to solve Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix some qt stuff for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of cstemp files to prevent signature failures

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-08 17:20:20 -07: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
AMZN-stankowi 0095e5aa6a Updated AssImp to rev11, latest build for all platforms (#1563) 2021-06-29 10:50:42 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
galibzon 01b2079790 [ATOM-15801] AZSLc NoMSAA translation needs to initialize the third (#1529) 
argument of GetDimensions() to 1

azslc v1.7.23

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-06-23 18:08:09 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -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
pappeste 6ea8017646 Update qt versions and add missing dependency 2021-06-15 17:33:34 -07:00
galibzon cdce00bf35 [ATOM-13770] [Shaders] - Root Constants need to be padded to be 16 byte (#1326) 
aligned.

AZSLc v1.7.22 now has command line option "--pad-root-const":
Automatically append padding data to the root constant CB to keep it
aligned to 16-byte boundary.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-06-15 10:58:09 -05:00
Steve Pham 600f97a46c Updating DirectXShaderCompiler 3P Packages to use built-from-source version (#976) 2021-05-27 09:41:45 -07:00
AMZN-stankowi b37be6cdbf New AssImp build, just for Windows. This has the crash fix with bones. (#875) 2021-05-24 10:41:19 -07:00
moudgils 2146d9982a Update SpirvCross package 2021-05-21 09:59:07 -07:00
moudgils 5a149a4594 Merge branch 'main' into DxcExperiment 2021-05-20 11:56:35 -07:00
galibzon 256df54575 [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System (#749) 
* [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System.

Added ShaderAssetBuilder2 & ShaderVariantAssetBuilder2.

Added ShaderAsset2, ShaderVariantAsset2.

Eventually they will be the only builders. AzslBuilder &
SrgLayoutBuilder will be removed.
ShaderResourceGroupAsset will be removed. ShaderAssetBuilder &
ShaderVariantAssetBuilder will be replaced.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-05-20 04:53:16 -05:00
moudgils a4a22a2cfa Merge branch 'DxcExperiment' of https://github.com/aws-lumberyard-dev/o3de into DxcExperiment 2021-05-18 20:43:07 -07:00
moudgils 0a2c95cc20 Add Mac's dxc package 2021-05-18 17:42:41 -07:00
Steve Pham 8601ffa27b Set MCPP 3rd Party Package to new OS-specific packages including Linux 
- Add MCPP 3PP definition for Linux
- Update mcpp 3PP definition from -multiplatform to -windows on windows
- Update mcpp 3PP definition from -multiplatform to -mac on mac
 2021-05-17 14:17:42 -07:00
AMZN-stankowi e22debec54 ATOM-15465: Helios rollback AssImp SDK version, this fixes the rotation bug (#608) (#641) 
ATOM-15465: Fix issue with incorrect rotation on models.

* Revert "{LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545)"

This reverts commit 06d2050ac4fe6b9d0d0c52e759cf73a9a3f7d3eb.

* bumping version to force assets to reprocess
 2021-05-07 10:37:29 -07:00
AMZN-stankowi a7224b6379 Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 (#391) (#560) 
Removing FBX SDK, LYN-1045. If you have an issues please reach out to the Helios team.
 2021-05-05 09:29:12 -07:00
nvsickle d4f19cb0b5 Fix Mac build 2021-05-04 15:59:28 -07:00
sharmajs-amzn f5f035122b {LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545) (#554) 2021-05-04 15:00:02 -07:00
nvsickle 896738ccff Update Qt 3rdParty packages to fix a minor CMake issue 2021-04-30 16:08:43 -07:00
spham 5452b5d876 - Update Lua for mac to rev6 (Fix missing debug libs) 2021-04-27 08:09:07 -07:00
Chris Burel e468a93a13 Convert OpenSSL to the new 3p package system (#213) 2021-04-26 08:35:40 -07:00
Olex Lozitskiy 2063b0ba9a Merge pull request #145 from aws-lumberyard-dev/Atom/olexl/ATOM-15275 
ATOM-15275 RedCode legacy version of DirectXShaderCompiler
 2021-04-21 16:54:58 -04:00
Aristo7 9e874ae2ed Merged main in 2021-04-21 15:34:29 -04:00
spham 5906731cd1 Update Lua package revs and hashes to use new re-built Lua packages that pass scrubbing validation 2021-04-21 11:30:00 -07:00
Esteban Papp 92c77dca11 LYN-3069 Revert some 3rdparty changes and address issue (#185) 
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
 2021-04-21 11:16:27 -07:00
Alex Peterson 707f5a07b2 Converted Civetweb to 3p package 2021-04-20 17:25:31 -07:00
sharmajs-amzn 2f9102f10a AssImp asserts on Linux processing (#118) (#138) 
LYN-2645} Helios - AssImp asserts on Linux processing
* Linux builds have asserts off, to match Windows and Mac.
* Secondary UV channels support names are available now

Jira: https://jira.agscollab.com/browse/LYN-2645
 2021-04-20 13:10:25 -07:00
Terry Michaels 990a40199b Removed the last remaining connections to the Clang 3rd Party (#159) 2021-04-20 15:05:45 -05:00
Olex Lozitskiy 08ed726faa Deleted CrySCompileServer 2021-04-19 15:52:13 -04:00
amzn-sj 73f275f479 Get FindOpenGLInterface to use ly_add_external_target() instead 2021-04-16 15:37:26 -07:00
amzn-sj a81ca4490f Move EMotionFX's OpenGL dependency to 3rd Party and make sure Mac builds successfully 2021-04-15 10:42:34 -07:00
Chris Burel 9c01e993db Convert etc2comp to new 3p system (#44) 2021-04-14 12:58:03 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
alexpete 60e6f204d2 Cherrypicking AWS fixes from f57af843 
This fix brings in a new 3rdparty revision for AWS that fixes a minor dependency issue on Android
 2021-04-13 09:19:07 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging 
Integrating up through commit 5e1bdae
 2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00