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

70 Commits (b38ab6c2bccec0f9c73db205fcff2eb0f4dafd07)

Author SHA1 Message Date
SJ 3df1ffe3b7
3rd Party static libraries need to be public dependencies to work from installed engine. 
Merge pull request #168 from aws-lumberyard-dev/LYN-2588
 5 years ago
Mike Balfour 6c65d5f666
Merge pull request #156 from aws-lumberyard-dev/mbalfour/behaviorcontext 
Expose some helpful methods to BehaviorContext
 5 years ago
amzn-sj f53c1e8084 3rd Party static libraries need to be public dependencies to work from installed engine. 5 years ago
AMZN-mnaumov f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222 
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
 5 years ago
mbalfour d9fe89ba56 Addressed feedback - made string& into a string_view. 5 years ago
AMZN-mnaumov 3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271 
[ATOM-15271] Fixing thumbnail pixelation
 5 years ago
mbalfour e8459898a7 Exposed Quaternion::CreateFromEulerAnglesDegrees and Transform::Transform(Vector3, Quaternion, Vector3) to the behavior context to improve usability of these classes from scripts. 
(cherry picked from commit 8156beb21181f9ff20972c8ea8be5e3dc61f1700)
 5 years ago
mbalfour 33e61ad35b Added SetEntityName and exposed Get/SetEntityName to the behavior context for use from scripts. 
(cherry picked from commit 4f2e0b74727cfe99c74ed588769a540f24d7aa46)
 5 years ago
AMZN-daimini 7901fe8625
Reset the whole Qt model when an entry in the EditorEntityModel is removed. (#48) (#82) 
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.

Co-authored-by: Shirang Jia <shiranj@amazon.com>

Co-authored-by: Shirang Jia <shiranj@amazon.com>
 5 years ago
mnaumov 7e48bee48f Fixing thumbnail pixelation 5 years ago
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor 
Improving MaterialBrowser filter to show empty folders
 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
Chris Galvan 06d6ab9715 [LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback. 5 years ago
mcgarrah 9412078992 Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or 
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
mcgarrah 603ee5bf83 Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry 5 years ago
mcgarrah 96ef349931 Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file 
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
 5 years ago
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 5 years ago
mcgarrah 373f60f29c Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root 5 years ago
Esteban Papp a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 5 years ago
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
Tom Hulton-Harrop 405276a7ae
Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab 
Add Json serialization support for ByteStream

Fixes serialization issue with the White Box component when Prefabs are enabled.
 5 years ago
amzn-sean 2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp 
SystemComponent is now only built once in the PhysX.Static target
 5 years ago
hultonha 102a0e5dc8 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv a757d327a0 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
mcgarrah bff55bd688 LYN-2726 Updated the Settings Registry Merge Utils logic to determine 
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry

The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
   Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
   if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
   the Settings Registry which can override the
   '/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
   directory to determine the project path
4. Finally if a command line parameter that overrides the project path
   is supplied it is used instead
 5 years ago
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 5 years ago
kberg-amzn c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents 
Multiplayer components
 5 years ago
srikappa-amzn 76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs 
Make creation of new prefabs use a relative path to the project
 5 years ago
Terry Michaels 020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes (#73) 
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
hultonha 9d84fdcb23 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
amzn-sean 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. 5 years ago
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 5 years ago
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 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
SergeyAMZN 828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline 
Fixed dangling pointer in InitializeCatalog
 5 years ago
Chris Galvan 0f13a71bd2 [LYN-2255] Refactored some EditorEntityHelpers so they can be re-used. 5 years ago
Esteban Papp 90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 5 years ago
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
Mike Balfour efe5715e68
Merge branch 'main' into mbalfour/spec-6178 5 years ago
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 5 years ago
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 5 years ago
hultonha 9c8fd1f9e4 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
hultonha e1e746066d add some preliminary tests for ByteStreamSerializer 5 years ago
hultonha 2655aaa633 update ByteStreamSerializer to use Base64 encoding 5 years ago