0f3381a7a7
required warning to disable until we get to the right MSVC version
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:13:04 -07:00
5ca84cb07e
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/Cry_Camera.h
# Code/Legacy/CryCommon/IShader.h
2021-08-24 10:46:18 -07:00
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
2021-08-24 10:43:48 -07:00
dc8b48601c
PR comments/improvements
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 10:36:31 -07:00
b609d5e2cb
supporting multiple directories
...
automatically excluding obvious things
cleanup and verification
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 19:41:57 -07:00
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
8c526eeeb6
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 11:13:56 -07:00
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
2dbac8fe25
addressing comment
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 19:02:13 -07:00
45dcbb96ba
enable more warnings for MSVC
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:38:03 -07:00
fb75e35700
enabling MSVC warning to match clang warnings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 17:52:36 -07:00
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:35 -07:00
c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false
2021-08-20 13:42:19 -07:00
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
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
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
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
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
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
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
a97bccbf38
some fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 14:01:50 -07:00
ab516904e6
Merge branch 'development' into santorac/RapidJSON_3rdParty
2021-08-19 12:32:12 -07:00
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
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
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
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
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
a1b59e5e5e
install reorg/cleanup
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 08:51:29 -07:00
fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
...
Profiler spring cleaning
2021-08-19 08:48:23 -06:00
e0b2027b42
Erase existing artifacts before generation.
...
Signed-off-by: John <jonawals@amazon.com >
2021-08-19 11:16:14 +01:00
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
a5f072f7a9
Remove statistics profiler
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:10 -06:00
d15d40fec6
Add Windows PIX runtime support
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:07 -06:00
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
401d0c1ad5
Update the AWSNativeSDK version and hash for Mac ( #3259 )
2021-08-17 15:17:48 -07:00
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
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
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
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
f99a21e733
last one!
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:38:39 -07:00
58f8b563d0
fix them all
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:38:33 -07:00
e648dbcf08
enabling the warning
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:02:51 -07:00
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
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
b4f6dc5bff
fixes after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-12 16:44:01 -07:00
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
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
c484e685d1
SPEC-2513 Fixing w4018
2021-08-10 14:28:29 -07:00
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
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
amzn-phist
santorac
rgba16f [Amazon]
Jeremy Ong
John
Jeremy Ong
Junbo Liang
pappeste
Steve Pham
Chris Galvan
Scott Romero