Commit Graph

20 Commits (4232fa4232cbb71c2302e5de387489fa48e45590)

Author SHA1 Message Date
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
jjjoness 0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
Lyn 1901
5 years ago
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 5 years ago
jjjoness 11081aeddd Changed logo to O3DE 5 years ago
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 5 years ago
Nicholas Van Sickle 7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
Switch on the Atom-native viewport by default
5 years ago
Terry Michaels 78e5a069fa
Removed Cry branding on error messages (#41) 5 years ago
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
nvsickle 97d0f42671 Enable EditorViewportWidget by default 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
Alex Peterson 921eb742d4
Merge branch 'main' into github/staging 5 years ago
nvsickle 1c47a26494 Clarify the reason for the default view juggling in SetAsActiveViewport 5 years ago
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 5 years ago
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago