643c5c2f82
Removed AZ_ENABLE_TRACING from Archive::GetPakPriority ( #4741 )
...
The AZ_ENABLE_TRACING check was preventing the Archive System from using the sys_PakPriority value set from the CVar system
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
4899309b6a
Connect Adding and Removal of Gem Repo UI to CLI ( #4729 )
...
* Connect Adding and Removal of Gem Repo UI to CLI
Signed-off-by: nggieber <nggieber@amazon.com>
* Addressed PR feedback
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
d8b47a1448
More fixes
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
a3c3de4a76
AR fixes
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
f6945f1334
Fixed Viewport Interaction
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
6050d2e16e
merge develop
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
d8a453f826
changed names
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
c93bd87127
Added default camera position to viewport settings
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
026919c11b
Set View in viewport fixed
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
363bc33fed
Fix broken function name.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
cf41ff020a
Fix merge conflicts.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
f0e6841ca8
Fix issues with invalid Outliner entries
...
The EntityOutlinerListModel was violating the QAbstractItemModel contract in a few cases, as reported by `QAbstractItemModelTester`. The important ones causing issues were:
- Entry order was not guaranteed, leading to model indices pointing at invalid data
- Parent/child relationships could be temporarily invalid due to a change I made in EditorEntityModel::RemoveEntity to try to avoid an unnecessary reparent operation - as it turned out, the parent/child data was being cached even for recreated entities and not clearing child data could cause issues
- `EntityOutlinerListModel::ProcessEntityUpdates` was emitting data changed between two indices that didn't necessarily share a parent, which is [undefined behavior](https://doc.qt.io/qt-5/qabstractitemmodel.html#dataChanged )
The other reported issues (that weren't really causing issues with `QTreeView`) were:
- The root index had flags other than `Qt::ItemIsDropEnabled`
- `rowCount` showed all columns as having children
- `parent` showed indices as being parented to a non-0 column
This change introduces fixes for the above issues, namely:
- Reverts my change to `EditorEntityModel::RemoveEntity` to ensure we don't have invalid parent/child references sitting in the cache
- Ensures `EditorEntityModelEntry` child ordering is guaranteed sorted by EntityId, to prevent the `EntityOutlinerListModel` from having indices pointed at invalid data*.
- Fixes various model sanity issues, such as `rowCount` being 0 for indices with a non-0 column
Two unit tests were added to reproduce the invalid behavior and validate the fix: TestCreateFlatHierarchyUndoAndRedoWorks and TestCreateNestedHierarchyUndoAndRedoWorks
This change focuses on correctness over performance. My subjective in-Editor outliner experience is about the same, but it may be worthwhile to expand the test coverage with a benchmarking suite to look into areas for optimization.
*As a rough illustration of the previous child ordering behavior, consider the following entity hierarchy:
```
Root (EID 9999)
|_ Child1 (EID 2)
|_ Child2 (EID 3)
|_ Child3 (EID 4)
```
With an representations like the following pseudocode:
```
// EditorEntityModel representation
EditorEntityModelEntry root;
root.children[0] = 2;
root.children[1] = 3;
root.children[2] = 4;
// EditorOutlinerListModel representation
// row, column, user data (64 bit uint)
child1 = QModelIndex(0, 0, 2)
child2 = QModelIndex(1, 0, 3)
child3 = QModelIndex(2, 0, 4)
```
When removing a child, the `EditorEntityModel` used to do roughly the following:
```
// Swap and pop the last child
int indexToRemove = 0;
swap(root.children[indexToRemove], root.children[root.children.size() - 1]);
root.children.resize(root.children.size() - 1);
model.notifyRemoved(root, indexToRemove); // model removes the row indicated
// Leading to this EditorEntityModel state
root.children[0] = 4;
root.children[1] = 3;
// And this EntityOutlinerListModel state, note that the row indices are swapped from the indices in the backing storage
child2 = QModelIndex(0, 0, 3)
child3 = QModelIndex(1, 0, 4)
```
A QModelIndex having a row that doesn't match its underlying data is undefined behavior, and was the source of an intermittent crash in our `QSortFilterProxyModel` as subsequent updates to the wrong row led to an invalid proxy state.
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
b58ae15d83
Merge pull request #4595 from yaakuro/yaakuro-development-patch-1
...
[GNU/Linux] Add basic mouse device implementation and fullscreen handling to GNU/…
4 years ago
4c733d3f4c
Add basic mouse device implementation and fullscreen handling to GNU/Linux.
...
Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
dd47e1aa4e
Add EditorPrefabComponent to procedural prefab container entity ( #4727 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
f6e53241a1
Add test demonstrating size savings of DeltaSerializer
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
b5739f6918
Merge branch 'development' of https://github.com/o3de/o3de into mp_deltaserializer_perf
4 years ago
721d92b4f9
adding exception handling for tests that are not going through AzTestRunner
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
244e1b8e16
add a switch to enable/disable cursor lock (default off)
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
8829ceb0f8
Merge branch 'development' into issues/exception_handling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
4 years ago
7651ba621c
Remove old "Integ" functionality from tests ( #4688 )
...
* fixes some warnings for newer versions of VS2022
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* more warning fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* remove integ test filters from AzTest
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* remove integ test handling from AzTestRunner
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* changes integ tests of gridmate to regular tests and disables failing ones
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* removes the Integ from the EMotionFX tests, but leaves them disabled since they are failing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* removes the Integ from the HttpRequestor tests and disables it since is not passing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* changing integ tests for DISABLED, these ones are using files that are not there
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* fixes linux build
gridmate tests that were Integ are now disabled
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* fixes linux warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
bd224b3a5c
update bus implementation for integration tests
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
67ccc438c4
remove redundant word from comment
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
2158c8cfdf
Merge branch 'development' into hultonha_LYN-7394_focus_cursor
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
c955880d9b
ensure cursor position is mapped to the right widget space
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
9aafc51ff5
Add first pass version of click feedback while in Focus Mode ( #4693 )
...
* add first pass version of click feedback while in Focus Mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add more WIP experimental feedback ideas for Focus Mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small updates after UX feedback to improve focus mode feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* refactor and improve invalid click feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* update comments from review feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
3d4c060fb5
updates to improve cursor lock behavior
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
87533d80c1
Delay propagation for all template updates in detach prefab workflow ( #4707 )
...
* Delay propagation for all template updates in detach prefab workflow
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
* Some minor changes to the PrefabUndo constructor
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
969a55170e
Procedural Prefabs: Entity parenting fixes ( #4669 )
...
* Parent top level entities to container entity when creating prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Add to_json method to PythonProxyObject to allow serializing any AZ serialializable type
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Update scene_mesh_to_prefab.py to parent entities in a chain
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Remove redundant eval
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Improve error handling in ToJson
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Add maybe_unused for commonRoot since it's not used
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
1d6542c274
initial wip code to update cursor states
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
716c561cb7
bugfix: correct broken layout when searching global preferences ( #4689 )
...
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
5c8a1b573e
Add support for border in Focus Mode ( #4692 )
...
* restore component mode border
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add viewport border for focus mode, remove dead code in ObjectManager
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* ensure the focus mode border is restored when leaving component mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* update FocusModeNotification call order after merge from development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
396530b274
Address PR feedback.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
606de5427b
Fixes debug console autocomplete issues ( #4223 )
...
* Fixed a crash caused by large autocomplete results in the debug console. A fixed vector was growing beyond its allocated size.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
* Fixes printing duplicate autocomplete results, caused by looping over multiple CVARs registered with the same name. Also adds an erase to prevent undefined behavior.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
* Adds a test case for autocomplete duplication in the event of multiple cvars existing under the same name. Two matching cvars are created and checked against the number of matches produced by autocomplete.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
* Added two safety checks and made a pointer const as per reviewer feedback.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
4 years ago
f7eb906516
Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings ( #4660 )
...
* removed references to maxNumberOfItemsShownInSearch
Signed-off-by: igarri <igarri@amazon.com>
* Move Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings
Signed-off-by: igarri <igarri@amazon.com>
* Fixed extra spaces
Signed-off-by: igarri <igarri@amazon.com>
* Code review feedback
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
3b9762142a
Triangle Mesh with a Kinematic PhysX Rigid Body warns the user instead of error. ( #4657 )
...
Using triangle mesh with a kinematic rigid body is allowed, but the options "Compute COM", "Compute Mass" and "Compute Inertia" are not supported by PhysX and an error in logged that default values for COM, Mass and Inertia will be used. Now this situation is captured and an explanatory warning is used instead.
- Improved RigidBody::UpdateMassProperties function to apply the same logic in the treatment of shapes for all three parameters: COM, Mass and Inertia.
- Improved UpdateMassProperties function by using references for the override parameters instead of pointers.
- Improved function that computes the Center of Mass UpdateCenterOfMass (renamed from UpdateComputedCenterOfMass), to include the same shapes that the compute mass and inertia functions in physx updateMassAndInertia, which is to include all shapes if includeAllShapesInMassCalculation is true, else include only the shapes with eSIMULATION_SHAPE flag.
- Removed unused private function RigidBody::ComputeInertia.
- Added unit test to check when the warnings are fired correctly when COM, Mass or Inertia are asked to be computed on a rigid body with triangle mesh shapes.
- Improved MassComputeFixture tests by not only using Box shape, but also sphere and capture, plus improved the PossibleMassComputeFlags parameters to include all possible variations of the MassComputeFlags flags.
Fixes #3322
Fixes #3979
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
3040f74c41
Merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
a6e7a81b79
More fixes to migration, plus some quality of life fixes to TimeoutQueue to allow lambda based handlers and a quick fix to OctreeSystemComponent to more gracefully handle enumerate calls that lie outside the vis system bounds
...
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
17b5312ce5
PR comments
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
8a1d59934d
Remove some includes
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
b295e674fc
Update DeltaSerializer and tests with delta'd vectors
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
bcf3980de6
LYN-7191 + LYN-7194 | Adjust Prefab operations to conform with Prefab Focus/Edit workflows. ( #4684 )
...
* Disable ability to delete container entity of focused prefab. Default entity creation to parent to container entity of focused prefab.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Disable detach and duplicate operations for the container of the focused prefab. Update the context menu accordingly.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix spacing
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Address minor issues from PR (error message, optimization in RetrieveAndSortPrefabEntitiesAndInstances).
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
c5da705b46
fixes typo
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
a6c506c121
some warning fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
16a7b896ee
Fix to prevent using legacy windows based logic to create a Path on Linx ( #4704 )
...
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
07a52d2dfc
Merge branch 'development' into issues/exception_handling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
04a6744765
enables our exception handling and disables gtest's
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
e078580f2c
Changes GTEST_OS_SUPPORTS_DEATH_TEST to the right define which is GTEST_HAS_DEATH_TEST
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
3e729638b5
adds unhandled exception test
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
88cc3c774a
adds stack trace conversion from native
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
aabb519452
Merge pull request #4565 from aws-lumberyard-dev/mnaumov/LYN-7227
...
Fixing crash creating new level when simulate mode is on
4 years ago
63ece6e3ca
Change Asset Hint fixup code to not request assets be queued for load. ( #4664 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
e36be1ee95
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-7227
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
4d4f99767f
Merge pull request #4594 from pollend/chore/update-IntersectSegment-cleanup
...
Clean-up IntersectSegment and improve documentation
4 years ago
8d7b03c859
Implement open in file browser for Linux ( #4677 )
...
* Add support to open folder browser for Linux
* PAL'ified DesktopUtilities.cpp
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
5967b419a2
Only enable the Keyboard device in the XcbKeyboard unit tests ( #4682 )
...
This prevents other input devices from interfering with the expected calls
that the Keyboard tests should make.
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
d12c6beb40
Added Default Camera Location to the Viewport Setting Registry
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
5a204dc80b
chore: remove equality from boolean expression
...
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
6823ea2274
Add GameLift matchmaking backfill server support ( #4622 )
...
* Add GameLift matchmaking backfill server support
Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
ba7ff3c8e8
Add Network Input unit tests
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
65e124809c
Merge branch 'development' of https://github.com/o3de/o3de into mp_deltaserializer_perf
4 years ago
80dcc34e6f
Add "Registry" folders as scan folders ( #4583 )
...
* Add "Registry" folders as scan folders
For projects, Gems, and Engine, add the "Registry" folder as scan
folders.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Change params for adding scan folder
Also add trailing newlines to setreg files.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Adjust the priority order for project templates
Scan folder orders were way too high, they should be very low to become
highest priority order.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Removes change of default assets folder to Assets
Need to revert this change so it can be done separately.
Renamed the scan folder to 'Project/Assets' to prep for Assets folder
change later on.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Update platform configuration test to pass
Adjusted expectation of scan folder count from 1 to 2 per Gem for
'Assets' and 'Registry' now.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
6a2020ec6c
fixes some warnings for newer versions of VS2022
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
f7e2d07a4b
LYN-7333 | Fix multiple selection by dragging to take focus mode and containers into account. ( #4620 )
...
* Change FocusModeNotificationBus's OnEditorFocusChanged arguments to also pass the previous focus root entity id.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Add focus mode and container entity states to the visibility cache for the viewport. Use that data to correctly select entities when a rect is dragged on the viewport.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor code adjustments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor fixes and optimizations
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
5ba30f9a37
Update tiff to the new package revision (fixes IOS TIFF package) ( #4638 )
...
The new tiff package works for all platforms, including android and IOS, which had issues before.
Android - was missing tiff.h
ios - wrong minimum ios revision
4 years ago
3c3cde99be
LYN-7189 | Outliner - Disable context menu if right clicking on disabled entity ( #4651 )
...
* Don't allow right clicking on a non selectable entity in the Outliner
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Also check that the index is valid to still allow the right click context menu to appear on empty areas of the widget.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Change if check to a more readable bool.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
fcd6360c26
Merge remote-tracking branch 'upstream/development' into nvsickle/OutlinerDuplicateEntryFixes
4 years ago
29b62c7b84
Various updates to get pak builds working ( #4552 )
...
* Various updates to get pak builds working
-Fix basing config file merges off engine root.
-Merge command-line in relelase to make sure they override defaults.
-Fix nullptrs.
-Exclude more paths from being sent to bootstrap setreg.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Reverting a change that caused some test failures.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Change tabs to spaces
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
10ab1a369f
Adds Download status info UI to Gem Catalog ( #4602 )
...
* Adds Download status info UI to Gem Catalog
Signed-off-by: nggieber <nggieber@amazon.com>
* Removed test code
Signed-off-by: nggieber <nggieber@amazon.com>
* Remove unused variable
Signed-off-by: nggieber <nggieber@amazon.com>
* Addressed PR feedback
Signed-off-by: nggieber <nggieber@amazon.com>
* Fixed Open3DEngine spelling
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
da3a39a6a0
LYN-7121 | Focus Mode - Make editing a prefab an undoable operation ( #4582 )
...
* Refactor the PrefabFocusInterface to differentiate between Public and Internal functions. Introduce PrefabFocusUndo nodes to allow undoing Prefab Edit operations.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix selection code to avoid warning message
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Removed changed property from PrefabFocusUndo node
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Switch from size == 0 to empty in EntityOutlinerWidget::OnSelectionChanged
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* condense if check on Prefab Edit context menu item setup
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Correct interface usage in PrefabIntegrationManager (interface was renamed to public)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Remove rej file that was included by mistake
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix missing interface initialization in PrefabFocusTests
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
f9740ae25c
Remove undefined behavior.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
06910a7c82
Add API comments.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
3c2c52910f
Merge branch 'development' into LYN-5265_state_tracker_impl
4 years ago
2e7c8a0fd2
Double click entity in prefab to enter FocusMode.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
65f3f26339
Fix issue with activating/deactivating FocusMode.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
97e9f4dc7d
[LYN-6838] Various Monolithic shutdown fixes for the GameLauncher ( #4564 )
...
* Added a stateless allocator which uses AZ_OS_MALLOC/AZ_OS_FREE to
allocate memory for objects in static memory.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated the Maestro and LyShine Anim Nodes to use the
stateless_allocator for its static containers.
This prevents crashes in static de-init due to the SystemAllocator being
destroyed at that poitn
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated the EBus AllocatorType to use the EBusEnvironmentAllocator
Because the EBus Context resides in static memory, the SystemAllocator
lifetime is shorter than the EBus Context.
This results in shutdown crashes in monolithic builds due to all of the
gem modules being linked in as static libraries and the EBus context now
destructing at the point of the executable static de-init, instead of
the module de-init, where the SystemAllocator would still be around.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed an assortment of shutdown issues due to deleting objects after
AZ allocators are no longer available
Fixed the NameDictionary IsReady() function to not assert when the
dictionary when invoked after the environment variable it was stored in
was destroyed.
Updated the NameData destructor to check that the NameDictionary
IsReady() before attempting to remove itself from the dictionary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed NameDictionary destory workflow, to reset the EnvironmentVariable
instance
Updated the EnvironmentVariable instance to store the NameDictionary as a
value.
Added a rvalue reference `Set` function overload to the
EnvironmentVariable class to support move only types.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Clang 6.0.0 build fixes
The C++17 std::launder feature isn't available in that compiler version
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
48a74ca93d
Remove clearFocus from EditorTransformComponentSelection duplicate Entity ( #4571 )
...
* remove clearFocus from EditorTransformComponentSelection duplicate entity
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* remove extra unneeded calls to RequestWrite
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* update PrefabPublicHandler to use SetSelectedEntities
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
63da5847c1
chore: correct documentation and correct method return.
...
- change return for IntersectSegmentTriangleCCW to bool
- change return for IntersectSegmentTriangle to bool
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
ccd60513f1
Fix prefab close dialog Editor crash on Linux ( #4623 )
...
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
1cb26a31f8
LYN-7195 + LYN-7185 + LYN-5301 | Hide viewport helpers for entities out of focus + selection shortcut adjustments ( #4615 )
...
* Light refactoring of selection logic. Only draw helpers for selectable entities according to Editor Focus Mode and Container Entity systems.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* When Escape is pressed, clear the Prefab Focus.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Alter Ctrl+A and Ctrl+Shift+I to take editor focus mode and container entity behaviors into account.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Remove redundant comments and reduce footprint of tests.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce loop protection, as GetParentId is known to loop in some situations possibly causing timeouts.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
2b72f7b100
Merge pull request #4642 from aws-lumberyard-dev/Atom/guthadam/overriding_property_asset_ctrl_thumbnails
...
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail image
4 years ago
70636572ff
Fix casing of editor_xml filenames to match casing in .ly files ( #4640 )
...
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
80db67e90a
Remove many unused variables and unused setting files ( #4607 )
...
* Remove many unused variables and unused setting files
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Remove a few more dead config vars
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* fix android test_ConfigureSettings_DefaultValues_SetsValues
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
f34811c373
Merge pull request #4639 from aws-lumberyard-dev/Atom/guthadam/thumbnail_bus_passes_const_qpixmap
...
Updated thumbnail notification bus to use const QPixmap&
4 years ago
4f539b0eb7
fixed comments
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
f7e08d1c4b
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail images
...
• PropertyAssetCtrl was previously extended with ThumbnailPropertyCtrl to optionally display a thumbnail and floating zoomed in preview of the selected asset.
• This change allows overriding the image that comes from the thumbnail system with a custom image provided as an attribute. The custom image can be specified as either a file path or a buffer containing a serialized QPixmap.
• This will be used by the material system in the editor to provide a dynamically rendered image of the material with property overrides applied so that the image will update as the user customizes their material.
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
6318247b3d
LYN-7279 + LYN-7192 | Focus Mode - Container unit tests + Clear container entity open state on new level load ( #4558 )
...
* Change SetContainerOpenState to SetContainerOpen.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce Clear function to avoid retaining all lingering open states when switching contexts/loading a new level.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor FocusMode fixture refactors to support ContainerEntity tests
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce tests for the ContainerEntity API
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Add include to fix issue with EntityContextId not being defined.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor comment fixes. Moved environment clear functions to TearDown function of test fixture.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Use default editor context id in ContainerEntitySystemComponent
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Revert previous change as the EditorEntityContextId would not be initialized correctly on ContainerEntitySystemComponent Activate.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
190cf92f9d
Merge pull request #4637 from aws-lumberyard-dev/cgalvan/FixPythonScriptsTreeItems
...
Fixed logic error causing Python Scripts tree items to only show extension intead of filename.
4 years ago
a273899f1b
Add DeltaSerializer unit tests
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
8487373b0c
Updated thumbnail notification bus to use const QPixmap&
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
c355c162ab
Merge pull request #4486 from aws-lumberyard-dev/Prism/ShowRepoList
...
repo.jsons can be listed and and access through CLI and is Integrated with Project Manager
4 years ago
94c938496e
Fixed logic error causing Python Scripts tree items to only show extension intead of filename.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
736c2fe27b
[O3DE][GameLift] Add client side change for starting and stopping matchmaking ( #4536 )
...
* [O3DE][GameLift] Add client side change for starting and stopping matchmaking
Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
8cf736b999
Added default Camera position a Sensible Default
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
da190abbab
Fixed Camera Locations
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
7ca85460f7
Bug Fix: Improve display of Viewport UI ( #4596 )
...
- always show controls on top of main ui
- Tool window does not show visually in toolbar
issue: https://github.com/o3de/o3de/issues/4380
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
02d8596d87
chore: improject documentation for IntersectSegment
...
- change return of IntersectRayDisk to bool
- change return of IntersectRayBox to bool
- move [out] after @param
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
7af448c9b7
PR feedback
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
a95c609bd8
[development] Migrate Atom CPU timing stats tracking to use global stats profiler ( #4549 )
...
This change is a preparation for moving the CPU profiler/visualization system from Atom into its own Gem by removing the dependency on local time tracking object AZ::RHI::CpuTimingStatistics
Full changes include:
- Removed all usage of AZ::RHI::CpuTimingStatistics
-- Replaced with pushing to AZ::Statistics::StatisticalProfilerProxy global instance
- Promoted VariableTimer from AZ::RHI to AZ::Debug
- Removed now unused CpuTimingStatistics.h
Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
ef3470b0a9
Dependency confirmation screen and URL display fix
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
3698c3c3a7
Merge branch 'development' into Prism/ShowRepoList
4 years ago
189aa5f3ac
Disable the creation of the UserSettings.xml file in Xcb tests ( #4593 )
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
5c859cb134
Fix camera drift issues ( #4576 )
...
* remove some unused code in RenderViewportWidget and make viewing devicePixelRatioF easier
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* updates to how cursor positions are calculate to handle the viewport widget moving
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* remove optional for previous position
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add test to capture error with moving the widget
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* minor comment updates before publishing PR
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
3b89f7e1cd
{lyn7283} added test for assetHint Json Serialzier callback logic ( #4586 )
...
* {lyn7283} adding unit test for the assetHint Json Serialzier callback logic
AssetTracker_Callback_Works will regress the functionality
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* clean up of the jsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
2d7dfe5047
Increase the max time in the iOS run loop from DBL_EPSILON to one millisecond to address issue where the virtual keyboard is sluggish. ( #4580 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
61533f68bf
Merge pull request #4522 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
...
LYN-7122: Remove redundant editor mode notifications.
4 years ago
1c3b293cd3
fix comments replace /** with //!
...
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
3ef24d3a05
Header fix.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
e26d1f9ec5
Linux non-unity header fix (again).
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
6c8441713d
Fix another missing header for Linux non-unity.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
9baf76beab
Add missing header for non-unity builds on Linux.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
cd6fc66322
Merge pull request #4575 from aws-lumberyard-dev/triangle-mesh-warning
...
small improvements to triangle mesh rigid body warning
4 years ago
b91d503a82
Add AZStd::lerp math function, based on C++20 ( #3468 )
...
* Add AZStd::lerp math function, based on c++20
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Add unit test for AZStd::lerp, based on libc++ ones
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* written a reduced set of lerp tests, but now the license is correct
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Update Code/Framework/AzCore/AzCore/std/math.h
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Update Code/Framework/AzCore/Tests/AZStd/Math.cpp
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* fix the github suggestion merge
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Copy some AZ::Lerp tests to std::lerp test suite + clang-format
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Cleanup lerp test cases
Remove comments that suggested very heavy tests that required things like `for every t1..`
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix unit test compilation issues
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* fix whitespace issue
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Use `TypeParam` in TYPED_TEST
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Remove unneeded new-lines
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* remove unused infinity
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
622a9bc009
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
1cdb34326b
Merge branch 'development' into LYN-5265_state_tracker_impl
4 years ago
afa8bb9226
chore: update intersect and improve documentation
...
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
7b1dd01d1d
Implemented a deferred LoadLevel queue for the SpawnableLevelSystem ( #4561 )
...
* Moved the SettingsRegistryTests.cpp and
SettingsRegistryMergeUtilsTests.cpp to the Settings folder
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Implemented a deferred level load queue, that allows the
SpawnableLevelSystem to re-run the last LoadLevel command that occured
before it was constructed.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Added SettingsRegistryVisitorUtils to reduce Array and Object visitor
boilerplate.
The VisitArray and VisitObject functions allows iteration over each
element of array and object respectively via a callback.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed the queuing logic for levels that attempt to load before the SpawnableLevelSystem is available
Only the last level name that could not load is stored off and deferred until the SpawnableLevelsystem is created.
Made the FieldVisitor AggregateTypes constructor protected and added a comment specifying the expected values.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Bring in the SettingsRegistry::Visitor::Visit functions into scope to fix MSVC compilation errors.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Changed the list of supported SettingsRegistry types to visit to an enum to constrain the values to Array and/or Object.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
e4d3ab118c
Console changes: Added a new SettingsRegistry root key for executing ( #4567 )
...
console commands.
The new key is "/O3DE/Autoexec/ConsoleCommands" and the only difference
with the "/Amazon/AzCore/Runtime/ConosleCommands" key is that it isn't
excluded by the SettingsRegistryBuilder.
Due to not being excluded by the SettingsRegistryBuilder this key can be
used to forward console commands to the aggregate
`bootstrap.game.<config>.<platform>.setreg` files.
For GameLauncher specific console commands it is recommend to be put them in
.setreg file that uses the "game" specialization, such as
"autoexec.game.setreg".
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
b7c2401056
Added a ThreadDispatch Policy to the EBus code ( #4405 )
...
* Added a ThreadDispatch Policy to the EBus code
The ThreadDispatch Policy can be configured by authors of an EBusTraits to
invoke a callback function after an EBus has finished it's dispatching
mechanism on a specific thread.
It takes into account recursive calls as well and will only invoke the
PostDispatch callback after all callstack entries for the current thread
are cleared.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Clang build fix
The Traits type is dependent on the template parameter, therefore the compiler needs to be told that the ThreadDispatchPolicy is a type and not a value.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed DispatchLockGuard cxall in the TerrainWorldRendererComponent.cpp
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Added EBusTrait for configuring the DispatchLockGuard
Removed the ThreadPolicy trait, now that the DispatchLockGuard for the
EBus Context can be configured.
Used the DispatchLockGuard template along with the
IsInDispatchThisThread function to determine when an EBus has finished
dispatching on thread and released it's Context Mutex.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Tweaked comment format for the IsInDispatch function
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed explicit GetContext call from ThreadDispatchTestBus.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Clang EBus Test fix for DispatchLockGuard trait
Due to the clang compiler evalating constants within templates at the time of declaration, the LocklessDispatch value supplied to the template was always false resulting in the LocklessDispatch feature always locking.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
73f8537030
Fix Issue saving new assets in Asset Editor on Linux ( #4537 )
...
* Add helper function to apply a selected file filter from a file dialog to the result filename if needed
* Add platform traits to restrict the use of the helper function on platforms that need to apply it
* Fix building of file filters of multiple extensions for a file type
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
c562f0a807
small improvements to triangle mesh rigid body warning
...
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
00b938b6a7
Merge pull request #4212 from ppinfel/component-doc-links
...
Fixes various component's help URL links to correct o3de.org page
4 years ago
dcadfe6e1f
Feature json assetloading assethints ( #4554 )
...
* capture assets using SerializedAssetTracker in LoadInstanceFromPrefabDom()
assign assets using asset hints where the asset ID is not valid
switch up SerializedAssetTracker to store pointers instead of copies of Asset<>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* PoC for the AssetFixUp strategy
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* clean up of PoC
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
591854c384
Edit help menu lua documentation link ( #4520 )
4 years ago
f43b3b9fbe
Fixing crash creating new level when simulate mode is on
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
e0a1164a92
Merge pull request #4424 from aws-lumberyard-dev/rgba16f/AZJobToIdle
...
Move Job system towards being used for Idle tasks
4 years ago
e64b9d3536
ATOM-16320 Remove PVRTC and ETC compressor ( #4557 )
...
Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
4b92aa34b7
Updated with PR feedback. Created a common function to calculate the number of worker threads.
...
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
863a7c8382
Address PR comments.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
a2c16fa24f
adjust the default number of worker threads created by the TaskGraph & Job systems
...
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
d1947c68c9
Added extra output and callstack information for improving debugging automated tests ( #4528 )
...
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
4 years ago
3d1ec83f78
Update naming to CameraInput types ( #4527 )
...
* rename public facing Pivot cameras to Orbit - previous rename was a mistake
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* some more comment and naming updates to improve camera documentation
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
3f2881ea46
Simplify viewport interaction model reset functionality ( #4524 )
...
* simplify entity reset functionality
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* remove reference to removed shortcuts
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
6c4e16eab8
Merge pull request #4512 from aws-lumberyard-dev/burelc/xcbInputTextEvents
...
Generate text input events during XCB key press handling
4 years ago
8668d8b2fe
[XCB] Avoid emitting text events when a key press does not generate text
...
Many keys will generate key press events but return an empty string from
`xkb_state_key_get_utf8`, like modifier keys, arrow keys, function keys,
etc. This checks if the string retrieved from such a key press is empty
before emitting an associated text event for it, to avoid notifying a
potentially large number of listeners about an empty string.
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
3e0535e211
[XCB] Add tests to cover text events from key presses
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
397fd79b70
Reworking DeltaSerializer to no longer require string based hashes
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
b1b52c201f
[XCB] Add test fixtures for xcb connection and keyboard setup
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
ba48426750
[XCB] Generate raw text events as well as key press events
...
Fixes LYN-6997
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
ee5ab1770b
[XCB] Respond to keyboard state changes
...
This allows the keyboard to correctly store modifier keys, as the keyboard
state changes.
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
4f51b53558
[GameLift][FlexMatch] Update session interface for clients to make matchmaking requests ( #4450 )
...
* [GameLift][FlexMatch] Update session interface for clients to make matchmaking requests
Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
8928c90cc4
Makes Editor depend on LuaIDE ( #4514 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
49dd0d6331
Update with PR feedback. Use direct ratio on hardware concurrency with a set min and an a number excluded for O3DE threads
...
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
a40af98394
Add focus camera and custom camera input ( #4493 )
...
* add focus camera and custom camera input
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* very minor tidy before publishing PR
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small updates after PR feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
5cee9b43b7
Squashed commit of Procedural Prefab work ( #4481 )
...
* Squashed commit of the following:
commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585bhttps://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs
commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 18:03:38 2021 -0500
fixing non-unity build
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 15:43:50 2021 -0500
adding header for validation
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf#244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates
{lyn5880} adding Instantiate Procedural Prefab to the Editor
commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 14:21:09 2021 -0500
updated based on feeback
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 11:35:30 2021 -0500
small include tweak
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 10:08:53 2021 -0500
moved the seg reg key to the CPP file
removed the Queue Load
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 08:24:57 2021 -0500
Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample
Add example prefab script and FBX with 2 meshes to test it
commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 16:07:47 2021 -0500
make sure the AZ::IO::SystemFile::Exists() before returning fullPath
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 28 14:03:11 2021 -0500
Move sceneJobHandler reset out of exception block. Add more info to error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 13:04:37 2021 -0500
{lyn5880} adding Instantiate Procedural Prefab to the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 09:23:54 2021 -0500
Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{ly5395} adding asset loading logic for procedural prefabs
commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Mon Sep 27 13:52:21 2021 -0500
added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
optimized headers
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:12:40 2021 -0500
Remove some whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:04:58 2021 -0500
Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript
Fixes to support writing a python script to generate a prefab
commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:51:17 2021 -0500
Use raise_error instead of print
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:47:20 2021 -0500
Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:47 2021 -0500
Test entity cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:28 2021 -0500
Make CastWithTypeName only return true if the object can be successfully cast
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:49:28 2021 -0500
Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 13:19:51 2021 -0500
Store watch folder in scene so source relative path can be calculated
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 23 14:10:31 2021 -0500
Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule
{ly5384} script processing rule behavior more stateless
commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 22 15:19:30 2021 -0500
{ly5384} script processing rule beahvior more stateless
Made the script processing rule beahvior more stateless so that the
script name needs to be discovered each time.
Disconnet from the bus after each scene script builder usage.
Before it would be possible that the same script can be run more than
once for each asset.
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:27:12 2021 -0500
Update scene_data.py to latest PrefabGroup format
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:26:27 2021 -0500
Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:48:15 2021 -0500
AZ::JsonSerializationUtils update
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:21:52 2021 -0500
revert odd README.md merge issue
added alias for PrefabBuilder.Tools
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:52:58 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
# Conflicts:
# Gems/Prefab/PrefabBuilder/CMakeLists.txt
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:43:19 2021 -0500
added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:59 2021 -0500
Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile
{ly5384} Fixing Linux build issues.
commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:48 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile
commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:52:07 2021 -0500
Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix
fixing an API merge compile error
commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:50:58 2021 -0500
fixing an API merge compile error
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:10:46 2021 -0500
Make sure EntityUtilityComponent is loaded in AssetBuilderApplication
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:09:03 2021 -0500
Clean up entities and templates after python script is done
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 20 14:05:12 2021 -0500
ScriptProcessorRuleBehavior resets entity context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:40:37 2021 -0500
Add add_prefab_group
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 11:53:25 2021 -0500
Fix merge compile issue
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 11:18:44 2021 -0500
{ly5395} adding asset loading logic for procedural prefabs
* enabling the Prefab gem for tool work
* enabling prefab gem for AutomatedTesting
* AssetTypeInfoHandler for procedural prefab
* EnableCatalogForAsset for procedural prefab
* RegisterHandler for AssetManager
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:32:37 2021 -0500
Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671fc8697edd5#229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework
commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 10:04:06 2021 -0500
{ly5384} Fixing Linux build issues.
* symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
* wrapped the AZ::ComponentId return for both cases
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 09:44:30 2021 -0500
Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc
Reflect Prefab/Entity constants and add failure unit tests
commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:37:29 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:27:57 2021 -0500
Updated PrefabBuilder to point to new asset type for the procedural prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:56:13 2021 -0500
{lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:53:22 2021 -0500
Add failure tests and some test cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:34:03 2021 -0500
Reflect InvalidTemplateId, fix reflection for InvalidComponentId
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:55:16 2021 -0500
Fix merge issues
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:28:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:24:44 2021 -0500
Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab
API Update: Wrap PrefabSystemComponentInterface behavior
commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:33 2021 -0500
Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
API Update: AzToolsFramework::Prefab::PrefabLoaderInterface
commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:06 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp
commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:36 2021 -0500
Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement
API Update: Editor Entity Component Functions
commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:09 2021 -0500
Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore
API Update: Editor Component JSON Helper Functions
commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:48:41 2021 -0500
m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
adding error messages for the prefab processing
fixed typo
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:32:42 2021 -0500
reduced the JSON for the testing framework to tree types only
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:25:00 2021 -0500
enable ProceduralPrefabAsset JsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:31:59 2021 -0500
Remove unneeded include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:20:04 2021 -0500
Cleanup whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 13:49:20 2021 -0500
FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)
Fixed a memory leak
Moved const to header
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 10:49:32 2021 -0500
updated the DOM logic for the asset loading sake
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 13:23:13 2021 -0500
Update CreateStringPermissive to stop when enough data has been collected.
Update unit tests.
Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
Updated AssetTreeFilterModel to cap the string length
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:55:38 2021 -0500
Rename GetComponentJson to GetComponentDefaultJson.
Clean up GetComponentTypeIdFromName
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:29:04 2021 -0500
Move scripting ebus and handler into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 20:27:41 2021 -0400
Renamed SearchComponents to FindMatchingComponents
Added missing printf formatting
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:31:08 2021 -0400
Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
API Update: Editor Entity Management - Add some comments and error handling
commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:13:43 2021 -0400
Move bus and handler code into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:25:35 2021 -0400
Add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:16:33 2021 -0400
Add error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 16:54:20 2021 -0400
Cleanup code
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 10:48:40 2021 -0500
Add and update unit tests
Reflect APIs to behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 2 13:00:02 2021 -0500
Add Search and Component json output APIs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 13:37:44 2021 -0400
Make bus handler private
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 12:30:13 2021 -0400
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 10:12:49 2021 -0500
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 16:06:10 2021 -0500
Update unit test to verify components on saved prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 12:52:46 2021 -0500
Expand test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 17:32:14 2021 -0500
Add error handling
Add component creation
Add error testing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:31:28 2021 -0500
enabling ProductDependencies test again
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:23:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:14:07 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:09:10 2021 -0500
Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group
{lyn5392} Adding PrefabGroup scene manifest rule
commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:33:24 2021 -0500
removing unneeded AZStd::move() calls
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:17:52 2021 -0500
cleaned up the code
finalized the unit tests
fixed the code based on the tests... FTW!
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 13:06:20 2021 -0500
Add FindComponentByTypeName and UpdateComponentForEntity APIs
Add unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 14:02:17 2021 -0500
Fix bus connect that should have been a bus disconnect
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 12:57:04 2021 -0500
Fix up includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 08:43:23 2021 -0500
WIP
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:44:37 2021 -0500
Rename files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:14:34 2021 -0500
Remove 'editor' from bus/component name
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Aug 31 09:18:37 2021 -0500
{lyn5392} Adding PrefabGroup scene manifest rule
* Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
* has reflections for serialization & behavior
* testing the behavior using Lua
* testing the serialization using JSON
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 17:52:18 2021 -0500
Reflect SaveTemplateToString
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 12:46:17 2021 -0500
Add warning/error messages, update module
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 11:17:25 2021 -0500
Add some comments and error handling
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 17:16:45 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:28:00 2021 -0500
Add CreatePrefabTemplate
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac#199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
Add editor entity creation and unit test
commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 16:44:57 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:03:35 2021 -0500
Setup CreateEditorReadyEntity to use a custom entity context
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 09:29:20 2021 -0500
Add EditorEntityUtilityComponent for managing entities from the behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f8d39e267143603cad5e575faa4443#3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
commit 575faa444343603cad5e4b817a648343603cad5ed9cce28a53bb52475ce8#2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
commit bb52475ce8697dfad486650e1ab44dd9cce28a53e7f787572e486ba58628#2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
commit 486ba58628e7f787572e7cfde884d9e7f787572e#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
commit 837e1c7370d30de01752efcbe2c4a1#1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
commit efcbe2c4a1d30de017520c43493e29d30de01752#1624 )
Signed-off-by: AMZN-alexpete
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Material Editor: Added alternate skybox toggle to the toolbar
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Squashed commit of the following:
commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585bhttps://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs
commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 18:03:38 2021 -0500
fixing non-unity build
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 15:43:50 2021 -0500
adding header for validation
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf#244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates
{lyn5880} adding Instantiate Procedural Prefab to the Editor
commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 14:21:09 2021 -0500
updated based on feeback
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 11:35:30 2021 -0500
small include tweak
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 10:08:53 2021 -0500
moved the seg reg key to the CPP file
removed the Queue Load
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 08:24:57 2021 -0500
Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample
Add example prefab script and FBX with 2 meshes to test it
commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 16:07:47 2021 -0500
make sure the AZ::IO::SystemFile::Exists() before returning fullPath
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 28 14:03:11 2021 -0500
Move sceneJobHandler reset out of exception block. Add more info to error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 13:04:37 2021 -0500
{lyn5880} adding Instantiate Procedural Prefab to the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 09:23:54 2021 -0500
Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{ly5395} adding asset loading logic for procedural prefabs
commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Mon Sep 27 13:52:21 2021 -0500
added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
optimized headers
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:12:40 2021 -0500
Remove some whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:04:58 2021 -0500
Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript
Fixes to support writing a python script to generate a prefab
commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:51:17 2021 -0500
Use raise_error instead of print
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:47:20 2021 -0500
Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:47 2021 -0500
Test entity cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:28 2021 -0500
Make CastWithTypeName only return true if the object can be successfully cast
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:49:28 2021 -0500
Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 13:19:51 2021 -0500
Store watch folder in scene so source relative path can be calculated
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 23 14:10:31 2021 -0500
Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule
{ly5384} script processing rule behavior more stateless
commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 22 15:19:30 2021 -0500
{ly5384} script processing rule beahvior more stateless
Made the script processing rule beahvior more stateless so that the
script name needs to be discovered each time.
Disconnet from the bus after each scene script builder usage.
Before it would be possible that the same script can be run more than
once for each asset.
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:27:12 2021 -0500
Update scene_data.py to latest PrefabGroup format
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:26:27 2021 -0500
Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:48:15 2021 -0500
AZ::JsonSerializationUtils update
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:21:52 2021 -0500
revert odd README.md merge issue
added alias for PrefabBuilder.Tools
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:52:58 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
# Conflicts:
# Gems/Prefab/PrefabBuilder/CMakeLists.txt
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:43:19 2021 -0500
added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:59 2021 -0500
Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile
{ly5384} Fixing Linux build issues.
commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:48 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile
commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:52:07 2021 -0500
Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix
fixing an API merge compile error
commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:50:58 2021 -0500
fixing an API merge compile error
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:10:46 2021 -0500
Make sure EntityUtilityComponent is loaded in AssetBuilderApplication
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:09:03 2021 -0500
Clean up entities and templates after python script is done
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 20 14:05:12 2021 -0500
ScriptProcessorRuleBehavior resets entity context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:40:37 2021 -0500
Add add_prefab_group
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 11:53:25 2021 -0500
Fix merge compile issue
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 11:18:44 2021 -0500
{ly5395} adding asset loading logic for procedural prefabs
* enabling the Prefab gem for tool work
* enabling prefab gem for AutomatedTesting
* AssetTypeInfoHandler for procedural prefab
* EnableCatalogForAsset for procedural prefab
* RegisterHandler for AssetManager
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:32:37 2021 -0500
Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671fc8697edd5#229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework
commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 10:04:06 2021 -0500
{ly5384} Fixing Linux build issues.
* symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
* wrapped the AZ::ComponentId return for both cases
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 09:44:30 2021 -0500
Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc
Reflect Prefab/Entity constants and add failure unit tests
commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:37:29 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:27:57 2021 -0500
Updated PrefabBuilder to point to new asset type for the procedural prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:56:13 2021 -0500
{lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:53:22 2021 -0500
Add failure tests and some test cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:34:03 2021 -0500
Reflect InvalidTemplateId, fix reflection for InvalidComponentId
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:55:16 2021 -0500
Fix merge issues
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:28:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:24:44 2021 -0500
Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab
API Update: Wrap PrefabSystemComponentInterface behavior
commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:33 2021 -0500
Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
API Update: AzToolsFramework::Prefab::PrefabLoaderInterface
commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:06 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp
commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:36 2021 -0500
Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement
API Update: Editor Entity Component Functions
commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:09 2021 -0500
Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore
API Update: Editor Component JSON Helper Functions
commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:48:41 2021 -0500
m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
adding error messages for the prefab processing
fixed typo
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:32:42 2021 -0500
reduced the JSON for the testing framework to tree types only
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:25:00 2021 -0500
enable ProceduralPrefabAsset JsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:31:59 2021 -0500
Remove unneeded include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:20:04 2021 -0500
Cleanup whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 13:49:20 2021 -0500
FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)
Fixed a memory leak
Moved const to header
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 10:49:32 2021 -0500
updated the DOM logic for the asset loading sake
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 13:23:13 2021 -0500
Update CreateStringPermissive to stop when enough data has been collected.
Update unit tests.
Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
Updated AssetTreeFilterModel to cap the string length
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:55:38 2021 -0500
Rename GetComponentJson to GetComponentDefaultJson.
Clean up GetComponentTypeIdFromName
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:29:04 2021 -0500
Move scripting ebus and handler into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 20:27:41 2021 -0400
Renamed SearchComponents to FindMatchingComponents
Added missing printf formatting
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:31:08 2021 -0400
Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
API Update: Editor Entity Management - Add some comments and error handling
commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:13:43 2021 -0400
Move bus and handler code into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:25:35 2021 -0400
Add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:16:33 2021 -0400
Add error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 16:54:20 2021 -0400
Cleanup code
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 10:48:40 2021 -0500
Add and update unit tests
Reflect APIs to behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 2 13:00:02 2021 -0500
Add Search and Component json output APIs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 13:37:44 2021 -0400
Make bus handler private
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 12:30:13 2021 -0400
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 10:12:49 2021 -0500
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 16:06:10 2021 -0500
Update unit test to verify components on saved prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 12:52:46 2021 -0500
Expand test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 17:32:14 2021 -0500
Add error handling
Add component creation
Add error testing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:31:28 2021 -0500
enabling ProductDependencies test again
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:23:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:14:07 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:09:10 2021 -0500
Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group
{lyn5392} Adding PrefabGroup scene manifest rule
commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:33:24 2021 -0500
removing unneeded AZStd::move() calls
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:17:52 2021 -0500
cleaned up the code
finalized the unit tests
fixed the code based on the tests... FTW!
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 13:06:20 2021 -0500
Add FindComponentByTypeName and UpdateComponentForEntity APIs
Add unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 14:02:17 2021 -0500
Fix bus connect that should have been a bus disconnect
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 12:57:04 2021 -0500
Fix up includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 08:43:23 2021 -0500
WIP
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:44:37 2021 -0500
Rename files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:14:34 2021 -0500
Remove 'editor' from bus/component name
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Aug 31 09:18:37 2021 -0500
{lyn5392} Adding PrefabGroup scene manifest rule
* Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
* has reflections for serialization & behavior
* testing the behavior using Lua
* testing the serialization using JSON
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 17:52:18 2021 -0500
Reflect SaveTemplateToString
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 12:46:17 2021 -0500
Add warning/error messages, update module
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 11:17:25 2021 -0500
Add some comments and error handling
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 17:16:45 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:28:00 2021 -0500
Add CreatePrefabTemplate
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac#199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
Add editor entity creation and unit test
commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 16:44:57 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:03:35 2021 -0500
Setup CreateEditorReadyEntity to use a custom entity context
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 09:29:20 2021 -0500
Add EditorEntityUtilityComponent for managing entities from the behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f8d39e267143603cad5e575faa4443#3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
commit 575faa444343603cad5e4b817a648343603cad5ed9cce28a53bb52475ce8#2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
commit bb52475ce8697dfad486650e1ab44dd9cce28a53e7f787572e486ba58628#2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
commit 486ba58628e7f787572e7cfde884d9e7f787572e#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
commit 837e1c7370d30de01752efcbe2c4a1#1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
commit efcbe2c4a1d30de017520c43493e29d30de01752#1624 )
Signed-off-by: AMZN-alexpete
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Squashed commit of the following:
commit dbd3526517bcb6553402cbc0af1f02e1f68e0707
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Oct 4 14:30:56 2021 -0500
Increased scene manifest max size to size_t::max to match default json size limit
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea4a9ffd23feb3beeadc9bf6ca765c96980e9e6d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Oct 1 19:15:25 2021 -0500
Switch to querying cache location from Settings Registry
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 1c197996132625b8e26856fc92a30f9862d9dfdb
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Oct 1 14:42:32 2021 -0500
Update to look in cache for generated manifest instead of source folder
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit cf3c32791fd71dc48066f9783c8859d386370b95
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 30 11:09:40 2021 -0500
Added generated manifest to dependency tracking. Updated unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 56cb0d27982e61c2cf123b765def8b5c9e21b021
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:51:52 2021 -0500
Moved manifest size const to header and used that in scene builder
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 7c8016a0ba6000090b29371f253b7906c9f3d141
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:21:06 2021 -0500
Add doc comment
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 45fd5473f5ed6fe4fe93f8d629857852bcbe5e03
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:11:36 2021 -0500
Clean up code and add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit d0e610cad380e2278bc18552a4d1c71c64a5d339
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 13:21:58 2021 -0500
Source dependency reporting WIP
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
(cherry picked from commit d6464dcee20ea4e6f2d40f0d3301f24be5f4dee6)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Add comment on unit test globals, fix indentation
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Cleaned up scene_mesh_to_prefab.py
Added comments
Removed raise_error function
Made mesh_group_name cleanup more comprehensive
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* fix for "warning C4100: 'message': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
317d624f6c
Minor formatting.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
66f419e8e5
Merge branch 'development' into LYN-5265_state_tracker_impl
4 years ago
5308a0fbbb
Remove redundant editor mode notifications.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
977d58e1a8
Update ZLIB min req osx ios and android to reasonable limits ( #4473 )
...
This also updates the name of the zlib library to uppercase ZLIB which conforms to normal CMake standards .
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
4 years ago
be166d68b8
Reduce the default worker thread priority for the Job system, Job system is now aimed at long running or idle tasks
...
Add cvars to control the number of worker threads created by the TaskGraph and Job systems. The cvars are scales on the hw concurrency of the cpu.
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
lumberyard-employee-dm
AMZN-nggieber
igarri
John
nvsickle
Pratik Patel
Yaakuro
amzn-mike
puvvadar
Esteban Papp
hultonha
hultonha
srikappa-amzn
Michael Pollind
ffarahmand-DPS
AMZN-Igarri
moraaar
kberg-amzn
Danilo Aimini
Steve Pham
AMZN-koppersr
Mikhail Naumov
Chris Galvan
Chris Burel
Vincent Liu
amzn-phist
Nicholas Lawson
Guthrie Adams
Artur K
Guthrie Adams
AMZN-Phil
Junbo Liang
Scott Romero
Alex Peterson
nggieber
Allen Jackson
bosnichd
greerdv
greerdv
Terry Michaels
FiniteStateGit
Jeremy Ong
Qing Tao
rgba16f
AMZN-AlexOteiza