birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,018 Commits 3 Branches 3 Tags
5fc40bbbf90f0e2b8a01fc865c87fcb75449fbb9
Commit Graph

4136 Commits

Author SHA1 Message Date
amzn-mike 45abb9f88e Proc Prefabs: Remove feature toggle (#6348) 
* Disable feature flag - redirect proc prefab check to IsPrefabSystemEnabled.

Procedural Prefabs are now on by default when the prefab system is enabled.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Bump scene builder version to cause all procedural prefabs to rebuild

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to lambda for ebus call

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unused const

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-13 11:52:03 -08:00
Nicholas Van Sickle 202226c2cb Document short string usage 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:31:23 -08:00
Nicholas Van Sickle d044f51a89 Remove DomDocument for now 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:21:38 -08:00
Nicholas Van Sickle 8da04f15d3 Add some Value documentation 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:15:02 -08:00
Danilo Aimini 0dfb8d42c4 Disable the ability to instantiate into closed prefabs, and to move the root prefab in focus mode. (#6320) 
* Disable "Move Up" and "Move Down" for focused prefab containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable the ability to instantiate prefabs inside closed prefab instances.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor comment fix.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-13 19:10:04 +01:00
John Jones-Steele 586f146a84 Fixed nullptr error (#6386) 
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-12-13 17:56:46 +00:00
AMZN-Phil ae3dedfe59 Merge pull request #6172 from aws-lumberyard-dev/Prism/RefactorProjectSettings 
Refactor Project Manager Settings
 2021-12-13 09:40:48 -08:00
Nicholas Van Sickle 0216d0ae9f Clarify shared string semantics 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 09:11:06 -08:00
moraaar f941d03f9e Fix namespace Az for AZ in ProcessWatcher for iOS (#6382) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-12-13 14:03:00 +00:00
Andre Mitchell 82ebca8261 Disable unused HideActionWhileEntitiesDeselected function in EditorListener. 
It is only used when the slice editor is enabled, which causes build errors when it is not enabled.

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
 2021-12-13 07:16:14 -05:00
Nicholas Van Sickle e080ade885 Switch high perf allocator back on for containers, modest perf boost 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-12 14:20:16 -08:00
Nicholas Van Sickle d9ac3c2120 Tidy up Type enum 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-12 13:56:10 -08:00
Nicholas Van Sickle cc120c772c Add RapidjsonCopyAndMutate to compare w/ shallow copy 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-12 12:58:52 -08:00
Nicholas Van Sickle c53c97cf5f Add another round of benchmarks 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-11 15:54:57 -08:00
Nicholas Van Sickle 1f2635d24b Switch to the high pref heap allocator, roll back pool interface changes 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-10 16:35:26 -08:00
Nicholas Van Sickle 809ee2dce9 Fix "force string copy" logic 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-10 16:18:38 -08:00
Nicholas Van Sickle 1af39a5c5c Add benchmarks, some light optimizations like SSO 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-10 15:57:52 -08:00
Danilo Aimini c06b697c6b Revert part of the fix as it would break unit tests. Verified the remaining code still achieves the same purpose on the UI side without impacting the backend. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-10 15:06:55 -08:00
Steve Pham 4670003aaf Fix failed Atom rpi tests linux (#6319) 
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS
- Add template specialization for ConstantsData::SetConstant<Color> and ConstantsData::GetConstant<Color>
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS from source code
- Fix ConstantsData::SetConstantArray<bool> to pass unit test SetConstant_GetConstant_FalsePackedInGarbage_Bool on Linux, cause by an unwanted optimization (comments describe the situation). This will make this behavior consistent across platforms

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-10 14:54:08 -08:00
Danilo Aimini 502578293b Merge branch 'development' of https://github.com/o3de/o3de into daimini/ReadOnly/TransformResetFix 2021-12-10 14:35:25 -08:00
John Jones-Steele 3ae6b601a2 Focus issue in editor settings menu #3921 (#6296) 
* Changes to fix DCO

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Moved the keyEvent to a helper function for ease of testing

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Split definition and declaration of WidgetHandleKeyPressEvent

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-12-10 22:34:41 +00:00
Danilo Aimini d1533914ab Disable the additional transform context menu items in the inspector. Prevent the user from reparenting entities under procprefabs using the entity picker. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-10 13:16:02 -08:00
chcurran 8357fa34e9 fixed unit testing code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:42 -08:00
chcurran 23267fd862 SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:41 -08:00
Chris Galvan ca5424dd7b Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:39 -08:00
Chris Galvan befd84cf0b Added property handler for SourceHandle type. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:36 -08:00
Chris Galvan b4407e5044 Made PropertyAssetCtrl more extensible. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:35 -08:00
Chris Galvan 42382cd8d1 Added logic to AssetPickerDialog to pre-select by file paths. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:35 -08:00
Chris Galvan d9ee02fddf Added method to AssetCompleterModel for specifying a filter directly. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:34 -08:00
Chris Galvan 231aaa5bf5 Added asset selection model option for a source asset type based on regex. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:33 -08:00
Chris Galvan 3f6824571f Added regular expression filter for asset browser entries. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:32 -08:00
chcurran 31c627defc initial scriptcanvas source handle 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:52:36 -08:00
nggieber e9db0bca6a Fix typo, add missing header, remove unecessary asserts 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 11:42:18 -08:00
amzn-mike 8f134a82d1 Procedural Prefabs: Stable transform component ID (#6227) 
* Set Procedural Prefab Transform ComponentId to the hash of the file path.

Procedural prefabs needs to have a deterministic transform component ID in order for saved patches still work when the prefab is regenerated.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to Cityhash instead of XXHash since prefab system is using that elsewhere

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Added unit test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-10 11:20:31 -08:00
chiyenteng ca49eedc5f Convert prefab to temp spawnable assets (#6179) 
* Convert prefab to temp in-memory spawnable assets

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-12-10 10:55:01 -08:00
Alex Peterson 6613030fe6 Fix Visual Studio requirements text and doc link (#6312) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-10 10:15:39 -08:00
Steve Pham 5a4a96348f Remove unused traits that disabled certain failed unit tests 
- Removed trait AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
- Removed trait AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST
- Removed trait AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS
- Removed AZ_TRAIT_DISABLE_FAILED_METRICS_TESTS

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-10 08:44:18 -08:00
nggieber 214716dafc Add AZStd string header for linux 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 07:48:41 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
nggieber af9e75da66 Minor PR feedback changes 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 06:19:28 -08:00
Artur K 53b88d4752 Preapre codebase for FileRequest compiletime improvements (#6192) 
* Preapre codebase for FileRequest compiletime improvements

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

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

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-12-10 13:08:24 +00:00
T.J. McGrath-Daly bb3821df45 Fix: Lua breakpoint error 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-10 12:19:12 +00:00
T.J. McGrath-Daly 53429d838e Fix: Lua script debugging loading problem 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-10 11:28:07 +00:00
Nicholas Van Sickle 947951b6c7 Add copy on write tests 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-09 23:43:22 -08:00
Nicholas Van Sickle 15e0bb1693 Add tests, fix missing bool in Accept and operator[] insert 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-09 21:37:22 -08:00
Nicholas Van Sickle a2d474cc4f Add some intial tests 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-09 17:47:01 -08:00
nggieber 9f4895aaea Addressed remaining PR feedback 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 15:30:32 -08:00
Nicholas Van Sickle e7c92b5658 Move ValueWriter out, add DeepCompareIsEqual 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-09 15:25:20 -08:00
nggieber 5641bcd5f1 Update Update Project Settings UI to show advanced settings and move project preview to right side panel 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 14:56:50 -08:00
Scott Romero e9379c1746 [development] updated editor event handling with respect to imgui (#6114) 
Fixes #4366

- Added support for sending text events from the Qt event mapper
- Fixed several issues found while running the Profiler gem in debug
- Added ability to track AZ-consumed events in the Qt event mapper
- Minor clean up to input handling in ImGuiManager
- Select ImGui mouse events can now be properly consumed during AZ-input processing in the editor viewport
- Added tests for the Qt event mapper

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-12-09 13:58:27 -08:00