birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,276 Commits 3 Branches 3 Tags
fc2053fad9dbfdff14607fbc98aaa6baea5686ec
Commit Graph

2021 Commits

Author SHA1 Message Date
cgalvan 13a40aba02 Merge pull request #602 from aws-lumberyard-dev/cgalvan/FixedEmptyFloatingWindow 
[LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window.
 2021-05-06 11:46:51 -05:00
jonawals fee010f602 Fix test utils. 2021-05-06 17:04:22 +01:00
Benjamin Jillich 32b1d52341 [LYN-2515] Added shared gem info class (#574) 2021-05-06 18:01:13 +02:00
jonawals 31312606b1 Fix unused variable warning. 2021-05-06 16:50:52 +01:00
Chris Galvan 7dec09d9ae [LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window. 2021-05-06 10:40:24 -05:00
jonawals 006a9ce85f Fix unused variable warning. 2021-05-06 16:33:40 +01:00
jonawals f47f712bd0 Fix missing pragma directive. 2021-05-06 15:53:54 +01:00
jonawals d880aa5d22 Fix anonymous namespaces for unity builds. 2021-05-06 15:33:02 +01:00
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-05 20:07:49 -07:00
karlberg a1fe8fe419 Ported the local prediction player controller component 2021-05-05 20:07:16 -07:00
AMZN-koppersr 4661da23bb Cleaned up the flags in the BaseJsonSerializer.h 2021-05-05 17:51:22 -07:00
AMZN-koppersr ec52e51476 Additional unit tests for the Json Serialization to make sure custom json serializer work if they're the first used through the higher Load/Store calls. 2021-05-05 17:22:57 -07:00
AMZN-koppersr 6ad135f35c Fix for smart pointers being loaded through the main load point with a default JSON object. 2021-05-05 16:41:54 -07:00
pappeste 9fe893830c sine fixes to AP model handling, still getting some sporadic asserts in debug 2021-05-05 16:22:13 -07:00
pappeste e63c360194 small unrelated fix 2021-05-05 16:21:41 -07:00
AMZN-nggieber 724add6365 Fix Project Manager Qt Ui files not Being Autogenerated (#588) 
* Moved Qt files into to renamed 'S'ource

* Updated files after moving all Qt folder into Source

* Updated Source capitalization in cmake files list

* Adding newline to the end of project_manager_files.cmake

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-05-05 15:45:39 -07:00
AMZN-koppersr 790e41f675 Reverted previous fix. 2021-05-05 14:21:53 -07:00
Zaladane 1455fcbde6 Asset Bundler - Minor Feedback (#550) 
Asset Bundler - Minor Feedback

* updated the formatting so all lines are shorter than 140 characters

* fixed a few nitpicks that came up on a recent PR

* removed a function that wasn't being used anymore

* updated some error messages based on PR feedback
 2021-05-05 13:59:37 -07:00
lumberyard-employee-dm 5b98227a77 Adding newline to the end of project_manager_files.cmake 2021-05-05 14:58:31 -05:00
nggieber 2044832bb1 Updated Source capitalization in cmake files list 2021-05-05 12:41:05 -07:00
bosnichd 5783bf635b Fix for LoadLevel not being called. (#584) 2021-05-05 13:35:50 -06:00
nggieber 625aa14aa8 Updated files after moving all Qt folder into Source 2021-05-05 12:31:17 -07:00
nggieber 76ffff8bb5 Moved Qt files into to renamed 'S'ource 2021-05-05 12:29:06 -07:00
AMZN-nggieber 83e2ec6800 Project Manager - Barebones UI Made for All Screens with Basic Flow (#507) 
* Created all barebone screens, a screen factory, and connected basic transitions between screens

* Changed ProjectManager namespace to O3DE::ProjectManager, removed empty new lines, switch to aznumberic_cast usage

* Project Manager - Moved Qt directory into source
 2021-05-05 10:46:34 -07:00
SergeyAMZN dd90c590aa Merge pull request #564 from aws-lumberyard-dev/MultiplayerPipeline 
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
 2021-05-05 18:17:44 +01:00
AMZN-stankowi a7224b6379 Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 (#391) (#560) 
Removing FBX SDK, LYN-1045. If you have an issues please reach out to the Helios team.
 2021-05-05 09:29:12 -07:00
Terry Michaels 01976a890c Removed wireframe from perspective menu and fixed crash on right click (#575) 2021-05-05 11:10:19 -05:00
rgba16f 7b95b5e329 Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID 
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
 2021-05-05 10:34:17 -05:00
bosnichd d7b796fd73 Remove I3DEngine CryCommon Interface (#567) 
Delete:

- I3DEngine
- Missions
- Time of day
- GameEffectsSystem Gem
- ImageProcessing Gem
- SVOGI Gem
- Various other things that don't do anything now that the legacy renderer has been removed.
 2021-05-05 09:07:28 -06:00
greerdv 45cbe4767f adding comment to AddNonUniformScaleButton 2021-05-05 15:14:50 +01:00
greerdv a49017ec23 merging from main 2021-05-05 13:26:08 +01:00
cgalvan b4e69d3933 Merge pull request #557 from aws-lumberyard-dev/cgalvan/RemoveUnusedCSelectionGroupUsages 
[LYN-3347] Removed some unused references to CSelectionGroup.
 2021-05-05 07:17:10 -05:00
greerdv e1f7d04bc2 adding icon for non-uniform scale component 2021-05-05 13:10:01 +01:00
Tom Hulton-Harrop cec56d7b27 Merge pull request #546 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-4 
Camera Updates - Part 4
 2021-05-05 09:46:56 +01:00
sphrose 7eb6cc10b6 Made change affect all modifiable containers. 2021-05-05 08:57:39 +01:00
jonbeer 7963924b6a Removing extra commented code 2021-05-04 18:27:09 -07:00
jonbeer 5e6d058a43 Removing default case to fix crash and updating tests 2021-05-04 18:23:02 -07:00
pereslav 30625cf5d3 merge from main 2021-05-05 00:09:25 +01:00
pereslav e414cc151d SPEC-6590 Implemented network entities instantiation by network spawnable asset ID 2021-05-05 00:00:06 +01:00
greerdv cd93df4ca8 hiding button to add non-uniform scale when there already is a NUS component on the entity 2021-05-04 23:15:51 +01:00
jonbeer b55e881225 Merge branch 'main' into Prefab/PhysX/ColliderFixes 2021-05-04 15:08:37 -07:00
rgba16f 27472169e2 Change global default scene debug draw id variale declare from static constexpr const to inline constexpr 2021-05-04 17:06:22 -05:00
Chris Galvan 9e105fb769 [LYN-3347] Removed some unused references to CSelectionGroup. 2021-05-04 16:52:36 -05:00
AMZN-koppersr 2d4a17a2fb Merge branch 'main' into JsonSerializationPointerFix 2021-05-04 13:53:03 -07:00
AMZN-koppersr afcbe4e02b Small updates based on PR feedback. 2021-05-04 13:51:08 -07:00
srikappa-amzn a5ccfa6053 Merge pull request #456 from aws-lumberyard-dev/Prefab/CreatePrefab 
Fix undo for nested prefab creation by providing link patches to the undo node
 2021-05-04 13:20:37 -07:00
rgba16f 1c1a9aeab4 Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID 2021-05-04 14:40:31 -05:00
rgba16f 593528532f Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId 2021-05-04 14:36:48 -05:00
Aaron Ruiz Mora f770e4aa7a Unifying operators in Matrix3x3, Matrix3x4 and Matrix4x4 
- Add operators +, -, * and / too all matrix classes
- Add RetrieveScaleSq and GetReciprocalScaled to all matrix classes
- Add unit tests to all matrix classes
- Fix a bug that causes release configuration not to compile.
 2021-05-04 19:12:01 +01:00
AMZN-koppersr 11b79f567a Smart and raw pointer support in Json Serialization now behave similarly. 
The behavior of smart pointers was not updated after the changes to raw pointers, in particular with how default JSON Objects were handled. They both now treat an empty JSON Object (a.k.a. the id for default instances) as meaning to create a default instance on the pointer even if the default is a nullptr. To have a nullptr a JSON Null has to be explicitly written.
 2021-05-04 11:10:46 -07:00