birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,282 Commits 3 Branches 3 Tags
2ef5e956ba102492e270010bb79001f516596b8d
Commit Graph

520 Commits

Author SHA1 Message Date
amzn-phist c66dcc7413 Fix rpaths during o3de sdk install on Linux (#3370) 
* Fix rpaths during o3de sdk install on Linux

Adds install code that modifies ly_copy commands to fix rpaths for things like qt plugins.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Add newline at end of file

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update to use bracket argument

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Minor edit

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Move the string configure call to inside override

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-08-23 13:28:54 -05:00
santorac b23a70ff42 Merge pull request #3338 from aws-lumberyard-dev/santorac/RapidJSON_3rdParty 
Moved RapidJSON to 3p-package-source
 2021-08-23 09:48:55 -07:00
Esteban Papp c8c29b1aff Enable warning MSVC 4296: 'operator': expression is always false 2021-08-20 13:42:19 -07:00
Esteban Papp 8bc9ed3d01 removing some rad leftovers (#3366) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 13:39:51 -07:00
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 11:18:43 -07:00
santorac 47758ab7a6 Updated RapidJSON package name and hashes. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-08-19 17:42:41 -07:00
santorac dad24fb927 Updated the RapidJSON hashes again due to iteration on my 3p-package-source changes. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-08-19 16:56:49 -07:00
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-19 16:16:28 -07:00
rgba16f [Amazon] e889bba963 Remove unused hdf5 3rdParty package from the known packages list (#3295) 
* Remove unused hdf5 3rdParty package from the known packages list

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-08-19 14:53:43 -07:00
rgba16f [Amazon] 983f187121 update used dxc package to revision 3 (#3317) 
* Update Mac build to use rev3 of dxc package

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update linux DXC package version requested

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update windows DXC package revision requested

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-08-19 14:31:36 -07:00
santorac ab516904e6 Merge branch 'development' into santorac/RapidJSON_3rdParty 2021-08-19 12:32:12 -07:00
Esteban Papp 61f7fe5dc5 Merge branch 'development' into cmake/AddressSanitizer 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-19 12:25:41 -07:00
santorac 1d3f8a5f55 Update RapidJSON package hash after adding readme.txt to the package. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-08-19 11:45:15 -07:00
Esteban Papp 68b04fa6c1 Merge branch 'development' into cmake/AddressSanitizer 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/LegacyAllocator.h
 2021-08-19 11:44:28 -07:00
santorac a1edb9e036 Updated build scripts to use new 3rdParty package for RapidJSON. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-08-19 11:26:58 -07:00
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
 2021-08-19 08:53:41 -07:00
Jeremy Ong fdc464c6fd Merge pull request #3272 from aws-lumberyard-dev/PIX 
Profiler spring cleaning
 2021-08-19 08:48:23 -06:00
John e0b2027b42 Erase existing artifacts before generation. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-19 11:16:14 +01:00
Jeremy Ong ec6e9407f6 Remove RAD (pending future interface for external profiler registration) 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:15 -06:00
Jeremy Ong a5f072f7a9 Remove statistics profiler 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:10 -06:00
Jeremy Ong d15d40fec6 Add Windows PIX runtime support 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:07 -06:00
Esteban Papp 1e136a02b0 Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/Crcfix/crcfix.cpp
 2021-08-18 12:39:24 -07:00
Junbo Liang 401d0c1ad5 Update the AWSNativeSDK version and hash for Mac (#3259) 2021-08-17 15:17:48 -07:00
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
 2021-08-17 12:10:46 -07:00
Esteban Papp fb05beffe3 Change LY_UNITY_BUILD default to "ON" (#3244) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 12:05:51 -07:00
Esteban Papp 964c2401df Merge branch 'development' into cmake/AddressSanitizer 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 18:34:35 -07:00
Esteban Papp 230e0c6976 remove disabling of some warnings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:15 -07:00
pappeste f99a21e733 last one! 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:38:39 -07:00
pappeste 58f8b563d0 fix them all 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:38:33 -07:00
pappeste e648dbcf08 enabling the warning 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:02:51 -07:00
jonawals 5925bd22f6 Further subdivide TIAF data by suite. (#3128) 
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
 2021-08-16 14:15:02 +01:00
Steve Pham 87ae7e8653 Fix android gradle scripts to prevent cmake_dependencies.<game>.<game>_gamelauncher from being wiped out of the APK 
Update gradle script generation to correct task dependencies (#3120)
- copyNativeArtifacts must run after syncLYLayoutMode
- syncLYLayoutMode must must after externalNativeBuild

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-08-13 18:22:40 -07:00
Esteban Papp b4f6dc5bff fixes after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-12 16:44:01 -07:00
Esteban Papp f7da64a518 Allowing to build with ASan enabled 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-12 14:36:32 -07:00
Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-11 15:33:50 -05:00
Esteban Papp c484e685d1 SPEC-2513 Fixing w4018 2021-08-10 14:28:29 -07:00
Esteban Papp 181998f810 Fixes a nightly build and a CMake warning (#2941) 
* Addressing CMake warning and removing timeouts that are the same as the default

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

* missed this one

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

* Making it an error so developers stops putting timeouts longer than the allowed one since it causes AR issues

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

* fixing warning from the nightly build

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

* disabling test that is triggering a timeout

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-10 14:05:14 -07:00
Scott Romero 8d0f9f4114 [development] updated file regex when uploading latest tagged installer (#2987) 
The "Latest" tagged installer uploads were failing the file filter because the upload script now collects files as full path before performing the regex.

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-08-10 12:19:31 -07:00
Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
 2021-08-10 11:45:02 -07:00
hultonha 01ed06c7e1 Implement TIAF sequence reporting for MARS 
Merge pull request #3010 from aws-lumberyard-dev/TIF/Runtime_merge
 2021-08-10 18:37:55 +01:00
SJ 44b053df58 [Mac] Building and running game projects from an SDK (#2943) 
* 1. Initial support for loading dylibs outside the bundle.
2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified).
3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep.
4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures.
With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove debug messages.
2. Fix license
3. Pass parent's environment variables to child processes by default(on Mac).

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some feedback from review

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-08-10 10:10:37 -05:00
John c2a2d1c5c7 Add changes from TIF/Feature branch. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-10 14:20:46 +01:00
Nicholas Lawson cf7681df27 Updates the zlib that O3DE uses to the one in 3p-package-source (#2861) 
* Updates o3de to use the new zlib packages.

Packages were uploaded for every supported platform.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
 2021-08-09 13:16:24 -07:00
pappeste b4bf775647 enable the warning 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 19:43:44 -07:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
Scott Romero 96740ba74d [development] installer work - added 'files in use' page and fixed toolset path propagation (#2855) 
Enable files in use dialog in bootstrap installer to close running o3de tools during uninstall or repair
Fixed installer toolset path propagation after variable name change

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-08-05 13:41:30 -07:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
Esteban Papp d03c2c9977 Copy jinja/py files to the install folder (#2643) 
* Copy jinja/py files to the install folder

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

* code review comment

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

* moving AzAutoGen to cmake folder and removing the header-only project

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-02 13:53:13 -07:00
Ken Pruiksma da24323508 [SPEC-7794] Removing references to alembic in cmake & asset processor. 
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-07-30 15:24:32 -05:00
Esteban Papp 902bdeb6d6 Create RUN target as helpers for the project-centric workflow (#2520) (#2635) 
* Create RUN target as helpers for the project-centric workflow

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

* typo fix

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

* rename target as "<target>.Imported" and create "<target>" as the metatarget that is used for debugging and building in o3de

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-29 16:50:50 -07:00