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

8767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Burel 7d70def688 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:40:28 -07:00
Chris Burel 422dba905a Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:40:04 -07:00
Chris Burel f5dea72dfe Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:40:00 -07:00
Chris Burel 0aba1fa48c Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:39:52 -07:00
Chris Burel 9948f70da0 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:39:37 -07:00
Chris Burel d1e8f1f6e9 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:39:32 -07:00
Chris Burel dc9bf9e6b3 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:39:26 -07:00
Chris Burel 69059ba3e6 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:34:57 -07:00
Chris Burel bb1dfd44d2 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:26 -07:00
Chris Burel e6a132b91e Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:26 -07:00
Chris Burel 9e5b22a431 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:26 -07:00
Chris Burel 1bd5a63919 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:25 -07:00
Chris Burel 6eeae875e9 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:25 -07:00
Chris Burel 6c7bc7a296 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:24 -07:00
Chris Burel 04652abb8f Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:24 -07:00
Chris Burel 06ec40452e Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:24 -07:00
Chris Burel 179389726b Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:23 -07:00
bosnichd 600bb5b34e Fix alt-tabbing out of full screen on Windows. (#5288) 
Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-04 11:17:52 -06:00
Esteban Papp 0b7bff79d3 Removes VTUNE profiler hooks from Cry (#5291) 
* Removes VTUNE profiler hooks from Cry

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

* some more vtune cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-04 10:10:29 -07:00
Andre Mitchell 1470d97f58 Remove virtual keyword. (#4992) 
SetupUI()is called in the AssetEditorMainWindow constructor - it should not be virtual. Derived classes will not receive the call.

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
 2021-11-04 09:48:10 -07:00
amzn-mike 73202c2091 [LYN-7245] Fix test thread being created multiple times (#5267) 
* Fix test thread being created multiple times

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

* Update test to not use a callback

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

* Add some more comments

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

* Add back the callback, remove the use of a thread/sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-04 10:45:18 -05:00
Michael Pollind 891a4f6782 bugfix: resolve crash with FBX Settings (#4813) (#4944) 
-prevent export of ModuleInitISystem and ModuleShutdownISystem

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-04 08:22:20 -07:00
Guthrie Adams 0aa391368e Merge pull request #5159 from aws-lumberyard-dev/Atom/guthadam/materials_with_relative_paths 
Update material editor and exporter to use relative paths for external references
 2021-11-04 09:28:30 -05:00
Olex Lozitskiy 7acc343a68 Corrected system requirements of AutomatedTestingSystemComponent. 2021-11-04 09:51:32 -04:00
Benjamin Jillich 54506b6c6c Animation Editor: Clicking Visualization in Anim Graph in the animation editor has no effect. (#5088) 
asprintf() is returning a new QString and is also deprecated. Switched to use the AZStd::string::format() as that uses the small string optimization and doesn't result in an allocation.

Resolves #2429

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-04 11:52:27 +01:00
jromnoa cdf5a0519f Merge pull request #5284 from aws-lumberyard-dev/Atom/semaster/add_hdr_colorgrading_p0 
Test parallel P0  HDR Color Grading Component
 2021-11-03 19:34:26 -07:00
Chris Burel d598a7c709 [Linux] Update Jenkins Linux build to use Ubuntu 20, clang 12 (#5035) 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-03 18:54:37 -05:00
Roman 618a65e7dd indexBuffer reserve amount seems off. (#5268) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-03 15:56:03 -07:00
Sean Masterson 68e2770caf Adding P0 Automation for HDR Color Grading Component 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-11-03 15:52:39 -07:00
AMZN-Olex f041661474 Correcting system requirements for the startup 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-11-03 18:45:35 -04:00
Guthrie Adams 9522945f20 moved AssetSystemStub to TestUtils folder 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:26 -05:00
Guthrie Adams bb4fdc8fe8 Added basic unit test for relative path function 
Moved asset system stub to RPI utils

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:23 -05:00
Guthrie Adams b14e0958ce updated comments 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:20 -05:00
Guthrie Adams 6d896beb4b added version to material component exporter 
deleted unnecessary checks

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:18 -05:00
Guthrie Adams ebcefb2fe7 updated image paths to use new function 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:15 -05:00
Guthrie Adams b643a8c80f updated comment 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:12 -05:00
Guthrie Adams 84ca17e7cb Created function to get relative paths to referenced files that will fall back to asset folder relative paths under certain conditions 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:10 -05:00
Guthrie Adams 620e522f86 material editor and exporter save source materials with relative paths 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:07 -05:00
Esteban Papp e4c46ffb5d Merge pull request #5229 from aws-lumberyard-dev/issues/4683 
Adds LuaIDE->GridHub dependency
 2021-11-03 13:57:47 -07:00
Mike Chang 062c38e7e9 Update README.md CMake link and instructions 
Signed-off-by: Mike Chang <changml@amazon.com>
 2021-11-03 13:46:17 -07:00
Michael Pollind 4277414268 bugfix: cycle mouse to the other side of the screen when using scrollbox (#5048) 
* bugfix: cycle mouse to the other side of the screen when using scrollbox

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: added comments to SpinBox

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-03 13:31:56 -07:00
jromnoa f0ba0ff7eb Merge pull request #5033 from aws-lumberyard-dev/Atom/jromnoa/assert-for-screenshot-comparisons 
Fixes the test_BasicLevelSetup_SetsUpLevel() test and adds proper asserts for screenshot comparisons.
 2021-11-03 12:26:56 -07:00
Chris Galvan 803aac9169 Merge pull request #5250 from aws-lumberyard-dev/cgalvan/PythonToolTemplateEnableQuickIteration 
Add quick iteration workflow to the custom python tool template.
 2021-11-03 14:16:29 -05:00
Steve Pham 0e8edfa702 Update OpenMesh for Windows and prepare for Linux and Mac (#5248) 
- Update to OpenMesh-8.1-rev3 for Windows
- Add OpenMesh-8.1-rev3 for Linux but not enabled
- Add OpenMesh-8.1-rev3 for Mac but not enabled

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-03 11:37:28 -07:00
Allen Jackson 815c2d1986 {lyn5868} fixing the asset_processor_batch_tests.py auto tests (#5247) 
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-11-03 13:19:22 -05:00
Danilo Aimini 618777f8d4 LYN-7536 | Focus Mode - Introduce shortcuts to open/close prefab editing (#5230) 
* Enable closing prefab by double-clicking it when it's in focus.

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

* Enable double clicking on level prefab to close focus mode and return to editing the level.

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

* Introduce API function to go up one level in the Prefab Focus Mode hierarchy.

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

* Enable keyboard shortcuts to more easily navigate the prefab hierarchy.

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

* Tie the "Open/Edit Prefab" action to the = key on top of +. This allows users with compact US keyboards to use either key, preventing them from having to press Shift and =.

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

* Replace the behavior of the "Up one level" button in the breadcrumbs with the new function that serves the same purpose. Also show the - shortcut in the tooltip.

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

* Fix FocusOnParentOfFocusedPrefab to require the entity context id (to conform with the other functions in the API that don't pass entityIds). Expand its usage to other functions that did the same operation manually.

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

* Include fix for non-unity builds

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-03 11:15:11 -07:00
Luis Sempé 8966380acf Merge pull request #5197 from aws-lumberyard-dev/animation/rhhong/render_settings_merge 
[Merge] load render option in atom render plugin and use render actor setting in atom debug draw
 2021-11-03 10:56:45 -07:00
Shirang Jia d584732116 Fix ap log path on s3 (#5257) 
* Fix typo when calling upload_to_s3.py

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

* Remove space in extra_args

Signed-off-by: shiranj <shiranj@amazon.com>
 2021-11-03 10:45:12 -07:00
jromnoa 52bae87a93 Merge pull request #5218 from aws-lumberyard-dev/Neil_o3de_automation 
Adding P0 Occlusion Culling Plane test
 2021-11-03 09:48:50 -07:00
Chris Galvan b56783dce0 Add quick iteration workflow to the custom python tool template. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-03 11:28:42 -05:00