birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,331 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 'e9dd032a75'
${ noResults }
Commit Graph

504 Commits (e9dd032a751ac0acfd512797fcbb7934a4b8c8d7)

Author SHA1 Message Date
Gene Walters bafcdfe037
Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628 
Merging Stabilization/2106 into Development
 5 years ago
alexmontAmazon 69f2e06134
rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 5 years ago
Gene Walters 9814e9dc6c Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 5 years ago
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 5 years ago
Gene Walters f905b71844 Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 5 years ago
IgnacioMartinezGarrido b87e3eb1d6 LYN-4863: Item data not copied on drag-n-drop if column is hidden in Asset Browser Tree View. (#1616) 
* Fixed: Item returning null in drag and drop when column is hidden

* Added explanation about why this approach is needed

Signed-off-by: John <jonawals@amazon.com>
 5 years ago
John fd1bb483c0 Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 5 years ago
John 478ffeeac6 Remove PythonCoverage runtime component 
Signed-off-by: John <jonawals@amazon.com>
 5 years ago
John 0e0f266fdd Provisional implementation of PythonCoverage gem 
Signed-off-by: John <jonawals@amazon.com>
 5 years ago
Yuriy Toporovskyy 41a5a5b4f4 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 
Signed-off-by: John <jonawals@amazon.com>
 5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
Terry Michaels 7a2a2dc0d7
Updated branding for application names (#1617) 5 years ago
AMZN-mnaumov 83d142d7dc
Merge pull request #1609 from aws-lumberyard-dev/Atom/mnaumov/cherryPick1571 
Cherry-picking thumbnail performance improvements
 5 years ago
Yuriy Toporovskyy 2dd8d03654 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 5 years ago
Terry Michaels 21ebff5709
Updated help search and all docs.o3de.org links to o3de.org (#1594) 5 years ago
Danilo Aimini 9b6ef150ff
LYN-2480 | Minor fixes to the Prefab system (#1581) 
Remove warning when entities that aren't registered to instances get passed to the Prefab Undo Cache (just ignore them to avoid noise in the console).
Also avoid marking templates dirty when they are added.
 5 years ago
Yuriy Toporovskyy ad2ee47ea3 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 5 years ago
sconel 2a1a523091
Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash 
Fix issue where new projects would crash when exiting game mode
 5 years ago
Tom Hulton-Harrop 1dfb41b6f8
Merge pull request #1512 from aws-lumberyard-dev/hultonha_LYN-4389_imgui-viewport-ui 
Change to move Viewport UI elements to no longer overlap with ImGui menu
 5 years ago
sconel ad181205f8 Add extra space to error message for better formatting 5 years ago
sconel f91e640741 Fix issue where new projects would crash when entering game mode 5 years ago
Terry Michaels 1e457928f5
Update help URLs and remove unneeded links (#1520) 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
hasareej e0dd33b084 Comment Update 5 years ago
hasareej 6ae20b9c9c Fixing Issue with TopRight & BottomLeft Corners 5 years ago
hasareej 1cb780b215 Layout right side bug fix. 5 years ago
hasareej 9e0dccbf39 Initial bug fix - Added a margin. 5 years ago
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
 5 years ago
Danilo Aimini a0f4f16b98
Fix Duplicate function to correctly replace the aliases in patches that get ported over. Also correctly undo/redo link creation. (#1449) 5 years ago
Nicholas Van Sickle b032177418
Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18 
Merge stabilization/2106 into development
 5 years ago
sconel e357dea06c
Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix 
Spawnable/game mode load error fix
 5 years ago
greerdv 0e5ec11cdc
Merge pull request #1455 from aws-lumberyard-dev/non-uniform-scale-hydra 
exposing non-uniform scale component id as a behavior constant for hydra
 5 years ago
amzn-sean 9f934a6f63
add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 5 years ago
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 5 years ago
IgnacioMartinezGarrido e4e22879b8
LYN-1767: Search View Crash Fix (#1430) 
* Fixed crash in tableView when the filter goes empty and there is a selected entry.

* fixed consts

* Code Review Changes

* more minor fixes
 5 years ago
sconel bb0c60d1d4 Correctly add generated spawnables to asset manager in game mode 5 years ago
srikappa-amzn 8f3c227842
Merge pull request #1438 from aws-lumberyard-dev/Prefab/DetachPrefabBugFixes 
Fix bug with DetachPrefab incorrectly replacing old entity aliases in patches
 5 years ago
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 5 years ago
Danilo Aimini acd23698ea
Prefab Serialization | Remove "Source" parameter from prefab source file (#1387) 
* When loading a template to memory, store the current Source (potentially overriding what was stored to disk)

* Before storing the prefab disk, remove the Source parameter from the Dom (as it's no longer necessary to save it).
 5 years ago
sconel 49b3c4d11f Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into Spawnable/GameModeLoadErrorFix 5 years ago
srikappa 4d90b7cfb6 Fix bug with detachPrefab incorrectly replacing old entity aliases in patches 5 years ago
Tom Hulton-Harrop 108b6f8e0c
Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) 5 years ago
Hasareej 4ad97342c2
Hasareej fix whitebox and physx cluster icons (#1398) 
Fixing the issue with the icons not appearing & deleting duplicate icons.
 5 years ago
Hasareej 75e640b908
Hasareej lyn 4389 fix cluster overlap with ImGui (#1329) 
Fixing the cluster overlap with ImGui & a ViewportDisplayLayout alignment issue.
 5 years ago
sconel f825e698c9 WIP fix for referenced assets being loaded before their registration 5 years ago
Tom Hulton-Harrop 8ffd16b0be
Ensure SnapToGrid only appears when GridSnapping is enabled LYN-2302 (#1362) 
* updates to better support showing/hiding viewport ui when grid snapping is enabled/disabled

* connect up editor settings callbacks

* minor polish changes

* api rename

* updates following review feedback
 5 years ago
IgnacioMartinezGarrido d86e8b63c1
Merge pull request #781 from aws-lumberyard-dev/LYN-1767-AB 
LYN-1767 : Asset Browser Search View
 5 years ago
Tom Hulton-Harrop d9b1ccd323
Add align grid button to Viewport UI (#1311) 
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
 5 years ago
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 5 years ago
pappeste 6ea8017646 Update qt versions and add missing dependency 5 years ago