birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,783 Commits 3 Branches 3 Tags
4ad35f424e01356a4745e5f50631dc050b328c98
Commit Graph

8783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Jones-Steele 4ad35f424e Adds check to make sure that there are not too many samples created. (#5789) 
* Adds check to make sure that there are not too many samples created.

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes made from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes made from PR 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-11-19 17:57:38 +00:00
Olex Lozitskiy 7749f3c4a7 Merges PR 5707 that resolves #5611 from dev to stab/2110. 2021-11-19 12:13:25 -05:00
Danilo Aimini b4ff364a51 Remove AI components from list of addable components in Inspector. (#5780) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-19 09:11:48 -08:00
lumberyard-employee-dm 77279bfd55 Prevent updates to o3de_manifests.json if it is corrupted. (#5776) 
This behavior can be overridden using the --force option.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-19 11:04:53 -06:00
Qing Tao 8fd9cbfb64 ATOM-16854 Texture Settings dialog box crashes in the Editor (#5777) 
Changes include:
-Fixed image preview issue which was trying to convert a compressed texture directly to QImage.
-Fixed texture resolution display for cubemap in texture setting editor.
-Sort the preset names in preset combo box
-Fixed a crash when showing IBLSkybox preset info in texture setting editor

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-11-19 09:02:11 -08:00
Tom Hulton-Harrop ebb24d2285 Improvement for click detection when clicking quickly between mouse moves (#5786) 
* improvement for click detection when clicking quickly between mouse moves

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove magic number and introduce constant

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add missing update from camera test

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-19 16:52:44 +00:00
Steve Pham 11f41a4467 Fix UI canvas save as start folder (#5756) 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-19 08:22:53 -08:00
AMZN-Phil 1f0ac46d68 Merge pull request #5731 from aws-lumberyard-dev/Prism/WindowsInstallerName 
Change developer preview tag
 2021-11-19 07:30:48 -08:00
AMZN-Phil 092d125acf Merge pull request #5769 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Extra gem download failure handling
 2021-11-19 07:30:25 -08:00
Tom Hulton-Harrop e50735c127 Improved look for viewport ui border close button (#5757) 
* improved look for viewport ui border close button

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove unused variable

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* removed commented 'fixme' calls

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-19 11:04:49 +00:00
Alex Peterson d30fdb759d Gem repo template (#5774) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-18 21:27:43 -08:00
Olex Lozitskiy 23dcc527a7 Merges PR 5707 that resolves #5611. 
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
 2021-11-18 23:33:42 -05:00
AMZN-Phil a465bf30a7 Iterate over dependent gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 17:30:52 -08:00
Steve Pham 199a59e8f9 Update package and hash for pyside2 (#5773) 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-18 17:30:24 -08:00
Alex Peterson 4ad6d3e9f7 Updated project manager backgrounds (#5770) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-18 16:54:04 -08:00
dmcdiarmid-ly 2321afecfb Merge pull request #5760 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16762 
Fix for SSR initialization and visual quality improvements
 2021-11-18 17:31:27 -07:00
AMZN-Phil 0a3b59f4a0 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/WindowsInstallerName 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 15:48:23 -08:00
antonmic 9cbd323a3b Merge pull request #5763 from aws-lumberyard-dev/Atom/antonmic/AuxGeomFeedback 
Capsule light aux geom: addressed feedback from previous PR plus some cleanup
 2021-11-18 15:19:08 -08:00
Danilo Aimini ac959bcc01 Dragging an entity from outside the focused Prefab into it may crash the Editor (#5762) 
* Replace Instance References with EntityId of the Prefab Container (WIP)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use the invalid entity id for the root instance and get the root instance every time to prevent weird Prefab EOS shenanigans.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Revert unnecessary changes, fix IsOwningPrefabBeingFocused to match previous behavior. Disable some tests that no longer apply correctly due to the testing environment not relying on the Prefab EOS.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix minor typo in test comment

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-18 15:06:58 -08:00
AMZN-Phil 7e43b53d16 Extra gem download failure handling 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 15:01:11 -08:00
allisaurus edb15946ca Update resource mapping tool schema version (#5729) 
* Update resource mapping tool schema version

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
 2021-11-18 14:35:24 -08:00
Danilo Aimini e8576acbb0 Replace old Developer Preview release name with Stable 21.11 (#5759) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-18 14:16:56 -08:00
antonmic cf4ef5e73b Addressed feedback from previous PR plus some cleanup 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-18 13:37:06 -08:00
AMZN-Phil 76d2e125c2 Merge pull request #5751 from aws-lumberyard-dev/Prism/PythonLoggerWarn 
Change warn to warning to remove deprecation messages from Python
 2021-11-18 12:43:26 -08:00
dmcdiar 7f4ab7a1c2 Added a frame delay before activating SSR, several visual quality improvements 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 2021-11-18 13:10:07 -07:00
Luis Sempé 7213e2cd87 Merge pull request #5750 from aws-lumberyard-dev/scripting/4060 
Renamed RequestTaggedEntities to Get Entity By Tag as it only returns the first entity
 2021-11-18 10:24:54 -08:00
antonmic 12e3a652d7 Merge pull request #5737 from aws-lumberyard-dev/Atom/antonmic/FixForCapsuleAuxGeom 
Fixed capsule auxgeom draw for lights and other aux geom issues
 2021-11-18 10:16:31 -08:00
jckand-amzn 06e5c394e2 Updating AssetBrowser tests around new TableView model and removed several xfails from tests that now pass (#5727) 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-18 10:07:19 -08:00
AMZN-Phil 83f42fed5f Change warn to warning to remove deprecation messages from Python 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 09:49:05 -08:00
Mike Balfour 1b63ca3bc0 Terrain component icon updates. (#5722) 
* Terrain component icon updates.
Refreshed using latest icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Revised icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-11-18 11:30:03 -06:00
moudgils 44d693a444 Fix DOF flickering on Vk due to missing LDS sync (#5723) (#5732) 
* Fix DOF flickering on Vk due to missing LDS sync

Signed-off-by: moudgils <moudgils@amazon.com>

* Added another sync

Signed-off-by: moudgils <moudgils@amazon.com>
 2021-11-18 09:11:58 -08:00
lsemp3d 6c25e08d3f Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into scripting/4060 2021-11-18 08:38:38 -08:00
lsemp3d 686fc7c54f Renamed RequestTaggedEntities to 'Get Entity by Tag' 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 08:37:41 -08:00
AMZN-Phil 78263b7f13 Merge pull request #5681 from aws-lumberyard-dev/Prism/CLIDisplayLastError 
Show python errors in Project Manager
 2021-11-18 08:37:23 -08:00
John Jones-Steele a54a149877 Changes from comments made after merge (#5738) 
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-11-18 16:06:54 +00:00
Tom Hulton-Harrop f18f5318c0 Fix for gizmo axis text not displaying correctly on high dpi screens (#5745) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-18 15:34:30 +00:00
Tom Hulton-Harrop ca6b7d1d1f Add test for ViewportInteractionImpl use of ViewportInteractionRequestBus (#5741) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-18 13:09:06 +00:00
Tom Hulton-Harrop bf4f52e146 Updates and fixes to viewport placement (#5712) 
* updates to use more modern viewport intersection logic

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to editor viewport ray intersection for object placement

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* make ed_defaultEntityPlacementDistance visible to Viewport.cpp

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix link error for AZ_CVAR variable

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-18 10:58:18 +00:00
amzn-sean cf540b6f44 Defaulting the joint setup display to ON instead of OFF (#5696) 
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-11-18 09:57:29 +00:00
Tom Hulton-Harrop b533a9566a Fix for viewport not updating correctly when switching camera views (#5719) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-18 09:11:46 +00:00
antonmic 8587c8e033 Fixed capsule auxgeom draw for lights and other aux geom issues 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-17 22:55:29 -08:00
santorac d222aeef48 Merge pull request #5571 from aws-lumberyard-dev/Atom/santorac/MaterialEditorHandlesMissingTextures 
Updated Material Editor and Asset Processor To Gracefully Handle Missing Textures
 2021-11-17 19:58:37 -08:00
AMZN-Phil a76268287e Change developer preview tag 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 15:51:25 -08:00
santorac 734c2fb693 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 15:11:32 -08:00
santorac 9a887bd690 Removed unused lambda function. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-17 15:11:05 -08:00
AMZN-Phil 7787ceb04c Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 14:43:03 -08:00
amzn-mike 555776fd7f Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575) (#5664) 
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 63713ca284)
 2021-11-17 14:40:45 -08:00
AMZN-Phil c375f07339 Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart 
Display Gem Cart in Gem Catalog Right Panel
 2021-11-17 14:30:43 -08:00
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 14:03:24 -08:00
santorac d3de1689ad Removed unused lambda function. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-17 13:53:11 -08:00