birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
292 Commits 3 Branches 3 Tags
c07c57ca2ae1d1dae0722bc33a8edeb0aea75bc6
Commit Graph

75 Commits

Author SHA1 Message Date
Aristo7 c07c57ca2a Revert "Removed HLSL cry compilers and tools" 
This reverts commit f8a72e5a04.
 2021-04-20 12:53:46 -05:00
Aristo7 8410452067 Revert "Removing hlsl refs in cmake build files" 
This reverts commit 7b42402b18.
 2021-04-20 12:53:03 -05:00
Aristo7 2a59b7e0e6 Revert "Linux/mac hlsl header refs removed" 
This reverts commit 6f33e1404e.
 2021-04-20 12:52:40 -05:00
Aristo7 6f33e1404e Linux/mac hlsl header refs removed 2021-04-20 12:27:05 -05:00
Aristo7 7b42402b18 Removing hlsl refs in cmake build files 2021-04-20 11:54:31 -05:00
Aristo7 f8a72e5a04 Removed HLSL cry compilers and tools 2021-04-20 11:05:01 -05:00
Olex Lozitskiy 08ed726faa Deleted CrySCompileServer 2021-04-19 15:52:13 -04:00
Esteban Papp a6c7815685 SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 2021-04-16 16:06:54 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
Tom Hulton-Harrop 405276a7ae Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab 
Add Json serialization support for ByteStream

Fixes serialization issue with the White Box component when Prefabs are enabled.
 2021-04-16 18:28:12 +01:00
jjjoness 0854d5d0da Merge pull request #99 from aws-lumberyard-dev/LYN-1901 
Lyn 1901
 2021-04-16 18:11:15 +01:00
amzn-sean 2a53f018fa Merge pull request #70 from aws-lumberyard-dev/physx_system_comp 
SystemComponent is now only built once in the PhysX.Static target
 2021-04-16 14:04:00 +01:00
hultonha 102a0e5dc8 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 2021-04-16 12:04:14 +01:00
greerdv a757d327a0 Merge branch 'main' into non-uniform-scale-visibility 2021-04-16 09:57:04 +01:00
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 2021-04-15 17:56:08 -07:00
kberg-amzn c2f9019f7c Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents 
Multiplayer components
 2021-04-15 16:30:36 -07:00
srikappa-amzn 76af009190 Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs 
Make creation of new prefabs use a relative path to the project
 2021-04-15 13:20:18 -07:00
Terry Michaels 020d7801bb Make sure Recent Files list is correctly enabled/disabled when the list changes (#73) 
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
 2021-04-15 14:28:57 -05:00
Nicholas Van Sickle 2f698626cf Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix 
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
 2021-04-15 11:33:57 -07:00
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 2021-04-15 11:01:15 -07:00
hultonha 9d84fdcb23 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 2021-04-15 18:26:54 +01:00
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 2021-04-15 14:17:11 +01:00
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 2021-04-15 13:44:53 +01:00
amzn-sean 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. 2021-04-15 12:24:48 +01:00
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 2021-04-15 11:08:04 +01:00
jjjoness 11081aeddd Changed logo to O3DE 2021-04-15 11:01:08 +01:00
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 2021-04-15 10:32:46 +01:00
lumberyard-employee-dm 8019312b35 Merge pull request #28 from aws-lumberyard-dev/LYN-2883 
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
 2021-04-14 20:55:27 -05:00
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 2021-04-14 17:51:15 -07:00
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-04-14 17:47:58 -07:00
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 2021-04-14 17:03:21 -07:00
SJ 03aaf33b6e Merge pull request #62 from aws-lumberyard-dev/SPEC-6295 
[iOS] Fix build issues
 2021-04-14 16:47:12 -07:00
Nicholas Van Sickle 7484a983b8 Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport 
Switch on the Atom-native viewport by default
 2021-04-14 15:47:56 -07:00
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 2021-04-14 17:43:20 -05:00
amzn-sj 7609248c49 Fix build errors 2021-04-14 15:42:24 -07:00
SergeyAMZN 828bedf7a9 Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline 
Fixed dangling pointer in InitializeCatalog
 2021-04-14 22:59:39 +01:00
Terry Michaels 78e5a069fa Removed Cry branding on error messages (#41) 2021-04-14 14:31:44 -05:00
Esteban Papp 90ad9f5141 SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 2021-04-14 12:14:38 -07:00
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 2021-04-14 10:47:18 -07:00
nvsickle 97d0f42671 Enable EditorViewportWidget by default 2021-04-14 10:45:54 -07:00
Mike Balfour efe5715e68 Merge branch 'main' into mbalfour/spec-6178 2021-04-14 12:07:58 -05:00
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 2021-04-14 08:32:59 -05:00
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 2021-04-14 13:13:01 +01:00
hultonha 9c8fd1f9e4 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 2021-04-14 12:31:57 +01:00
hultonha e1e746066d add some preliminary tests for ByteStreamSerializer 2021-04-14 12:04:23 +01:00
hultonha 2655aaa633 update ByteStreamSerializer to use Base64 encoding 2021-04-14 11:30:40 +01:00
karlberg ca3df5d6c8 Various bug fixes to get entity replication working 2021-04-13 20:24:08 -07:00
mcgarrah 957945f809 Clarified the error message that is output when the project.json is not found 2021-04-13 19:50:06 -05:00
mcgarrah 92b8e590ce Added better error message around when the Unified Launcher target for a Project cannot be configured due to issues querying the project name from the provided project path 2021-04-13 19:42:30 -05:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00