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

1486 Commits (171ff477976ef052d6c520a8ff9117efc897917f)

Author SHA1 Message Date
Mike Balfour 9aa44a56e7
Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622 
Integration from stabilization/2106 at commit d5490ecf69 .
 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
AMZN-puvvadar 0186911a3a
Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup 
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
 5 years ago
moudgils 4f84ec90d3
Various new metal fixes (#1465) 
* - Fix the second window related tabbing issue
- Merge calls to UseResoources acrooaa all the SRGs
- Move SamplerCache to the device to ensure only one cache to reduce duplication
- Fixes to compute threading numbers getting reset to 0,0,0
- Cleanup withing BufferPoolResolver
- Argument buffers are now queued to be cleaned up upon shutdown
 5 years ago
jjjoness 0aad6ad08d
Merge pull request #1477 from aws-lumberyard-dev/LYN-2509b 
Cherry picked from development
 5 years ago
Benjamin Jillich 7d5a7b47ac
[LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities (#1392) 
* [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities
* Added another operation to the CanSpawnEntityForProduct that checks the other products and can veto the creation process.
* The model product will not create an entity in case there is already an actor exported, which prevents the issue reported by two different teams/users.
 5 years ago
Terry Michaels 858dee2210
Need to keep full asset paths around in LuaIDE (#1470) 5 years ago
Tom Hulton-Harrop dc343e2b65
Small camera updates (#1460, LYN-2315) 
* add interpolation for goto position/orientation

* resize default camera look-at point
 5 years ago
John Jones-Steele 66c4541e14 Fixed merge error in NewLevelDialog 5 years ago
jjjoness 1ec238685d
Merge branch 'stabilization/2106' into LYN-2509b 5 years ago
John Jones-Steele 2dce6954a1 Cherry picked from development 5 years ago
sphrose 4d02e0b8bb
Merge pull request #1454 from aws-lumberyard-dev/LYN-3619 
New level dialog has no way to select a different folder
 5 years ago
Esteban Papp bfd266db8f
LYN-4659 OSX: Prebuilt Editor and Asset Processor fail to launch (#1446) 
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file

* fixing lrelease patching in mac/windows

* reverting change and disabling warning, the intention of the test is to compare to unitialized values

* Fix for dxc

* no need to disable the warning, just remove the const

* missing dependency to EditorCommon
 5 years ago
puvvadar 4d0d97b3fe Remove excessive assert 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
Esteban Papp 9720984c61
SPEC-7437 Launcher_Windows.cpp failing to compile 5 years ago
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 5 years ago
Terry Michaels ca76a4d1ab
Moved helpers to the top level menu bar above viewport (#1464) 5 years ago
amzn-mike a963cd3ac8
Merge pull request #1382 from aws-lumberyard-dev/Helios_TransformImporterFixV2_stabilization_2106 
AssImp: Transform Importer Fix V2
 5 years ago
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 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
Terry Michaels 74bb2737ca
Replaced menu icon in secondary toolbar (#1459) 5 years ago
amzn-mike 514cfc3b4c Fix compile error 5 years ago
sconel e357dea06c
Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix 
Spawnable/game mode load error fix
 5 years ago
amzn-mike 40ed743ca9 Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 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
jjjoness 3549205d29
Merge pull request #1458 from aws-lumberyard-dev/LYN-4195b 
LYN-4195b - UX - main menu updates - prevent hover effect on the top level menu icon, dim the link icon and increase space between text and icon throughout.
 5 years ago
amzn-mike d2d588901e Address PR feedback 5 years ago
amzn-sean 9f934a6f63
add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 5 years ago
John Jones-Steele 5e4f021d55 Cherry picked from development 5 years ago
amzn-mike bfe391b4bb Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 5 years ago
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 5 years ago
sphrose a3b7cbeffc New level dialog has no way to select a different folder 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
Steve Pham f91ba1a80b
Minor pre-license update cleanup of files (#1437) 
- Remove legacy CryEngine.tip file
- Remove legacy WAF files
- Renamed Lumberyard to O3DE
- Updating "Amazon.com" to "Open 3D Foundation"
 5 years ago
Stephen Tramer b78fa5eed4
Merge pull request #1372 from aws-lumberyard-dev/stramer/az-networking-docs 
Networking libraries + Gems API documentation
 5 years ago
AMZN-koppersr c333824673
Merge pull request #1001 from yuriy0/SerializeContextToolsConvertHandleAnyValidation 
Bug fix: handle the case where the data source type is `any' in the SCT converter command validation step.
 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
Esteban Papp c02345fd71
LYN-4657 OSX: Building AutomatedTesting project fails (#1436) 
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file
 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
Ken Pruiksma 2bc36aa6c6
[SPEC-5991] Removing ImageHDR.h/.cpp. These files are no longer needed and created a licensing issue. (#1420) 
The only place this code was referenced was in using textured tooltips, if the texture used for that tooltip was a .hdr file. However, the few .hdr files in all of o3de are Atom material / lighting related - definitely not used for tooltips.

It's likely bitmap tooltips in general are not used at all anymore, so more code could probably be ripped out, but this solves the immediate problem without making too many changes.
 5 years ago
bosnichd 34e64ca5b0
Remove unused MTPseudoRandom.h/.cpp to address SPEC-5990 (#1426) 5 years ago
amzn-sean 84de2d2e12
Fixed failing periodic physics tests (#1429) 5 years ago
amzn-sean b17c5ca3e6
adding physics tick time to post simulate event (#1401) 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