birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,901 Commits 3 Branches 3 Tags
f44697fbf45b6288d9f2995cd43b2cef4927b9dc
Commit Graph

8901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AMZN-Phil f44697fbf4 Check whether env variables are defined 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 10:20:23 -08:00
Mike Chang c019fe8946 Add conditional to pull O3DE_BUILD_VERSION through environment var (#6096) 
Signed-off-by: Mike Chang <changml@amazon.com>
 2021-12-15 10:19:36 -08:00
AMZN-Phil 2fa10d7e6a Merge pull request #6397 from aws-lumberyard-dev/Prism/PMVS2022Check 
Force Project Manager to generate VS2019 projects on Windows
 2021-12-14 12:46:35 -08:00
rgba16f a60fba5bec Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector 
Signed-off-by: rgba16f 82187279+rgba16f@users.noreply.github.com
 2021-12-14 14:15:36 -06:00
Nicholas Van Sickle 7e5115114c Merge pull request #6403 from aws-lumberyard-dev/nvsickle/FixAmbiguousTypeSerialization 
Ensure StoreTypeName stores the correct type for generic types
 2021-12-14 10:41:19 -08:00
Tom Hulton-Harrop 197e7b95e1 Fix for change with axis gizmo labels not appearing (#6256) (#6387) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-14 09:24:10 +00:00
Nicholas Van Sickle f71b134a84 Ensure JsonSerializer::StoreTypeName stores the correct type for generic types 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 23:40:35 -08:00
AMZN-Phil 98fa18558e Force Project Manager to use VS2019 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-13 17:40:09 -08:00
carlitosan a2bb968371 Merge pull request #6345 from aws-lumberyard-dev/sc-editor-onto-rte-part4-6322 
Sc editor onto rte part4 6322
 2021-12-13 13:15:59 -08:00
rgba16f 2d13b648da Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-12-13 13:16:02 -06:00
carlitosan 0a1dc3c4bd Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:54 -08:00
carlitosan 837e532ad7 fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:52 -08:00
carlitosan a5b30ffc5a fix interpreted statics 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:50 -08:00
carlitosan 9830925309 small fixes for SC play in editor and warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:49 -08:00
carlitosan 0963bc0cc5 removed commented out include 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:47 -08:00
carlitosan dc538d94e5 update error window message and add AP launch request 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:45 -08:00
carlitosan cbc70b4b88 Add dialog window for messaging when SC assets fail to save 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:43 -08:00
carlitosan aeabf21bba clean up debug output settings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:41 -08:00
carlitosan 0f07de7454 fix verbose setting 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:39 -08:00
carlitosan ac6c90cd2c pre-PR cleanup 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:37 -08:00
carlitosan 169416c2f9 remove testing code 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:35 -08:00
carlitosan d284d908b9 Make version explorer wait on AP for dependent assets 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:33 -08:00
carlitosan d8e5315199 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:31 -08:00
carlitosan b9bbe233be Restore undo/redo 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:29 -08:00
carlitosan 3e728d1183 fixed another string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:27 -08:00
carlitosan b10c679c33 fixed string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:25 -08:00
carlitosan 4f00718a38 fix linux build error, change translation system errors to warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:23 -08:00
carlitosan 07bf8fc755 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:21 -08:00
chcurran 0cc4c06213 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:19 -08:00
chcurran d31c6a2774 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:17 -08:00
carlitosan b0ef83e194 Delete $tmp29198_Test_LY_79396.scriptcanvas 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:27:50 -08:00
lumberyard-employee-dm 40e1116e26 Use LegacySystemInterfaceCreated to initialize physics material library. (#6168) (#6347) 
* Use LegacySystemInterfaceCreated to initialize physics material library. OnCatalogLoaded was used before but it's not called when running the editor without assets processed yet.

Signed-off-by: moraaar <moraaar@amazon.com>

Co-authored-by: moraaar <moraaar@amazon.com>
 2021-12-13 12:10:36 +00:00
chcurran 87023cae47 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-10 11:56:46 -08:00
chcurran 6421463df2 clean up WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:46 -08:00
chcurran 2c107c364f fix mismatched file name on modification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:45 -08:00
chcurran d8add36212 restore file save 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:45 -08:00
chcurran 499cdaae5e version upgrader in a presumed working story 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:44 -08:00
chcurran 55fa33cff4 Clean up modifier asset handling. Fix file handling string error. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:44 -08:00
chcurran c4ea3075cc fixed unit tests bugs, removed commented out code, removed loading spam 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:43 -08:00
chcurran 8357fa34e9 fixed unit testing code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:42 -08:00
chcurran 27cc659ab9 Editor Script Component simplified and working 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:42 -08:00
chcurran 66e744785f EditorCOmponent build pipeline WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:41 -08:00
chcurran 23267fd862 SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:41 -08:00
chcurran 5db535d1dd Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 2021-12-10 11:56:40 -08:00
chcurran d9f849b03e File state change include external delete detection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:40 -08:00
Chris Galvan 1797354560 Merge pull request #282 from aws-lumberyard-dev/cgalvan/SourceHandleCompleterFix 
Fixed asset completer model for source handle picker.
 2021-12-10 11:56:39 -08:00
Chris Galvan ca5424dd7b Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:39 -08:00
Chris Galvan b44541c440 Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker 
Added property handler for SourceHandle type
 2021-12-10 11:56:38 -08:00
chcurran 805bd8ef56 fix graph tab selection: 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:37 -08:00
Chris Galvan 31304ee9b1 Fixed issue when clearing out source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:37 -08:00