birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,770 Commits 3 Branches 3 Tags
271004635cbb64629102e85d770c2ada58883ba1
Commit Graph

4909 Commits

Author SHA1 Message Date
lsemp3d b6ce643a74 Categorized all constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 16:30:09 -08:00
Steve Pham ba32937867 Cherry pick release unused warning error into Stabilization/2110 (#5845) 
* Fixed unused variable warning in Release configuration in Linux. (#5830)

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

* Fix unused variable errors (#5843)

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: moraaar <moraaar@amazon.com>
 2021-11-22 15:32:54 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840) 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes unneded space

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes how we get the NDK folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs delayed expansion

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-22 14:21:02 -08:00
Steve Pham be2a32d68d Fix unused variable errors (#5843) 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-22 14:19:59 -08:00
greerdv 9513ab8d1e switch back to vector for button ids since there may not be a 1 to 1 mapping to modes in future 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 21:54:00 +00:00
Mike Balfour 1f2385ca1a Added missing doc links. (#5841) 
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-11-22 15:35:37 -06:00
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 2021-11-22 12:24:00 -08:00
lsemp3d 5d09e8d42e Fixed generated property names, pull argument names from BC when available, auto-reload on asset change 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 12:22:38 -08:00
Roman a3a4038aca Added joint orientation rendering (#5821) 
* Render joint orientation

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

* fix build error

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-22 11:38:35 -08:00
lsemp3d 20a2a79003 Updated more node names, no longer return data type string to control tooltip display in SC 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 10:58:09 -08:00
greerdv 03e5fd213c feedback from PR 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 18:46:29 +00:00
greerdv bd4e012eeb run clang format 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 17:59:43 +00:00
greerdv 52846b146e merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 17:51:24 +00:00
moraaar bcce0678c4 Fix collider component validation function by checking if the asset is ready (#5795) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-22 09:57:51 +00:00
moraaar 5145fceedc Fix some compilation errors due to warnings of potentially returning unitialized variables. (#5796) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-22 09:57:42 +00:00
Roman bb906da58c when follow up camera option is on, then load another character, it should zoom to this character. (#5758) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-20 14:59:36 -08:00
Steve Pham a0ab5920da Add trait to enable/disable the Resource Mapping Tool (#5814) 
* Add trait to enable/disable the Resource Mapping Tool

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>

* Moving ly_install_directory(DIRECTIORES Tools/ResourceMappingtool) into of the PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL block

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-19 18:04:15 -08:00
Esteban Papp 7100d48e16 Cherry-picking some changes from stabilization into development (#5810) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-19 15:59:21 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de 
Merge stabilization/2110
 2021-11-19 15:46:16 -08:00
Esteban Papp dbc5d7a8bc Cherry-pick of Linux deb package to stabilization (#5778) 
* Cherry-pick 49e8f35858

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Merging differences from development of other changes that need to be there for deb packaging

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Picks a needed change for the installer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Takes version from environment if defined

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not pick up version if it is empty string since that will also break version comparison

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* creating temp directories if they dont exist

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets.
This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-19 14:07:25 -08:00
Luis Sempé 59819d1677 Merge pull request #5804 from aws-lumberyard-dev/scripting/text_updates_pass4 
Improved text generation to split up CamelCase names + updated more node names
 2021-11-19 13:23:41 -08:00
Steve Pham 3cf3e45b38 Enable Resource Mapping Tool on Linux (#5779) 
* Enable and fix AWS Resource Mapping Tool on Linux
- Enable the trait AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED for Linux
- Add additional traits to handle launching o3de local python on Linux
- Update the resource_mapping_tool.py to support preloading the shared libraries for Pyside (like the QtForPython gem) in order to resolve the local pyside2 libraries

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update pyside2 to a RUNTIME dependency

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update special linux preloading comments for clarity

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Add CR at the end of traits files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* - Remove unnecessary extra argument '--executable-path' and use '--binaries-path' instead
- Add linux only loading of pyside modules to 'setup_qt_environment' instead
- Update README.md

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Updated unit tests for test_environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix (more) indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Replace exit with return in setup_qt_environment

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-19 12:09:00 -08:00
lsemp3d d9aa1ee5b4 Merge branch 'scripting/text_updates_pass4' into scripting/text_updates_pass5 2021-11-19 11:17:52 -08:00
Allen Jackson 95da7fcb64 {lyn7060} adding 'Save as Prefab' for ProcPrefab (#5678) 
This adds the context menu to the Asset Browser to "Save as Prefab.." so that a Procedural Prefab
asset template can be saved in the source assets folder


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-11-19 13:17:21 -06:00
Guthrie Adams d0bf5e9eba Merge pull request #5764 from aws-lumberyard-dev/Atom/guthadam/include_material_asset_in_version_warnings 
Updated material version warning messages to include the affected asset
 2021-11-19 13:13:15 -06:00
lsemp3d 99d2605a81 Improved generation by splitting up CamelCase text for names, updated more node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-19 11:06:53 -08:00
Ken Pruiksma 8705b57f71 Adding unit tests for IndexedDataVector (#5724) 
* Rename IndexedDataVectorTests -> MultiIndexedDataVectorTests

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding unit tests for IndexedDataVector. Updated fixture for MultiIndexedDataVector.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixed a bug in the test. Updated IndexedDataVector with more/better comments and removed a non-const function that wasn't necessary.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Further updates to some comments

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-11-19 12:08:35 -06:00
John Jones-Steele 4ad35f424e Adds check to make sure that there are not too many samples created. (#5789) 
* Adds check to make sure that there are not too many samples created.

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

* Changes made from PR

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

* Changes made from PR 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-11-19 17:57:38 +00:00
puvvadar 6817684d73 Merge commit '7749f3c4a7f6b2a7acfde58ae8c04ea8a9a4b968' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:34 -08:00
puvvadar a6c768d1a4 Merge commit 'b4ff364a51c683b1fa30245cad7822f7ed231c3a' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:28 -08:00
puvvadar 7e9516eadf Merge commit '8fd9cbfb6456472473ec558c21de9aaa152a53c4' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:16 -08:00
puvvadar e8ffc4eaea Merge commit '11f41a4467e4d1daf64a4c72209c26f3e5a2d7ba' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:04 -08:00
puvvadar 3e35640dc6 Merge commit '2321afecfba5c1d83158cc22f0da7f1285d2199c' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:26 -08:00
puvvadar 8b5a322d67 Merge commit '9cbd323a3b799c3cc7fb285a96ba7ed2cace896b' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:20 -08:00
puvvadar 6cd0852f8d Merge commit 'edb15946ca06072c26a5979f8a1682526ec5fce2' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:08 -08:00
puvvadar b559b7f39f Merge commit '7213e2cd8763e59b2998f7945f42cec16af22b8e' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:50 -08:00
puvvadar c677fbff18 Merge commit '12e3a652d72865cc4a70c54487f5424abf6c9b81' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:43 -08:00
Olex Lozitskiy 7749f3c4a7 Merges PR 5707 that resolves #5611 from dev to stab/2110. 2021-11-19 12:13:25 -05:00
Danilo Aimini b4ff364a51 Remove AI components from list of addable components in Inspector. (#5780) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-19 09:11:48 -08:00
Qing Tao 8fd9cbfb64 ATOM-16854 Texture Settings dialog box crashes in the Editor (#5777) 
Changes include:
-Fixed image preview issue which was trying to convert a compressed texture directly to QImage.
-Fixed texture resolution display for cubemap in texture setting editor.
-Sort the preset names in preset combo box
-Fixed a crash when showing IBLSkybox preset info in texture setting editor

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-11-19 09:02:11 -08:00
Guthrie Adams b89f5ee0c4 fixed tests 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-19 10:39:35 -06:00
Steve Pham 11f41a4467 Fix UI canvas save as start folder (#5756) 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-19 08:22:53 -08:00
greerdv e2f7893f84 fix collider component mode tests and mapping of number keys to component modes 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-19 15:23:09 +00:00
greerdv 3199cb9777 set initial collider component sub mode to translation 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-19 15:00:58 +00:00
greerdv fd6bbf2872 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-19 14:01:44 +00:00
Benjamin Jillich 9e076db1fe [EMotion FX] In-place option isn't working correctly (#5743) 
The in-place option for the simple motion component, the motion anim graph node as well as in the motion window were not working in case the motion extraction node was not the root joint. The convention is to keep the motion extraction joint the root joint to make it work correctly - the isolated issue can be solved by only evaluating the motion extraction joint animation in case in-place is disabled and replace the is root joint check with one that checks if we are actually dealing with the motion extraction joint.

Resolves #5636

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-19 14:48:10 +01:00
Olex Lozitskiy 23dcc527a7 Merges PR 5707 that resolves #5611. 
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
 2021-11-18 23:33:42 -05:00
Olex Lozitskiy e804fd2a42 Refactored away circular dependencies in Multiplayer gem cmake targets. 2021-11-18 21:55:55 -05:00
puvvadar 6b08e66e82 Cleaning up warns in Terrain PBR material 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-11-18 17:59:43 -08:00
lsemp3d efd4862b34 More node name updates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 17:15:04 -08:00