Commit Graph

18 Commits

Author SHA1 Message Date
pereslav a5fdbddeda Merged MultiplayerPipeline from CodeCommit 2021-04-15 20:24:50 +01:00
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 2021-04-14 13:13:01 +01:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
Alex Peterson 921eb742d4 Merge branch 'main' into github/staging 2021-04-13 09:46:26 -07:00
Nicholas Van Sickle 22684af141 Merge branch 'main' into nvsickle/EditorViewportWidgetFixes 2021-04-12 12:15:45 -07:00
Alex Peterson cd12226849 Merge branch 'main' into github/staging 2021-04-12 08:48:09 -07:00
alexpete b8e508c2ee Cherrypicking MeshCompiler fix 2021-04-12 08:45:38 -07:00
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 2021-04-10 15:58:42 +01:00
nvsickle 1c47a26494 Clarify the reason for the default view juggling in SetAsActiveViewport 2021-04-09 14:19:41 -07:00
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 2021-04-09 12:40:43 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 2021-03-26 17:05:57 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00