Commit Graph

4039 Commits (1431afb51a08535a0ceabc22f11a55c0e5f5bb93)

Author SHA1 Message Date
jonawals af422edef8 Merge branch 'main' into TIF/Runtime 5 years ago
jjjoness 2aafdab5af Added the new focus color. 5 years ago
jjjoness bf95c706d8 Merge branch 'main' into LYN-1932 5 years ago
igarri b7c2495911 Working base 5 years ago
hultonha d36a9470a3 Merge branch 'main' into hultonha_PR-37_follow-up 5 years ago
jjjoness 1fd6938519 Replaced missing & 5 years ago
pereslav f235174c45 Merge branch 'MultiplayerPipeline' of https://github.com/aws-lumberyard-dev/o3de into MultiplayerPipeline 5 years ago
pereslav b82627a248 Renamed console_command_file to console-command-file 5 years ago
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
5 years ago
karlberg 6bb51bd9e4 Merging latest origin 5 years ago
daimini b758a1553f GetTemplateIdFromFilePath now asserts if it's passed an absolute path. This is helpful for debugging, since the function would silently fail even if the file was actually loaded. 5 years ago
daimini c07a7c3766 Detect and block instantiations that would generate circular dependencies in the instance hierarchy. 5 years ago
mnaumov 793d60f150 Merge main 5 years ago
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 5 years ago
guthadam 7e8b1e8c80 Fix linux build 5 years ago
srikappa 26604fd66c Merge branch 'main' into Prefab/CreatePrefab 5 years ago
Danilo Aimini 963e851119
Merge pull request #372 from aws-lumberyard-dev/LYN-3060-cherry
Cherry-pick: LYN-3060 | Launching the Editor with Prefab System enabled results in asserts
5 years ago
srikappa 06803040ac Fixed an assert during loading a level with prefabs 5 years ago
Chris Galvan 8e88d746a3 [LYN-3356] Replaced GetSelectedEntities + size() with new API. 5 years ago
guthadam eeafb5eaa3 ATOM-15370 Fix thumbnail scaling and sizing issues
TLDR
Thumbnails size will be removed from the system.
Each thumbnail class is responsible for determining its stored size.
Images and other thumbnail types can be scaled up or down within reason without blurring.

The thumbnail system uses the concept of context and size organize thumbnails by size based on their intended use.  However, most of the thumbnail classes do not respect or use the specified size, which is 16 by 16 pixels and really only usable for small icons.

The thumbnails are currently being used in the asset browser tree control, the larger asset browser previews, the material component property asset controls, the material component inspector for the large preview, and other places.  Each of these places use completely different sizes, some of which are large and change dynamically. Whenever the thumbnails are painted they are scaled to the desired size.

Material and mesh thumbnails were always being captured at 512x512 regardless of what the rest of the thumbnail system said.  Source, product, and folder thumbnails would be stored at the original asset size.  The loading movie thumbnail was always drawn at 16 by 16 and scale up so it was always blurry.  Image thumbnails were always scaled down to 16 by 16 and scale up for larger previews.

Rather than worrying about the size of each context, each thumbnail class will store the image at whenever it deems to be a large enough size that can be scaled down when used.

This may eliminate the need for multiple thumbnail contexts which are not being used anyway.

