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

206 Commits (024c53ece39b183d93ef3e57dee96d515e5bf090)

Author SHA1 Message Date
carlitosan 671479c095 remove dev comment 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 686f82666b disable test manager until the asset browsing is fixed 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 81bb7aab80 the bloodbath compiles 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 2271fa3dc6 redcode sc asset files bloodbath 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan e078eac379 redcode the asset itself WIP 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan c5d370723e redcoding asset handler, holder, tracker, memory asset 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 72d00dd94c fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 48ca34eb9f
Merge pull request #6267 from aws-lumberyard-dev/sc-editor-asset-redux 
Make version explorer wait on AP for dependent assets
 4 years ago
carlitosan 1d0e2e6379 clean up debug output settings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan c3bd48b10e pre-PR cleanup 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan edd1fe9a05 remove testing code 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 64d21c9448 Make version explorer wait on AP for dependent assets 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
 4 years ago
Esteban Papp cd5306febf Merging from development 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 799cc68de2 no message 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Luis Sempé 9db83814f2
Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload 
If the asset catalog gets reloaded, clear the translation to avoid du…
 4 years ago
carlitosan c218fd9b77 fixed another string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan f7547a4cbd fixed string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan db798bdbc7 fix linux build error, change translation system errors to warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 7817ed76bf Removes FileIOEventBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
carlitosan 37ae47dda1 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 7dc03485b6 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5a0ab6814d finish last of pre-PR clean up, including saving over previsouly opened tabs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5da820a8c2 clean up WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran a9b1b02b92 fix mismatched file name on modification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 6fb284ff0a restore file save 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran ca771f3adc version upgrader in a presumed working story 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
lsemp3d 8ebfe4004e Disambiguate setters and getters with the same name + updates to fix duplicates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 066178d7b9 PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 8e472a030b Added support for translating variables types in the variable manager 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 612ca4f66a PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 8c308fc3da Clean up modifier asset handling. Fix file handling string error. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
lsemp3d 13361b220e Updated GameLift names, improved Getter/Setter generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 132d06b6da fixed unit tests bugs, removed commented out code, removed loading spam 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
lsemp3d 67d38a5bea A few more updtes and a fallback category for items in the Other field 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 2da3ab42fd Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 24b3167d48 EditorCOmponent build pipeline WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 205b2c27ee SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 4 years ago
lsemp3d 5d09e8d42e Fixed generated property names, pull argument names from BC when available, auto-reload on asset change 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 1c9c268231 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 4 years ago
chcurran 04fe1d5243 File state change include external delete detection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
moraaar 5145fceedc
Fix some compilation errors due to warnings of potentially returning unitialized variables. (#5796) 
Signed-off-by: moraaar <moraaar@amazon.com>
 4 years ago
Chris Galvan 1937e1ea51 Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Chris Galvan 9ec4b408fd
Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker 
Added property handler for SourceHandle type
 4 years ago
Chris Galvan 6af6a9d70a Fixed issue when clearing out source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Chris Galvan 6e14713ea6 Added property handler for SourceHandle type. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago