birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,532 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd40af1c70c'
${ noResults }
Commit Graph

544 Commits (d40af1c70c852aae6e8e4e3fd91f55d8fea8ec99)

Author SHA1 Message Date
Qing Tao 9fac26e6a6
Update o3de to use new packages of ISPCTexComp and squish-ccr (#3556) 
Update package name and hash
Add compressor names.
Update ImageProcessingAtom unit tests.
Removed some unused test assets under ImageProcessingAtom
Enalbe ISPC to all the platforms.
Better error message with compression/decompression
Add temp folder to git ignore
added ispccompressor for all platform. valid it with linux
Update windows package hashes.
Removed AZ_TRAIT_IMAGEPROCESSING_USE_ISPC_TEXTURE_COMPRESSOR
Minor refactor with image processing unit tests.

Signed-off-by: qingtao <qingtao@amazon.com>
 4 years ago
Esteban Papp 906ace3d03 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
bosnichd 040b75c02c
Fix PAL.cmake logic, thanks to lumberyard-employee-dm! (#3516) 
* Fix PAL.cmake logic, thanks to lumberyard-employee-dm!

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Lowercase the platform name to address review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 4 years ago
Esteban Papp ae4cfc3bd3 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
 4 years ago
Esteban Papp b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have 4 years ago
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
 4 years ago
amzn-phist 9f6434fc68
Fix an issue with project-centric ninja builds [Linux] (#3429) 
* Fix an issue with project-centric ninja builds

Normalizes relative paths when adding engine.json as a cmake configure dependency.
It should match the dependency added later which uses absolute path.

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

* Fix typo

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 4 years ago
Esteban Papp b1246dcc08
CMakeLists.txt frrom templates are not being installed (#3456) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
 4 years ago
Esteban Papp f22ecc7830 of course, was disabling/enabling the warning 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp f94043dc83
Adds functions so targets can define install directories/files 4 years ago
Esteban Papp d7fda783a8 improves comment 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 0f3381a7a7 required warning to disable until we get to the right MSVC version 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 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
 4 years ago
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
Esteban Papp dc8b48601c PR comments/improvements 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp b609d5e2cb supporting multiple directories 
automatically excluding obvious things
cleanup and verification

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 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 2dbac8fe25 addressing comment 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 45dcbb96ba enable more warnings for MSVC 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 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
Esteban Papp a1b59e5e5e install reorg/cleanup 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 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