https://jira.agscollab.com/browse/ATOM-15370
5 years ago
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 5 years ago
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 5 years ago
Chris Galvan 84e0f6f58d [LYN-3122] Moved invariant logic outside of for loop and removed TODO comment. 5 years ago
Chris Galvan f269d92f90 [LYN-3122] Fixed the viewport Entity hit test logic. This allows the BuildDragDropContext to detect hit position correctly so that assets dragged into the viewport are placed in the correct position. 5 years ago
pereslav f1ae3f52b0 Merge branch 'main' into MultiplayerPipeline 5 years ago
Chris Galvan 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. 5 years ago
Junbo Liang 83f3cbd4a1
Merge pull request #151 from aws-lumberyard-dev/SPEC-6072
[SPEC-6072] [Crashpad] Migrate crash reporting tool to use Crashpad from 3rdParty
5 years ago
hultonha 64e06c3010 more updates to camera code 5 years ago
mnaumov 03e681ca5f Merge from main 5 years ago
mnaumov 5f33337fec Merge main 5 years ago
AMZN-mnaumov a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
[ATOM-14585] Enlarged thumbnails on hover
5 years ago
jjjoness 0607f6efa6 Changed Play Console from comments in PR. 5 years ago
AMZN-koppersr 0f8e6cbda1 Fixed a Linux build error. 5 years ago
greerdv b113f09a71 first pass of changing transform to use float for scale internally rather than Vector3 5 years ago
junbo 0b8299ba0b Remove the existing crashpad package and update the package hash 5 years ago
junbo eb0758f63a [SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows 5 years ago
amzn-sean 6987dac6f3
Merge pull request #242 from aws-lumberyard-dev/physx_ragdoll_create
Ragdoll now uses Add/Remove SimulatedBody
5 years ago
Aaron Ruiz Mora 00fca9489c
Fix editor crashing by protecting gEnv->g3DEngine 5 years ago
amzn-sean 82fce4a90c Merge branch 'main' into physx_ragdoll_create 5 years ago
hultonha 1b946818a2 more tidy-up to CameraInput.cpp 5 years ago
hultonha 80108fd848 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 5 years ago
pereslav 44ce664730 Changed handling --console_command_file to use AZ::Console::ExecuteConfigFile 5 years ago
igarri d6ed9d100e Merge branch 'main' into LYN-1767-AB 5 years ago
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 5 years ago
hultonha 0acaac14d8 Merge branch 'main' into hultonha_PR-37_follow-up 5 years ago
hultonha 0952b7bd87 update Cluster file name to ButtonGroup 5 years ago
amzn-sean fbb8727407 Merge branch 'main' into physx_ragdoll_create 5 years ago
hultonha 0da9a05d87 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hultonha 56477b7cc7 merge from main and resolve conflicts 5 years ago
hultonha c898318377 updated camera changes 5 years ago
jjjoness 275d99359d Merge branch 'main' into LYN-1099 5 years ago
mnaumov fdcb19f45a Reverting some unused code 5 years ago
mnaumov 91f027a05c PR feedback 5 years ago
AMZN-koppersr 6dfa33816b Fixed a bug with type ids for inherited classes with a custom serializer.
The code that adds a $type field for pointers where needed was still assuming that custom serializer were always for primitives, which isn't the case anymore. This changes updates the behavior to allow $type to be added to those as well as long as they use an object. This does now however rely more heavily on earlier checks that the data needs a $type because it otherwise can't tell the difference between a primitive getting a default value (an empty object). In the original code this situation would have resulted in failed serialization though, so it's unlikely to be a problem.
5 years ago
mbalfour f76b69d480 Added a handful of null checks to let new level creation succeed. 5 years ago
pereslav 1e43095123 Merge branch 'main' into MultiplayerPipeline 5 years ago
pereslav 2b77d43435 Exposed exec console command to AZ Console 5 years ago
AMZN-daimini 44f1a627e7
Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
5 years ago
nvsickle 33d210b793 Fix "Configure Layout..." being greyed out in the viewport menu 5 years ago
mnaumov c4e3c39ee2 PR feedback 5 years ago
bosnichd e5b5067748
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false (#315)
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false, and added some null checks to protect against gEnv->pRenderer and gEnv->p3DEngine now being null in the editor as well as the launcher.
5 years ago
cgalvan d27c43e595
Merge pull request #316 from aws-lumberyard-dev/cgalvan/GetSelectedEntitiesCount
[LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API.
5 years ago
hultonha 15afcc341d fixes and updates to CameraInput 5 years ago
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 5 years ago
jackalbe a1685ecca9
{LYN-2074} Add Animation data types Behavior for the scene graph (#253)
{LYN-2074} Add Animation data types Behavior for the scene graph  (#253)
* https://jira.agscollab.com/browse/LYN-2074

* moved scene API color to centeralized location
BlendShapeDataFace
BlendShapeData
5 years ago
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 5 years ago
hasareej c85fbe86ba Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hasareej 9cf8070c9e Styling and Review Feedback Changes 5 years ago
pereslav 1db6c9236a Made Launcher use AZ Console instead of CryConsole. Updated the exec function according to PR comments 5 years ago
jjjoness 734cd63494 Merge branch 'main' into LYN-1099 5 years ago
AMZN-AlexOteiza 3f32cc929c
Fixed All Physics automated tests (#129)
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
5 years ago
jjjoness 051cc0bce2 Merge branch 'main' into LYN-1932 5 years ago
hultonha fbaa59f28f updates following review feedback 5 years ago
jjjoness 73df05529c Completed new Play Console button. 5 years ago
igarri f24ae99b3e Merge branch 'main' into LYN-1767-AB 5 years ago
hultonha fc591e292e tidy-up to some naming for types 5 years ago
hultonha a4b8db2f94 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hultonha 662934afbe Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 5 years ago
jjjoness fd87ffc971 Merge branch 'main' into LYN-1099 5 years ago
hultonha b27daeead5 updates to viewport ui switcher id and usage 5 years ago
rgba16f 92199d9f2e
Merge pull request #240 from aws-lumberyard-dev/DisableAtomShim
Delete CryRenderAtomShim, Atom is no longer reachable through Cry rendering interfaces
5 years ago
mnaumov 0bcc85e4d8 scope pointer 5 years ago
mnaumov 30458bc1be PR feedback 5 years ago
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 5 years ago
Esteban Papp 29bf58cffc
SPEC-6517 RedCode: some more folders identified for removal 1 (#290) 5 years ago
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
Guthrie Adams fb26308a26
Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
5 years ago
mnaumov 9f4606c17a Removing test code 5 years ago
mnaumov b215d1c098 Enlarged thumbnails on hover 5 years ago
Aaron Ruiz Mora 45fbc86d2d
Fix cloth with MeshOptimization ON
- Reexport cloth assets with AssImp ON. These was necessary because AssImp collects a different name for the color streams than FbxSDK and therefore they needed to be reassigned in the cloth rule.
- Adding '_optimized' string to a global variable and using StringFunc RChop to remove it for a string.
5 years ago
Chris Burel 61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
5 years ago
amzn-mike 16ca036ea8
Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
Disable Asset Load Cancellation
5 years ago
guthadam 923f234d71 ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.

This is a prerequisite for displaying image previews inside of the material inspector.

https://jira.agscollab.com/browse/ATOM-15326

https://jira.agscollab.com/browse/ATOM-14003
5 years ago
Nicholas Van Sickle 3eaa749191
Merge pull request #277 from aws-lumberyard-dev/nvsickle/MoreMainFixes
Cherry-pick several 1.0 viewport fixes to main
5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
Esteban Papp 1c13b301fe
SPEC-5070 Move ctest_scripts to scripts/ctest
* removing unused function and moving ctest_scripts to scripts/ctest

* Re-adding ebp-test

* Fixing typo that is making this test run in parallel with other tests

* Fixing hang when parameters are passed

* passing absolute path as a project

* small tweak to not print out during Python execution

* Moving the timeout to be in the build step

* Disable ebo_sanity_smoke_no_gpu

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
5 years ago
AMZN-daimini e772afa06e
Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
5 years ago
amzn-mike d25179303d Add jira ticket for disabled tests 5 years ago
amzn-mike c61b244416 Use a const to toggle asset cancellation on and off 5 years ago
greerdv 540f0dcd98 Merge branch 'main' into non-uniform-scale-trackview 5 years ago
greerdv 40655eba03 removing element-wise scale setters from transform bus 5 years ago
greerdv 099f43237d removing long deprecated transform scale functions 5 years ago
jjjoness 2b63ecab87 Merge branch 'main' into LYN-1099 5 years ago
nvsickle 795ce4dfca Revert accidental change 5 years ago
nvsickle fb2ca8e02c Fix Editor crash in test teardown calling set_view_pane_layout
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
5 years ago
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 5 years ago
srikappa-amzn 11f811eb7e
Merge pull request #260 from aws-lumberyard-dev/Prefab/CreatePrefab
Added undo and redo support for nested prefab creation
5 years ago
chiyenteng bac334a244
Fix serialization issues related to sequence node/track (#214) (#247)
* Fix serialization issues related to sequence node/track
5 years ago
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 5 years ago
mnaumov 09a0676b9c Adding custom title to PropertyAssetCtrl 5 years ago
daimini 8f79379bc8 Fixes as per Ram's review 5 years ago
daimini 76739de282 Fix spacing 5 years ago
daimini ea43eb3ac9 Set position of instantiated prefab 5 years ago
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
daimini c9a4b6f50b Better handle the default case for Instantiate 5 years ago
cgalvan 5d3774521f
Merge pull request #251 from aws-lumberyard-dev/cgalvan/RemoveSetEditMode
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
5 years ago
AMZN-stankowi f44f06c9f0
AssImp set to be the default FBX processor (#78) (#136)
* AssImp set to be the default FBX processor (#78)

If you encounter issues, reach out to the Helios team with details, and then switch back to FBX SDK locally by changing FBXImporter.h

* Merge pull request #219 from aws-lumberyard-dev/sceneapi_scripting

LYN-3030: Fix to export_chunks_builder.py to match the AssImp node paths

* Hide some automated test folders from the asset processor for automatedtesting. This is necessary because these assets should only be processed when running the test, and not any time AP is launched for this project.

* Putting these test assets back to visible to Asset Processor. These tests need to be updated at some point to handle that, but they won't work with this change for now. Note that until this is addressed, these tests may randomly time out if they're the first tests run on a clean asset processor, and these tests launch AP without using a unique port, so the test can also fail if an Asset Processor executable is hanging open.

Grabbed the change I missed from the 1.0 branch merge, no idea how this got lost.

* Moved from main to periodic. Allen and Fuzzy were already on board, and I think with the potential flakiness in this test, we don't want this in main.

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
5 years ago
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 5 years ago
pereslav 34f4ba7821 Merge from main 5 years ago
amzn-mike 9e2836613f Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel 5 years ago
amzn-mike 58e8233c2c Remove debug message 5 years ago
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 5 years ago
amzn-mike 0428189bed Increase test difficulty 5 years ago
amzn-mike 39789c30d8 Remove container OnAssetCanceled event 5 years ago
amzn-mike 35a47932eb Disable weak references and unit tests for them. 5 years ago
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 5 years ago
sharmajs-amzn 957d1360da
Custom UV Stream Names in assimp (#210) (#243)
* Custom UV Stream Names in assimp
https://jira.agscollab.com/browse/LYN-2506
5 years ago
Eric Phister 38f0203546
Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
5 years ago
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 5 years ago
Terry Michaels d680995074
Renamed several non-inclusive terms (#236) 5 years ago
greerdv 1fa5728655
Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
5 years ago
amzn-mike 3907ffc173 Add unit test 5 years ago
mbalfour bd23944531 Fix issues with rapid asset cancellation / reload:
* Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference.  This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it.  The method now detects this case and calls GetAsset(), which triggers a new load.
* AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset.  Now it returns false, to help ensure the container doesn't try to get reused.
* AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load.  They are no longer added, since they shouldn't be waiting for any dependent assets to load.  (This could cause incorrect warnings to print in some situations)
* AssetContainer was erroneously warning about removing assets from a missing waiting list.  The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without.
* AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it.
* AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it.  This prevents asset containers that are in the middle of cancellation from getting reused.
5 years ago
Benjamin Jillich ba324b8806
[LYN-3013] Github TQO Animation: MorphTarget has data integrity issue (#237)
* Added error reporting for data integrity issues for non-uniform motion data.
* The actual issue was a mismatch between the end times of the morph and the skeletal animations. They need to match in EMotionFX.
* The morph target animation exported a keyframe too much.
5 years ago
hultonha cc4d69f279 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 5 years ago
AMZN-AlexOteiza dbcb2f9916
Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
5 years ago
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 5 years ago
pereslav 57cbeaff0a Added a cmd argument support for custom cfg files 5 years ago
amzn-sean 0e803713bf Ragdoll now uses Add/Remove SimulatedBody
Addressed Minor Character PR feedback
5 years ago
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 5 years ago
pappeste 62564e68de Fixing hang when parameters are passed 5 years ago
jjjoness 012ab89a23 Changed Play Console to right of toolbar. 5 years ago
hultonha bfc4a3bb21 fix bug for setting SimpleMotion asset 5 years ago
igarri 0ebe6c6079 Setup Table model and Table view 5 years ago
michabr c66e2f4bcf
Initial phase of UI Canvas Editor rendering with Atom (#164)
* Move Draw2d.h to Include folder

* Initial phase of UI Canvas Editor rendering with Atom

* Simplify Draw2d by removing BeginDraw2d/EndDraw2d which is no longer needed

* Fix compile errors for non-unity builds
5 years ago
mnaumov 5f0e7f2cbc merge from main 5 years ago
rgba16f f750a491c8 remove mistakenly added .orig file 5 years ago
rgba16f 40a35b4e45 Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
rgba16f 96bbfb3ff0 Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim 5 years ago
daimini 67fa4a332b Change CreateLink to return the LinkId 5 years ago
daimini ca8d6f8818 Instantiate Prefab 5 years ago
Luis Sempé 8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
5 years ago
luissemp 49322b040b Fixed Lua IDE startup 5 years ago
cgalvan 7a6b0c16b7
Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
5 years ago
cgalvan 143c2516c6
Merge pull request #211 from aws-lumberyard-dev/cgalvan/FixEMFXDocking
[LYN-3137] Fixed EMFX floating dock widgets not responding to docking events.
5 years ago
Chris Galvan ee90a73744 [LYN-3105] Fixed missing include. 5 years ago
phistere d1067edd3a Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 5f8ffdfdc1 [LYN-3137] Fixed EMFX floating dock widgets not responding to docking events. 5 years ago
Aristo7 9e874ae2ed Merged main in 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
Esteban Papp 92c77dca11
LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
5 years ago
phistere 70b4938cff LYN-2524: Launch AP from SDK when not found in the executable directory 5 years ago
amzn-sean 743d6a511a
Merge pull request #192 from aws-lumberyard-dev/physx_character_create
Character controller now uses Add/Remove Simulated Body API
5 years ago
SergeyAMZN 0a09ab7c8e
Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
Merging current state of multiplayer pipeline to main
5 years ago
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 5 years ago
amzn-sean b0cb5a381b
Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
5 years ago
greerdv 62a3b7635b Merge branch 'main' into non-uniform-scale-mesh 5 years ago
sphrose bfa964a23e Moved TabWidget grab animation to mouse press to match fancy docking behavior, fixed missed mouse up cursor restore 5 years ago
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
5 years ago
Nicholas Van Sickle e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
5 years ago
rgba16f c01174d57f Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
AMZN-daimini 62bc7a66bb
Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
5 years ago
srikappa-amzn f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
5 years ago
nvsickle 4f9d7e3782 Simplify ResetInputChannels 5 years ago
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
5 years ago
nvsickle 7e2cbda2d3 Fix viewport display on new level creation 5 years ago
srikappa 78892c8d7e Improved a couple of comments 5 years ago
pereslav 465546a6e4 Merge branch 'main' into MultiplayerPipeline 5 years ago
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
Nicholas Van Sickle 68cc939c6d
Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
Fix debug font rendering & assert on game mode transition
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
Aristo7 c07c57ca2a Revert "Removed HLSL cry compilers and tools"
This reverts commit f8a72e5a04.
5 years ago
Aristo7 8410452067 Revert "Removing hlsl refs in cmake build files"
This reverts commit 7b42402b18.
5 years ago
Aristo7 2a59b7e0e6 Revert "Linux/mac hlsl header refs removed"
This reverts commit 6f33e1404e.
5 years ago
alexpete c2a6addf1f Integrating latest from github/TIF/Runtime 5 years ago
Aristo7 6f33e1404e Linux/mac hlsl header refs removed 5 years ago
rgba16f 9de6bdcf2b First pass to remove AtomShim
Removed CryRenderAtomShim folder from Gems/AtomLyIntegration/CMakeLists.txt
Set LOAD_LEGACY_RENDERER_FOR_EDITOR to false
5 years ago
Aristo7 7b42402b18 Removing hlsl refs in cmake build files 5 years ago
greerdv 2d1ba34f8c Merge branch 'main' into non-uniform-scale-mesh 5 years ago
greerdv 12cbba5fad adding test for Aabb::MultiplyByScale 5 years ago
sphrose b1d8330870 Review fixes. 5 years ago
Chris Galvan fbc69e5fd7 [LYN-3079] Removed IPickObjectCallback and edit tools that used it. 5 years ago
Aristo7 f8a72e5a04 Removed HLSL cry compilers and tools 5 years ago
cgalvan 22cfe18601
Merge pull request #140 from aws-lumberyard-dev/Editor/RemoveLegacyMaterialEditor
[LYN-3070] Removed legacy Material Editor.
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
greerdv cc937e0809 feedback from PR 5 years ago
greerdv fd8b42c45e Merge branch 'main' into non-uniform-scale-mesh 5 years ago
greerdv f0ae8056c8 feedback from PR 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
srikappa 967d182ccc Fixed a couple of typos 5 years ago
srikappa 8d94f45b19 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
nvsickle 6aabf2ee3d Don't attempt to render manipulators in game mode 5 years ago
nvsickle e2a7629993 Remove statistics rendering from EditorViewportWidget - it's wrong at the moment, and needs to be moved to a controller 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
nvsickle ebf41d2bdf Update code style 5 years ago
nvsickle d2fadcb0e3 Fix context menu handling in multi-viewport scenarios (the logic bugs here were many and nuanced, but we're narrowing in on something robust).
Specifically this:
-Ensures key/mouse up event propagation works across multiple viewports
-Ensures that mouse up events for manipulators only get delivered if there's a corresponding mouse down event
-Also tidies up the "are we done processing events this tick?" logic in ViewportManipulatorController
5 years ago
nvsickle 482e423ec9 Fix crash on default layout restore 5 years ago
nvsickle c05d4b44e4 Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues 5 years ago
srikappa 707f7cb6ce Added some comments 5 years ago
srikappa 8bc2998d82 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 65b2d9de1b Added couple of helper functions 5 years ago
Chris Galvan 4fb407e130 [LYN-3070] Removed legacy Material Editor. 5 years ago
Olex Lozitskiy 08ed726faa Deleted CrySCompileServer 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
srikappa f3ff5ec886 Add helper method for adding link in CreatePrefab 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
jackalbe a7f5462f3d
Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
5 years ago
srikappa 889158e3a9 A couple of minor fixes 5 years ago
lumberyard-employee-dm d6788996fc
Merge pull request #130 from aws-lumberyard-dev/LYN-3055
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
5 years ago
AMZN-stankowi 4c2260af97
Lyn 2651 rebased to main (#74)
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
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
sphrose 2dbd9e4a05 Changed to use direct line drawing rather than adding svg. 5 years ago
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 5 years ago
jjjoness 1c151e6a75 Merge branch 'main' into LYN-1932 5 years ago
greerdv e497b7ac33 Merge branch 'main' into non-uniform-scale-mesh 5 years ago
jjjoness 7e85cdd045 Part 1 of changing colors to O3DE. 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
Nicholas Van Sickle 944dab2ecb
Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
5 years ago
lumberyard-employee-dm 1e80012df1
Merge pull request #79 from aws-lumberyard-dev/LYN-2461-Bootstrap
Removed AssetProcessor Settings from the bootstrap.cfg file as they get overridden by the Engine/Registry/bootstrap.setreg file and is therefore a "trap" to set them.
Users will not see any functionality change from modifiying those values.
5 years ago
chiyenteng 41db22be3d
[CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#103)
* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85)
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
nvsickle a519bd6d0c Fix EditorViewportWidget stealing keyboard focus
grabKeyboard was used by CRenderViewport to ensure it received some events, but that logic is no longer needed and the corresponding release was removed. This just removes grabKeyboard entirely - eventually all input event logic will be removed as well.
5 years ago
srikappa 22d6e1ec0d Modularized undo instannce update undo operation and enabled setting container entity to be selected 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
jackalbe 085aa78ec9 Merge branch 'main' into sceneapi_script_regression 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
amzn-sean beafc80939 Fixed entities not being deselected when entering game mode in editor.
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
jira: LYN-2998
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
jjjoness 0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
Lyn 1901
5 years ago
karlberg a59e212134 Merge branch 'main' into MultiplayerPipeline 5 years ago
hasareej f6fc8f95a9 Fixed random button highlights & toolbar order. 5 years ago
sphrose 2a339edc4e [LY-105687]
Jira: LY-105687
https://jira.agscollab.com/browse/LY-105687

Renamed svg
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
hasareej 969f94ffb5 Initial pass of ViewportUiSwitcher. 5 years ago
sphrose fece27b1b0 Merge branch 'main' into LY-113714 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
srikappa 1cf2e11cd3 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 0b29e4ffea Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 778d60bd0c Replaced unique instance queue with checks in template to instance mapper 5 years ago
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 5 years ago
karlberg 0ce18593d2 Merging latest main 5 years ago
kberg-amzn c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
5 years ago
pereslav 4962218d29 Refactored root spawnable instantiation, added selective instantiation of root spawnable entities 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
pereslav a5fdbddeda Merged MultiplayerPipeline from CodeCommit 5 years ago
Nicholas Van Sickle 2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
5 years ago
jackalbe 0997a2cfbf Merge branch 'main' into sceneapi_script_regression 5 years ago
jackalbe 80f8c0f68b behavior context class SceneGraph::NodeIndex -> "NodeIndex" 5 years ago
srikappa c63f09adce Merge branch 'main' into Prefab/CreatePrefab 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
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 5 years ago
jjjoness 11081aeddd Changed logo to O3DE 5 years ago
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 5 years ago
greerdv 4c582a2b0a Merge branch 'main' into non-uniform-scale-mesh 5 years ago
greerdv d8169e08fb merging from main 5 years ago
srikappa b6492121ca Merge branch 'main' into Prefab/CreatePrefab 5 years ago
lumberyard-employee-dm 8019312b35
Merge pull request #28 from aws-lumberyard-dev/LYN-2883
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
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
srikappa a371edd07f Initial commit of CreatePrefab work 5 years ago
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 5 years ago
SJ 03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295
[iOS] Fix build issues
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
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 5 years ago
amzn-sj 7609248c49 Fix build errors 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
Terry Michaels 78e5a069fa
Removed Cry branding on error messages (#41) 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
nvsickle 97d0f42671 Enable EditorViewportWidget by default 5 years ago
greerdv 217009de2b adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation 5 years ago
Mike Balfour efe5715e68
Merge branch 'main' into mbalfour/spec-6178 5 years ago
sphrose a947007861 Darken line 5 years ago
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 5 years ago
greerdv 2fb2813b48 updating atom mesh component to support non-uniform scale component 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
karlberg ca3df5d6c8 Various bug fixes to get entity replication working 5 years ago
mcgarrah 957945f809 Clarified the error message that is output when the project.json is not found 5 years ago
mcgarrah 92b8e590ce Added better error message around when the Unified Launcher target for a Project cannot be configured due to issues querying the project name from the provided project path 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
mbalfour d7f10e9d60 [LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets.
I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens:
* EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback.
* Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById

This should solve the lock inversion on both sides of the problem:
* UpdateDebugStatus now takes in a const ref instead of a copy, so the copy constructor isn't called.
* EditorSurfaceDataSystemComponent::OnCatalogLoaded is rewritten to call GetAsset outside of the enumeration call.

As a bonus, this also removes the blocking load call.  The rest of the code already supports asynchronous refreshes as the list assets are added / modified / removed, so this code was changed to leverage the asynchronous refreshes as well.
5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
Alex Peterson 921eb742d4
Merge branch 'main' into github/staging 5 years ago
sphrose a71a5746cc [LY-113714]
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
5 years ago
jackalbe 442e15a414 Merge branch 'main' into sceneapi_script_autotest 5 years ago
hultonha 063b8a6d54 update some reinterpret_cast calls to static_cast 5 years ago
hultonha 8846e159e0 Add new ByteStream serializer to support storing binary data in json (for now) 5 years ago
greerdv 2313471ab9 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs 5 years ago
jackalbe 63c97d6d3c Merge branch 'main' into sceneapi_script_autotest 5 years ago
Nicholas Van Sickle 22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes 5 years ago
jackalbe 77d06ecef7 ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename

Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
alexpete b8e508c2ee Cherrypicking MeshCompiler fix 5 years ago
greerdv 8ee92978f4 setting max value for scale 5 years ago
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 5 years ago
nvsickle 1c47a26494 Clarify the reason for the default view juggling in SetAsActiveViewport 5 years ago
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 5 years ago
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
5 years ago
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago