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

476 Commits (024c53ece39b183d93ef3e57dee96d515e5bf090)

Author SHA1 Message Date
carlitosan 024c53ece3 untested fix for object stream version bug 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan e1c1adf2dc fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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 f2bbf41881 fix color background in editor 
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 63f8be12d5
Merge pull request #6322 from aws-lumberyard-dev/carlitosan-sc-bug-fix 
Fix missing asset handler error in AP when loading old SC files
 4 years ago
Artur K 53b88d4752
Preapre codebase for FileRequest compiletime improvements (#6192) 
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 4 years ago
carlitosan 21e7d1db67 Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 3f128c5baa Merge branch 'development' of https://github.com/o3de/o3de into carlitosan-sc-bug-fix 4 years ago
carlitosan 5d9a95577f
Merge pull request #6294 from aws-lumberyard-dev/carlitosan-sc-save-crash-dialog 
Fix dependency static initialization and error message
 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 7087565149 fix interpreted statics 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 5e60ef743a merge latest 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 766de68199 small fixes for SC play in editor and warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 1d0e2e6379 clean up debug output settings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan f551cb2345 fix verbose setting 
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
amzn-sj 47bd6fc4d4
[Mac] Format string specifier for size_t should be %zu (#6237) 
Fixes this build error: error: format specifies type 'int' but the argument has type 'size_t' (aka 'unsigned long') [-Werror,-Wformat]

Signed-off-by: amzn-sj srikkant@amazon.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 d4206270a6 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan a76e9bba69 Restore undo/redo 
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
lsemp3d 88b6e52248 Fixed support for AZEvent name generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
carlitosan b70545ad94 ScriptCanvas --> Script Canvas in comments 
Signed-off-by: carlitosan <82187351+carlitosan@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
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 1005ec9700 remove uneeded files/comments 
Signed-off-by: chcurran <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 eedbf77e3d Updated node format to account for duplicated slot names + regenerated node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago