birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,652 Commits 3 Branches 3 Tags
03e5fd213cc0b00a6020c3812e3aa2a6a688554b
Commit Graph

9652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
amzn-phist 5c71a7481d Modify resource limit function to warn (#5807) 
The function that modifies resource limits will return true always and warn instead
of giving an error.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-11-22 10:53:59 -06:00
Terry Michaels 85681703dc Merge pull request #5802 from o3de/mcphedar-patch-1 
Updating the name of the AR bug template
 2021-11-22 09:46:16 -06:00
moraaar ab1b6d057d Fixed unused variable warning in Release configuration in Linux. (#5830) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-22 13:25:29 +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
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
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
puvvadar 1aa444d669 Update build copy back to Developer Preview 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-11-19 11:40:01 -08: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
mcphedar 278fdb63b4 Updating the title of the template 
Signed-off-by: mcphedar <mcphedar@amazon.com>
 2021-11-19 12:49:45 -06:00
Shirang Jia c0080d6b1f Archive ap logs on s3 (#5620) 
* Archive ap logs on s3

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

* Update copy_file.py

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

* Fix syntax from bad copy

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

* Change underscore in argument name to dash

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

* Add a general ArchiveArtifactsOnS3 function so we can use it to archive any files on S3

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

* Swap order of excludes and includes

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

* Change artifactsSourceDir to artifactsSource since the value can be either a file or a directory

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

* Fix parameter

Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2021-11-19 10:45:09 -08:00
mcphedar 5af76000aa Updating the name of the AR bug template 
Signed-off-by: mcphedar <mcphedar@amazon.com>
 2021-11-19 12:36:11 -06: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
puvvadar edea1e560b Remove build debugging 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-11-19 10:07:01 -08:00
lumberyard-employee-dm b0dc1ea6fa CMake Xcode Generator fix (#5771) 
Removed the generator expression from the `LY_ARCHIVE_FILE_SEARCH_MODE` define as Xcode doesn't support per-config per-file definitions.

Updated the #else block in ArchiveVars to default to PakOnly mode if the `LY_ARCHIVE_FILE_SEARCH_MODE` define isn't set.

Moved the the `LY_ARCHIVE_FILE_SEARCH_MODE` Cache Variable from cmake/Deployment.cmake to feature_options.cmake within the AzFramework folder.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-19 11:23:38 -06: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 0c1a0391fa Merge commit '77279bfd55396524d3ba00c7b4407237e546035d' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:22 -08:00
puvvadar 7e9516eadf Merge commit '8fd9cbfb6456472473ec558c21de9aaa152a53c4' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:16 -08:00
puvvadar 40aff91f18 Merge commit 'ebb24d2285635ee8bd840a5b58b1a519b73d8c0a' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:10 -08:00
puvvadar e8ffc4eaea Merge commit '11f41a4467e4d1daf64a4c72209c26f3e5a2d7ba' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:04 -08:00
puvvadar 5b5e22af51 Merge commit '1f0ac46d68599296a8095967f410d196c466ec5e' into puvvadar/gitflow_211118_o3de 2021-11-19 09:18:58 -08:00
puvvadar ab58773388 Merge commit '092d125acf2eb23099e08f0d93e9b2a3b90ce016' into puvvadar/gitflow_211118_o3de 2021-11-19 09:18:52 -08:00
puvvadar 87b338f5f6 Merge commit 'e50735c127d9a3a8e5f38fc737222e4b542a54f8' into puvvadar/gitflow_211118_o3de 2021-11-19 09:18:28 -08:00
puvvadar d056555388 Merge commit 'd30fdb759d07e54d36309680ffa4247f1481ceb2' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:45 -08:00
puvvadar 15a5d74330 Merge commit '199a59e8f9824cef4a5c0ac3da1683bb7ded66a6' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:39 -08:00
puvvadar e8cdff627c Merge commit '4ad6d3e9f75880558d4003474621b9ada3aef060' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:31 -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 f65f744358 Merge commit 'ac959bcc01a52f1738e439b0291dfb8b0a73b388' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:14 -08:00
puvvadar 6cd0852f8d Merge commit 'edb15946ca06072c26a5979f8a1682526ec5fce2' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:08 -08:00
puvvadar ef25271d80 Merge commit 'e8576acbb0510717d57f168096a9cc6ad0c2fbf9' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:01 -08:00
puvvadar 89235fb546 Merge commit '76d2e125c294e1183ef55320417fa34a6f9d5e27' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:56 -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
puvvadar a49496f94b Merge commit '06e5c394e2faa746b4a2bb70dd908e36e0a9bb77' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:37 -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
lumberyard-employee-dm 77279bfd55 Prevent updates to o3de_manifests.json if it is corrupted. (#5776) 
This behavior can be overridden using the --force option.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-19 11:04:53 -06: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
Tom Hulton-Harrop ebb24d2285 Improvement for click detection when clicking quickly between mouse moves (#5786) 
* improvement for click detection when clicking quickly between mouse moves

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove magic number and introduce constant

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add missing update from camera test

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-19 16:52:44 +00: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
AMZN-Phil 1f0ac46d68 Merge pull request #5731 from aws-lumberyard-dev/Prism/WindowsInstallerName 
Change developer preview tag
 2021-11-19 07:30:48 -08:00