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

8702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Balfour 008e825bd2 Merge commit 'bf6fd2a6d6b09a87c2478d389efc306d1215ecb5' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:46 -05:00
Mike Balfour a40700be2b Merge commit '49da85ca3a4acb633d9c63abcd43f485905aeb92' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:40 -05:00
Mike Balfour 576ebada70 Merge commit '8b5a0350b57486bbfa04f1233abfd3a086c25ea1' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:35 -05:00
Mike Balfour bad4c1a276 Merge commit '8f56dc10c33ae73acaa99c8690e8bc91a1cec2bc' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:30 -05:00
Mike Balfour ae1a47df2d Merge commit 'd948d78b2e451d96cee8a69fdb03493a52ee565a' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:25 -05:00
Mike Balfour 1d22eddf71 Merge commit 'ecd11a441ce08e6767ab2ce732513e963b9acbbe' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:20 -05:00
Mike Balfour 7d863757e7 Merge commit 'c183764379acc4ab5b947fa057994524e76b2d03' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:15 -05:00
Mike Balfour 122a28c4b4 Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:09 -05:00
Mike Balfour 9589bc050d Merge commit 'd3ff91f15346328e82e4e4fb293256ff3b026b1c' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:04 -05:00
Mike Balfour 402d4d664f Merge commit 'cf767fd4bd038e39512a0f193dfd7cb536a9700f' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:59 -05:00
Mike Balfour d37ba2d713 Merge commit '4ccbb964f3508824c75a8e0a78aa4da582b510c5' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:53 -05:00
Mike Balfour 508748f39c Merge commit '8aecd6668ae21db3cb80e0063db9d0b37b44f802' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:48 -05:00
Mike Balfour a7f364a5d6 Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:43 -05:00
Mike Balfour 7f48135a1a Merge commit '5db6ffb6f3a0a5bd370785c0ae3778679c8b0bfc' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:38 -05:00
Mike Balfour 49c827c3a2 Merge commit 'b4dd4c8f02842b99049bfef46985234d92d34a0e' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:33 -05:00
Mike Balfour 5b4e840c5c Merge commit '5fe2207892a29b62e9f3d97412f2688dd568a928' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:27 -05:00
Mike Balfour bc929fc2f5 Merge commit '021917ad274bc805417bbe6f9e221817c6daede7' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:22 -05:00
Mike Balfour 6c4a67651e Merge commit '9dac7270928d67e1afdba0fe842df0358fb27563' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:17 -05:00
Mike Balfour 5867ab6bde Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:12 -05:00
Ken Pruiksma d52ce49dcb Terrain macro material fixes (#5182) 
* Minor fixes for macro materials
- When macro image views are no longer used, they will explicitely be set to nullptr
- limiting for loop in shader to the number of macro materials total so it doesn't read unitialized memory

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

* Removing parts of the terrain shader no longer used.

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

* Fixing normalization in shaders, adding default valus for all structs used in SRGs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-11-02 09:27:10 -05:00
moraaar 0ccd55f945 Added PAL to blast and whitebox tests to only enable automated tests on supported platforms: windows only at the moment. (#5165) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-02 09:28:31 +00:00
hultonha de6af361ab Do not clear input channels everytime focus changes (#5044) 
* remove HandleFocusChange from FocusIn/Out events in QtEventToAzInputManager

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure we clear input channels when application state changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* wip changes for focus switching tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to test to verify focus change not affecting input

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to ensure input is not cleared when focus changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure key press goes to correct widget

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to verify input is cleared when application state changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* clear input for all types of application state change

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update input key for focus test

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* use the Settings Registry to tell the InputSystemComponent to disable various devices

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update how we simulate the application state change event

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* revert Settings Registry changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-11-02 09:19:06 +00:00
hultonha bf6fd2a6d6 Add missing reflection calls for various types (#5163) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-11-02 09:18:42 +00:00
jromnoa 5b0f345052 PR fixes to clean up syntax and variable names also to remove a change from another PR 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-02 00:03:50 -07:00
jromnoa a8efd5da95 add the correct paths for Light component test and use the 'Base' level instead of 'auto_test' level to resolve remaining issues with screenshot angles 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-01 23:42:14 -07:00
rhhong f089187f3a Merge branch 'development' into animation/rhhong/render_settings_merge 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-01 23:06:09 -07:00
jromnoa 2329e4302f Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 2021-11-01 21:10:16 -07:00
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 2021-11-01 20:23:27 -07:00
Neil Widmaier 4a57b13a0e Adding P0 Occlusion Culling Plane test 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2021-11-01 17:11:07 -07:00
Alex Peterson 49da85ca3a Fix new project path when enabling gem (#5173) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-01 16:07:57 -07:00
Allen Jackson 8b5a0350b5 {lyn7621} adding more time via ap_max_activate_time (#5180) 
* adding more time via ap_max_activate_time so that the Debug
  version of AP-GUI can load all the builder DLLs

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2021-11-01 17:27:17 -05:00
Esteban Papp bf0a309a3c copy commands need to be per permutation/per configuraiton (#5183) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-01 15:18:30 -07:00
Vincent Liu 96159c1e3a Add missing exclamation mark for documentation (#5144) 
* Add missing exclamation mark for documentation

Signed-off-by: onecent1101 <liug@amazon.com>

* Add more

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-11-01 14:52:40 -07:00
chiyenteng 6862b52069 Convert several physics automated tests with Base test level file converted to prefab file (#5138) 
* Convert some physics automated tests to use prefab system

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

* revert changes

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

* Fix file names

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-11-01 14:27:22 -07:00
Qing Tao 8da6bea073 ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene crea… (#5153) 
* ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene created by PreviewRenderer but not the Main Scene
Deprecate GetDefaultScene() function.
Update all the places which use GetDefaultScene to use Scene::GetFeatureProcessorFromEntityId or GetMainScene.
Tested with Editor, UI Editor, Material Editor, game launcher.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-11-01 14:26:55 -07:00
amzn-mike 916fb413c9 Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object (#5176) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-01 14:19:27 -07:00
Chris Burel 8f56dc10c3 Perform sse float comparisons with the floating-point intrinsics (#5115) 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-01 16:11:34 -04:00
Gene Walters fa32940205 Adding logs to dedicated-server start up (unable to use for automated testing just yet since remote console cant be connected that early). Adding pytest check to make sure AutomatedTesting.ServerLauncher is running. Moved sveditor_port to MultiplayerEditorConnection since it was never actually getting used when it was in EditorSystemComponent (dedicated servers dont know about editor) 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-01 13:01:59 -07:00
Danilo Aimini d948d78b2e Merge pull request #5170 from aws-lumberyard-dev/daimini/cherrypick/outlinerEntityOrderingFix 
Cherry-pick: resolve entity ordering for EntityOutliner
 2021-11-01 12:41:58 -07:00
Guthrie Adams ecd11a441c Merge pull request #5152 from aws-lumberyard-dev/Atom/guthadam/material_component_json_serializer 
Created custom JSON serializer for editor material component
 2021-11-01 13:56:35 -05:00
Chris Galvan c183764379 Merge pull request #5169 from aws-lumberyard-dev/cgalvan/PythonToolGemplateGitignore 
Added .gitignore for __pycache__ and pyc files to the python tool gemplate
 2021-11-01 13:51:48 -05:00
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-01 11:43:19 -07:00
AMZN-ScottR 9057cfbcbf [profiler_capture_api] fixed release compile error 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-01 11:41:44 -07:00
Tommy Walton c87670bbfb Fix innocuous release build error in RPIUtils LoadStreamingTexture (#5021) 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-01 11:38:45 -07:00
Guthrie Adams 1228738bb2 Merge pull request #5166 from aws-lumberyard-dev/Atom/guthadam/moving_script_asset_registration_to_script_system_component 
Removing redundant registration of script assets
 2021-11-01 13:20:34 -05:00
Esteban Papp edf5e7a242 Cleanup of validation script exclusions (#5134) 
* Validation lists cleanup

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

* more cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-01 11:06:37 -07:00
Esteban Papp 2cc4f322b7 Skips signing when there is no upload URL (#5120) 
* Skips signing when there is no upload URL so we can run the scripts locally

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

* Fixes prebuild command and improves post build command to not depend on psiexec

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-01 11:06:04 -07:00
Michael Pollind 9886603f99 Bug Fix: resolve entity ordering for EntityOutliner (#4798) (#4938) 
* bugifx: resolve dragging behaviour for EntityOutliner (#4798)

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

* chore: cleanup and rework logic

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-01 10:35:32 -07:00
Brian Herrera fa83a1fff8 Merge pull request #5146 from aws-lumberyard-dev/devops/update-snapshots 
Update snapshots list to stablization/2110
 2021-11-01 09:59:51 -07:00
Chris Galvan 7ac69c51db Added .gitignore for __pycache__ and pyc files to the python tool gemplate. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-01 11:49:19 -05:00