Commit Graph

13 Commits

Author SHA1 Message Date
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 2021-04-15 13:44:53 +01:00
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 2021-04-14 10:47:18 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 2021-04-13 11:08:22 -07:00
Alex Peterson cd12226849 Merge branch 'main' into github/staging 2021-04-12 08:48:09 -07:00
greerdv 8ee92978f4 setting max value for scale 2021-04-12 13:07:40 +01:00
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 2021-04-10 15:58:42 +01: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 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -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