Commit Graph

9 Commits

Author SHA1 Message Date
srikappa 886fe22b16 Merge branch 'main' into Prefab/CreatePrefab 2021-05-10 12:31:18 -07:00
srikappa eb8084d3f6 Initial draft for getting instantiation to work immediately after creation is undone 2021-05-07 16:21:23 -07:00
chiyenteng ede1889507 [CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#585)
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490)
2021-05-06 10:39:43 -07:00
chiyenteng efc0cbacba Prevent AzToolsFramework benchmarks timeout for now (#398) (#403) 2021-04-28 15:32:35 -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
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