birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,768 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4dd07111f9'
${ noResults }
Commit Graph

8768 Commits (4dd07111f91c00a448e622ff9fcf5b7f5057900c)
 

Author SHA1 Message Date
AMZN-Phil 4dd07111f9 Make version string settable from Jenkins 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Steve Pham 199a59e8f9
Update package and hash for pyside2 (#5773) 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 4 years ago
Alex Peterson 4ad6d3e9f7
Updated project manager backgrounds (#5770) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
dmcdiarmid-ly 2321afecfb
Merge pull request #5760 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16762 
Fix for SSR initialization and visual quality improvements
 4 years ago
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
 4 years ago
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>
 4 years ago
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>
 4 years ago
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>
 4 years ago
antonmic cf4ef5e73b Addressed feedback from previous PR plus some cleanup 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 4 years ago
AMZN-Phil 76d2e125c2
Merge pull request #5751 from aws-lumberyard-dev/Prism/PythonLoggerWarn 
Change warn to warning to remove deprecation messages from Python
 4 years ago
dmcdiar 7f4ab7a1c2 Added a frame delay before activating SSR, several visual quality improvements 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 4 years ago
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
 4 years ago
antonmic 12e3a652d7
Merge pull request #5737 from aws-lumberyard-dev/Atom/antonmic/FixForCapsuleAuxGeom 
Fixed capsule auxgeom draw for lights and other aux geom issues
 4 years ago
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>
 4 years ago
AMZN-Phil 83f42fed5f Change warn to warning to remove deprecation messages from Python 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
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>
 4 years ago
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>
 4 years ago
lsemp3d 6c25e08d3f Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into scripting/4060 4 years ago
lsemp3d 686fc7c54f Renamed RequestTaggedEntities to 'Get Entity by Tag' 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
AMZN-Phil 78263b7f13
Merge pull request #5681 from aws-lumberyard-dev/Prism/CLIDisplayLastError 
Show python errors in Project Manager
 4 years ago
John Jones-Steele a54a149877
Changes from comments made after merge (#5738) 
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 4 years ago
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>
 4 years ago
Tom Hulton-Harrop ca6b7d1d1f
Add test for ViewportInteractionImpl use of ViewportInteractionRequestBus (#5741) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 4 years ago
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>
 4 years ago
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>
 4 years ago
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>
 4 years ago
antonmic 8587c8e033 Fixed capsule auxgeom draw for lights and other aux geom issues 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 4 years ago
santorac d222aeef48
Merge pull request #5571 from aws-lumberyard-dev/Atom/santorac/MaterialEditorHandlesMissingTextures 
Updated Material Editor and Asset Processor To Gracefully Handle Missing Textures
 4 years ago
santorac 734c2fb693 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 4 years ago
santorac 9a887bd690 Removed unused lambda function. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
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>
 4 years ago
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)
 4 years ago
AMZN-Phil c375f07339
Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart 
Display Gem Cart in Gem Catalog Right Panel
 4 years ago
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
santorac d3de1689ad Removed unused lambda function. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
Danilo Aimini a8dcfbbb13
Prevent settings from being saved to setreg files on editor close. Limiting this to avoid a bigger blast radius. (#5717) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
santorac 2774ac1811 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 4 years ago
Guthrie Adams 713a3916f5
Merge pull request #5691 from aws-lumberyard-dev/Atom/guthadam/material_editor_viewport_settings_previews_uses_thumbnail_widget 
Replacing material editor lighting preset selection dialog exr previews with lighting preset thumbnails
 4 years ago
santorac be9db80f99 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 4 years ago
AMZN-Phil 95c8398c79
Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton 
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
 4 years ago
santorac 2ae7a5ef9f Added a unit test for the MaterialPropertyValue bug fix. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
John Jones-Steele 6b1fb04a1c
Terrain Supports Physics test (#5706) 
* Terrain Supports Physics test

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

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 4 years ago
jonawals a1cf76ec65
Merge pull request #5652 from aws-lumberyard-dev/viewport/EditorModeUIBackButton 
Viewport/editor mode UI back button
 4 years ago
Chris Galvan 33abae1008
Merge pull request #5710 from aws-lumberyard-dev/cgalvan/FixSlowScriptCanvasLoading 
Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem.
 4 years ago
AMZN-nggieber 7de4628747
Merge branch 'stabilization/2110' into Prism/FixGemCart 4 years ago
nggieber 8d26251c93 Include DownloadController 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Qing Tao d0ebe4ee10
Follow up fix for ATOM-13512 (#5689) 
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 4 years ago
Guthrie Adams 1457ef6ee9
Merge pull request #5692 from aws-lumberyard-dev/Atom/guthadam/throttle_material_editor_updates_when_inactive 
Reduce material editor update interval when inactive
 4 years ago
Chris Galvan 21c3aba7da Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago