birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,676 Commits 3 Branches 3 Tags
4e15cef2fca68d34b77256da8fc68d474ac97b03
Commit Graph

11676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
brianherrera 991f97a666 Add overall timeout for the AR pipeline 
Signed-off-by: brianherrera <briher@amazon.com>
 2022-01-28 14:06:45 -08:00
Chris Galvan 1c6fbdab2a Removed legacy/unused IEventLoopHook 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-28 15:44:25 -06:00
Allen Jackson 117cb11505 {ghi7197} ignore prefab groups with empty JSON DOMS (#7242) 
* {ghi7197} ignore prefab groups with empty JSON DOMS

ignore prefab groups with empty JSON DOMS if the default procedural prefab
is being skipped

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* a cleaner solution is to check if the Editor is attempting to construct,
then ignore making a default procedural prefab group

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2022-01-28 15:43:51 -06:00
lsemp3d 929baa4bdd Merge branch 'development' into scripting/screenshot_toolbutton 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-28 13:19:09 -08:00
AMZN-nggieber 24086ab394 Resizable Headers for Gem Catalog and Gem Repo Screen (#6885) 
* Initial mostly working attempt at resizable headers

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Add const and constexpr to variables

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Add header tracking for buttons, display items based on header scrollbar position, fix some spacing issues

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Correct styling for adjustable header, and intending header section and alingned item content with header text

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Prevent header resizing larger than table width.

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

* Fix resize graphical glitching

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

* Remove unecessary qss

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Removed necessary headers

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Remove extra nl and old comment

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Address PR feedback

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Removed unused variables

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Change variable to constexpr

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Remove AUTOMOC from headers, set background color of Gem Catalog to 333333 and adjustable header to transparent

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Change to using update instead of repaint when sections are resized

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Change temp directory creation on for gradle

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-28 10:05:03 -08:00
Steve Pham 0ba1cff08e Remove legacy 'CrySetFileAttributes' (#7226) 
* Remove legacy function 'CrySetFileAttributes' and replace its only use with AZ::IO::SystemFile::* functions

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-01-28 09:48:46 -08:00
santorac e173840bab Moved the StandardPbr property groups around to be in their original order. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-28 09:40:33 -08:00
santorac c3363fc22e Updating StandardPbr.materialtype to follow the new file format. In this commit all I did was combine the "groups" metadata together with the property lists. The groups will now show up in the wrong order in the Material Editor, because that was based on the "groups" list that no longer exists. I wanted to keep the giant list of properties in the same order for an easier diff review. In the next commit, I'll move the property groups around to be in the same order as before. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-28 09:36:09 -08:00
Sergey Pereslavtsev fc02783200 Fixed crash and asserts when heightfield is used without Terrain World 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-01-28 17:14:21 +00:00
amzn-sj 112e310419 [Serialization] Add support for updating the values of existing keys in associative containers (#6832) 
* Add support for updating the values of existing keys in associative containers

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Map/Unordered Map serialization updates values corresponding to existing keys by default. Multimaps always add a new entry for existing keys.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix unused parameter warning

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Update comparison function for test case

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2022-01-28 09:13:24 -08:00
Chris Galvan fba7d73c57 Extended sub image pixel API to support component indexing. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-28 11:10:33 -06:00
John Jones-Steele b34a955c3d Fixed platform settings not using unique values for Android and iOS (#7198) 
* Fixed platform settings not using unique values for Android and iOS

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

* Removed unnecessary comment

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

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2022-01-28 16:38:33 +00:00
Thomas Poulet 3a0edd2dd1 Move reflection probe fp file and fix missings in cmake file list (#7189) 
Signed-off-by: Bindless-Chicken <1039134+Bindless-Chicken@users.noreply.github.com>
 2022-01-28 10:30:30 -06:00
Jackerty e03d9eefd9 Moves Culling.cpp::ProcessWorklist debug variables under preprocessing (#7043) 
Function Culling.cpp::ProcessWorklist has couple variable which are unsused when compiling profile causing
a -Werror compile error. Fixes is to move variables and code increment them under debugging ifdef.

Signed-off-by: Jackerty <contact.jackerty@gmail.com>
 2022-01-28 10:13:24 -06:00
SergeyAMZN ff79931d1d Merge pull request #7171 from aws-lumberyard-dev/TerrainMaterialsFix 
LYN-7637 Allow Terrain Physics Collider to assign a default physics material
 2022-01-28 12:47:23 +00:00
santorac fa037d5d7d Updated MaterialSourceData::CreateMaterialAssetFromSourceData to use MaterialUtils::LoadMaterialTypeSourceData which calls ConvertToNewDataFormat(). This was needed by Material Editor to succesfully load old-format material types. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-27 16:49:17 -08:00
Gene Walters e19dc40994 Merge pull request #7211 from aws-lumberyard-dev/issues/7196_OutofDateNetTestGraph 
Multiplayer Test Script: Replacing an Out-Dated Script Node
 2022-01-27 16:42:50 -08:00
Allen Jackson 226fa6ab09 {lyn5525} fixing the chunk mesh group logic for the Blast gem (#7202) 
fixing the chunk mesh group logic for the Blast gem so that the
chunks are defined both as a selected mesh node and unselect all
the rest of the mesh nodes

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2022-01-27 18:33:49 -06:00
santorac c2e220ce49 Renamed property 'set' to property 'group' for consistency with the prior naming. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-27 16:11:26 -08:00
lsemp3d 1a8fdd9c84 Script Canvas: Added take screenshot button to toolbar 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-27 15:45:33 -08:00
santorac 1de540ae3f Updated code to use span instead of array_view as this was replaced on the development branch. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-27 14:48:50 -08:00
Scott Romero 8ecaaf36c0 [development] updated Profiler interface to allow the forwarding of format string arguments (#7173) 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2022-01-27 14:43:52 -08:00
Ronald Koppers b695bfa832 Merge pull request #7145 from aws-lumberyard-dev/Prefabs/PlayInEditorMissingAssets 
Fixed missing assets when entering Play-In-Editor.
 2022-01-27 14:41:11 -08:00
santorac b9a80dee32 Fixed newline at end of file. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-27 14:17:09 -08:00
santorac 5e2bf1a468 Reverted changes to most of the material type files. I'll update those in a separate PR. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-27 14:14:50 -08:00
Chris Galvan 9f8b32f20b Merge pull request #7201 from aws-lumberyard-dev/cgalvan/RemovedUnusedViewPaneClass 
Removed legacy IViewPane Editor class
 2022-01-27 15:53:13 -06:00
Ken Pruiksma 7946886126 TerrainDetailMaterialManager to use ClipmapBounds for its detail mateiral id texture. (#7182) 
* Switching TerrainDetailMaterialManager to use ClipmapBounds for its detail mateiral id texture. This results in a lot of code removal and some simplifications for the shader.

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

* Changing some names to be clearer

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

* Reducing the update multiple back to 1 since this texture is updated purely on the CPU

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

* Updates from PR review

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2022-01-27 15:33:23 -06:00
Steve Pham cc1e86ccde Fix failing scene compilations on Linux (#7187) 
* -Moved substitution of '.' to '_' in the relativeSourcePath AFTER the relativeSourcePath is computed
* Update PrefabeBehaviorTests to support updates for this fix

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-01-27 13:26:01 -08:00
Mike Balfour c36b2fbbd6 SurfaceData cleanups to prepare for bulk APIs (#7166) 
* Initial cleanup of GetSurfacePointsFromRegion in prep for bulk API support.
* Removed the generated lookup point from the output structure. Nothing was using it, and by keeping it separate, I can pass it in as a list of points that can be passed throughout the terrain, gradient, and surface data APIs.
* Clarified on the SurfaceProvider bus that GetSurfacePoints() only gets valid XY values on the inPosition.
* Simplified the TerrainSurfaceDataSystemComponent implementation a bit.  The EnumerateHandlers() and the terrain Aabb checks were overkill. Also, the terrain Aabb check assumed that the Z value on the inPosition was valid, which it isn't always.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Remove CryCommon dependency.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2022-01-27 15:22:47 -06:00
Gene Walters e2f041b1ae Replacing an out-dated script node 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-27 13:17:37 -08:00
santorac 906db920d0 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes3 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-27 12:58:22 -08:00
Guthrie Adams 09ff46b445 Merge pull request #7177 from aws-lumberyard-dev/Atom/guthadam/atom_tools_move_me_performance_monitor_statusbar_labels_to_atf 
Atom Tools: move performance metrics status bar widgets to base window
 2022-01-27 14:47:42 -06:00
AMZN-koppersr 3a08a3b325 Removed some unused local variables. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2022-01-27 12:38:57 -08:00
Scott Romero f7f17c98b4 [development] fixed ambiguous 'byte' type MSVC build error (#7184) 
- fully quality 'byte' type in AZStd::span
- remove unnecessary 'using namespace AZStd;' statement from AssetCatalog tests

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2022-01-27 11:12:15 -08:00
AMZN-koppersr 4471b7008d Merge branch 'development' into Prefabs/PlayInEditorMissingAssets 2022-01-27 09:51:06 -08:00
AMZN-koppersr 94919fe270 Moved Serialize Context retrieval out of a loop and expanded an error message in InMemorySpawnableAssetContainer::LoadReferencedAssets. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2022-01-27 09:47:12 -08:00
Sergey Pereslavtsev bb93dd3315 PR feedback + refactored some code duplication in tests 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-01-27 16:08:22 +00:00
Chris Galvan cc6f687359 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/RemovedUnusedViewPaneClass 2022-01-27 09:56:47 -06:00
greerdv b1492c1fb0 Merge pull request #7199 from aws-lumberyard-dev/nus-component-mode-fix 
fix for changes in non-uniform scale component mode not persisting
 2022-01-27 15:51:15 +00:00
Chris Galvan 753d15b0f8 Merge pull request #6758 from aws-lumberyard-dev/cgalvan/DraftStreamingImageAssetPixelAPI 
Added pixel retrieval API to StreamingImageAsset
 2022-01-27 09:32:30 -06:00
greerdv 61b494a3c7 fix for changes in non-uniform scale component mode not persisting 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-27 13:56:24 +00:00
Benjamin Jillich bbd91755ea EMotion FX: Recent files menu in Animation Editor also shows files from external gems (#7160) 
Recent files were only shown from sub-folders of the project and assets from gems (inside project and external) were not visible.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2022-01-27 13:23:39 +01:00
santorac a4346de658 Code cleanup. New comments. Added some non-const find functions to MaterialTypeSourceData. Fixed places where I forgot to change m_name to GetName(). 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-26 23:54:25 -08:00
Roman e2c4c0e5e3 Atom viewport render option bugfix (#7158) 
* Render option bugfix

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

* add aznumeric_cast

Signed-off-by: rhhong <rhhong@amazon.com>
 2022-01-26 19:41:38 -08:00
santorac e0cee13747 Code cleanup. 
Made PropertyDefinition::m_name private.
Moved code around for a cleaner diff in MaterialTypeSourceData.h.
Added API comments.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-26 18:10:02 -08:00
Guthrie Adams 413ce5a6ab Atom Tools: move performance metrics status bar widgets to base window 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2022-01-26 20:05:21 -06:00
Esteban Papp 75d39d9ce5 makes bucket variables atomic (#7179) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-26 17:51:20 -08:00
Mike Chang 5ebe3d12df Add file exists conditional for ebs_snapshot stash command (#7178) 
Signed-off-by: Mike Chang <changml@amazon.com>
 2022-01-26 17:11:58 -08:00
Chris Galvan f368997deb Modified the passing of span in test 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-26 19:06:57 -06:00
Chris Galvan 2f4ff1072c Merge pull request #7170 from aws-lumberyard-dev/cgalvan/RemovedLegacyEditorConfigSpec 
Removed legacy Editor config spec
 2022-01-26 19:03:11 -06:00