Commit Graph

525 Commits (cd5df6b372e6c60d9fc270d618f708049d9bc86d)

Author SHA1 Message Date
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
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>
4 years ago
Esteban Papp 8c526eeeb6 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac b23a70ff42
Merge pull request #3338 from aws-lumberyard-dev/santorac/RapidJSON_3rdParty
Moved RapidJSON to 3p-package-source
4 years ago
Esteban Papp fb75e35700 enabling MSVC warning to match clang warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false 4 years ago
Esteban Papp 8bc9ed3d01
removing some rad leftovers (#3366)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac 47758ab7a6 Updated RapidJSON package name and hashes.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
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>
4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Esteban Papp a97bccbf38 some fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac ab516904e6 Merge branch 'development' into santorac/RapidJSON_3rdParty 4 years ago
Esteban Papp 61f7fe5dc5 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac 1d3f8a5f55 Update RapidJSON package hash after adding readme.txt to the package.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
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
4 years ago
santorac a1edb9e036 Updated build scripts to use new 3rdParty package for RapidJSON.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
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
4 years ago
Jeremy Ong fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
Profiler spring cleaning
4 years ago
John e0b2027b42 Erase existing artifacts before generation.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Jeremy Ong ec6e9407f6 Remove RAD (pending future interface for external profiler registration)
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong a5f072f7a9 Remove statistics profiler
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong d15d40fec6 Add Windows PIX runtime support
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
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
4 years ago
Junbo Liang 401d0c1ad5
Update the AWSNativeSDK version and hash for Mac (#3259) 4 years ago
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
4 years ago
Esteban Papp fb05beffe3
Change LY_UNITY_BUILD default to "ON" (#3244)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 964c2401df Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 230e0c6976 remove disabling of some warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste f99a21e733 last one!
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 58f8b563d0 fix them all
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste e648dbcf08 enabling the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Esteban Papp b4f6dc5bff fixes after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f7da64a518 Allowing to build with ASan enabled
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Esteban Papp c484e685d1
SPEC-2513 Fixing w4018 4 years ago
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>
4 years ago
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
4 years ago
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
4 years ago
hultonha 01ed06c7e1
Implement TIAF sequence reporting for MARS
Merge pull request #3010 from aws-lumberyard-dev/TIF/Runtime_merge
4 years ago
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>
4 years ago
John c2a2d1c5c7 Add changes from TIF/Feature branch.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
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>
4 years ago
pappeste b4bf775647 enable the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago