birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,876 Commits 3 Branches 3 Tags
024cbdd2cd50a6ef3df5f5ce4726f0d58532fa5f
Commit Graph

121 Commits

Author SHA1 Message Date
Esteban Papp 6fad254b59 Merge branch 'development' into optimization/unused_files 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/IEditorImpl.cpp
#	Code/Editor/IEditorImpl.h
#	Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
 2022-01-25 15:40:30 -08:00
Daniel Edwards 0a5f472f43 Clang 13: Fix build errors ... 
... due to local variables only being written to (but never read).

Signed-off-by: Daniel Edwards <dev@danieledwards.de>
 2022-01-23 22:29:03 +01:00
lsemp3d d5f7bc7c9b Consolidated navigation to file code 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-21 10:03:02 -08:00
lsemp3d be2241bda9 Navigate to file after generating translation (only 1) 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-21 09:41:37 -08:00
Esteban Papp 5c557f56a3 Removes LoggingAssetDataAggregator/LoggingAssetWindowSession from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 16:08:15 -08:00
Esteban Papp d858c16831 Removes LoggingTypes.cpp from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 16:08:13 -08:00
Esteban Papp 4015ffd073 Removes WidgetBus.h from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-20 16:08:10 -08:00
carlitosan c83bf11a3d on demand reflect az events when they are the return value of ebuses (#6625) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2022-01-04 14:21:06 -08:00
carlitosan 6c986657b4 Fix for file-save-as-new and open asset (#6490) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2022-01-03 13:18:18 -08:00
carlitosan 9c7a558ccb basic refactor of assets (#6467) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-17 12:36:05 -08:00
carlitosan 81bb7aab80 the bloodbath compiles 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 17:32:22 -08:00
carlitosan e078eac379 redcode the asset itself WIP 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 14:17:06 -08:00
carlitosan c5d370723e redcoding asset handler, holder, tracker, memory asset 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 14:14:31 -08:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
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…
 2021-12-03 07:36:54 -08:00
carlitosan 37ae47dda1 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 16:02:29 -08:00
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 14:17:35 -08:00
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>
 2021-12-02 09:17:05 -08:00
chcurran 5da820a8c2 clean up WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 00:25:50 -08:00
chcurran a9b1b02b92 fix mismatched file name on modification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-01 23:55:11 -08:00
lsemp3d 8ebfe4004e Disambiguate setters and getters with the same name + updates to fix duplicates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 17:37:56 -08:00
lsemp3d 066178d7b9 PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 06:35:44 -08:00
lsemp3d 8e472a030b Added support for translating variables types in the variable manager 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-29 18:22:53 -08:00
lsemp3d 612ca4f66a PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-29 14:18:37 -08:00
lsemp3d 13361b220e Updated GameLift names, improved Getter/Setter generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-29 10:40:07 -08:00
chcurran 132d06b6da fixed unit tests bugs, removed commented out code, removed loading spam 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-24 18:55:11 -08:00
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>
 2021-11-24 09:18:03 -08:00
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>
 2021-11-23 08:50:41 -08:00
chcurran 24b3167d48 EditorCOmponent build pipeline WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 20:34:11 -08:00
chcurran 205b2c27ee SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 16:04:49 -08:00
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 2021-11-22 12:24:00 -08:00
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>
 2021-11-22 12:22:38 -08:00
chcurran 1c9c268231 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 2021-11-22 11:03:49 -08:00
chcurran 04fe1d5243 File state change include external delete detection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 11:03:37 -08:00
moraaar 5145fceedc Fix some compilation errors due to warnings of potentially returning unitialized variables. (#5796) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-22 09:57:42 +00:00
Chris Galvan 1937e1ea51 Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 16:20:54 -06:00
Chris Galvan 9ec4b408fd Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker 
Added property handler for SourceHandle type
 2021-11-19 15:23:41 -06:00
Chris Galvan 6af6a9d70a Fixed issue when clearing out source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 15:03:49 -06:00
Chris Galvan 6e14713ea6 Added property handler for SourceHandle type. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 14:52:45 -06:00
chcurran 7aec710cff fix graph tab selection: 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-19 12:22:12 -08:00
puvvadar f44a9e196c Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:50 -08:00
Tommy Walton f5537b4b47 Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2 
Merge stabilization/2110 as of c3dacb1 to development
 2021-11-17 11:26:41 -08:00
Chris Galvan 21c3aba7da Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-17 11:13:38 -06:00
lsemp3d 416b44333e Removed string copy per PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-17 07:56:09 -08:00
lsemp3d a623f04f46 Applied feedback from PR 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-17 07:52:46 -08:00
lsemp3d fabf61688d Improved generation and look up for BehaviorProperty and updates AWS node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 16:24:48 -08:00
Tommy Walton 8fe4e7f08f Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:50 -08:00
lsemp3d 56834361bc Fixed some missing node palette entries since display name was not populated yet 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 16:01:02 -08:00
lsemp3d 5072c2667f Fixed the application of translation overrides to free standing BehaviorProperty constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 15:45:55 -08:00
carlitosan 9898b6ee45 Move SC runtime asset static initialization out of data loading threads 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 13:47:30 -08:00