2d1ed48fea
Merge branch 'development' into cmake/SPEC-2513_w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
2021-08-10 11:45:02 -07:00
2bf64879da
Fixed the SpinBox tests
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-08-10 14:52:09 +01:00
659e486cd7
Add an integration test to validate pick mode crash ( #2935 )
...
* add an integration test to validate pick mode crash
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* update to test after review feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-08-09 11:56:19 +01:00
f4164ef3a3
Merge branch 'development' into cmake/SPEC-2513_w4018
2021-08-06 11:57:55 -07:00
9e0b8c564d
Fixed AzToolsFramework tests ( #2887 )
...
* Fixed AzToolsFramework unit tests.
Signed-off-by: moraaar <moraaar@amazon.com >
* Include missing header.
Signed-off-by: moraaar <moraaar@amazon.com >
* Using util's class to generate temp directory, instead of qt.
Signed-off-by: moraaar <moraaar@amazon.com >
* Added empty line
Signed-off-by: moraaar <moraaar@amazon.com >
* Fixed warning in MessageTest fixture that CacheProjectRootFolder was not set
Signed-off-by: moraaar <moraaar@amazon.com >
* Additional checks in CreateDefaultEditorEntity helper function.
Signed-off-by: moraaar <moraaar@amazon.com >
* Updated the AzToolsFrameworkTest logic to set the project cache path
The Project Cache Path and Project Path is set through the CommandLine functionality of the ComponentApplication.
This allows those Project Cache Path and Project Path to be set within the Settings Registry during the ComponentApplication constructor
Removed the explicitly calls to delete the temporary directory and fixed the ScopedTemporaryDirectory class to recursively delete the temporary directory
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Setup correctly @assets@ alias for PlatformAddressedAssetCatalogManagerTest and AssetSeedManagerTest fixtures.
- These 2 test fixtures need to manually set the @asset@ alias to not include the platform at the end (which it does by default), because they are looping over platforms in their setup.
- Also initializing pointers to nullptr, so if setup fail in the future the teardown doesn't crash trying to delete garbage.
Signed-off-by: moraaar <moraaar@amazon.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-08-06 11:07:15 -05:00
eb3e0b0998
updates after merging development
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:44:03 -07:00
10f950b726
fix w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:43:56 -07:00
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
7404622b48
Clear prefab templates on new level creations and loads ( #2842 )
...
* Clear prefab templates on new level creations and loads
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
* Fixed failing prefab unit tests after change to clear templates
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-08-04 16:54:40 -07:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
909384bd34
Code/Framework compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:29:02 -07:00
ba347c1d60
Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch
2021-07-27 13:28:17 -05:00
73706fa04e
Added Tests to check code is correct
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-26 16:10:21 +01:00
731640492e
Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch
2021-07-23 16:28:45 -05:00
e76b65fce9
Reduce inclusion overhead a little bit
...
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-07-20 02:31:38 +02:00
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com >
2021-07-16 15:25:48 -07:00
6839ef1512
Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-16 12:58:39 +01:00
087c9f6edb
more fixes for Jenkins vs local behavior
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 11:40:34 -07:00
4aebea61af
Fixes for Jenkins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 09:42:02 -07:00
ae46eea1e8
Fix tests in Linux and discover path comparison problem in Windows (fixed)
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-14 20:24:15 -07:00
4a5ac0e204
Fix for ArchiveTest where the assets alias was not being set
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-14 16:45:36 -07:00
24831b1970
Code review changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-14 14:54:57 -07:00
d8ac5654d2
Merge branch 'development' into cleanup/SPEC-1670
2021-07-14 14:53:59 -07:00
5c177ef48a
Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-14 09:23:26 +01:00
da11424119
Merge branch 'development' into Prefab/BestEffortPatching
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-13 11:52:07 -07:00
b0707d3295
ensure the final vertex in a spline cannot be deleted using a manipulator
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-13 17:51:06 +01:00
4e84738ff2
Ordering file alphabetically
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 20:32:08 -07:00
1dec9d4a9a
Fix tests in AzToolsFramework now that the Trace bus is hooked
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 18:08:35 -07:00
c13720e255
fixes and cmake changes to get it to compile
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 18:08:30 -07:00
afd97abdcf
Move files to AzFramework/Test and AzToolsFramework/Test accordingly
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-12 18:08:24 -07:00
b7e3db9d82
Make prefab patch application use a best effort mechanism
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-12 11:58:14 -07:00
36a8c0a8cc
changed all amazon to o3de
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-07-12 16:34:01 +01:00
1d022907dc
Prefabs | Introduce sanitation of prefab doms on loading ( #1929 )
...
* Update PrefabLoader to sanitize ingested prefabs and have core systems operate with default values
Signed-off-by: sconel <sconel@amazon.com >
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove IsExplicitDefault implementation to avoid confusion (since the function isn't virtual).
Avoid copying PrefabDoms over in SanitizeLoadTemplate.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Address naming and commenting concerns from PR reviews.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix to error detection code
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Add support for all uuid formats for zero check.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
Co-authored-by: sconel <sconel@amazon.com >
2021-07-09 16:22:38 -07:00
51733f3809
Fix for rotation matching and resetting also scaling the entity transform ( #1856 )
...
* fix issue with rotation matching (ditto)
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* fix for context menu appearing
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* minor tidy-up in EditorContextMenu
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* add option to disable cursor during free-look
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* small fixes after PR comments
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 15:48:33 +01:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
21ebff5709
Updated help search and all docs.o3de.org links to o3de.org ( #1594 )
2021-06-25 15:23:57 -05:00
1e457928f5
Update help URLs and remove unneeded links ( #1520 )
2021-06-23 14:42:33 -05:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
e55580af57
Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18
2021-06-18 13:25:53 -07:00
108b6f8e0c
Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) ( #1405 )
2021-06-18 12:44:34 +01:00
d9b1ccd323
Add align grid button to Viewport UI ( #1311 )
...
* first pass of adding grid snapping button
* update to request current grid size
* show/hide snapping option based on selection
* small tidy-up changes
* small updates following review feedback
* added some unit tests for snapping functionality and some small tidy-up/refactoring
* small refactor to ensure snap to grid ui only appears with snapping enabled
* add missing include to resolve build error
* fixes for build
* add & to make compiler happy
2021-06-16 12:58:01 +01:00
bd8b6aea8e
Moved vector declartion inside state for loop
2021-06-15 14:12:08 -07:00
9f9c01e781
Used reserve instead of resize
2021-06-15 11:10:45 -07:00
5b4333e4b1
Added a comment and gave a variable better name
2021-06-15 11:07:43 -07:00
c8ba42d04f
Merge branch 'stabilization/2106' into BenchMarksReset
2021-06-15 10:59:36 -07:00
e4921c8d0a
Fix nested container entities not getting editor info removed during prefab processing
2021-06-11 17:45:46 -07:00
e6ec9e48b4
Changed spawnables benchmark test to create multiple spawnables at once
2021-06-11 16:17:26 -07:00
1582cb5257
Enabled instantiate benchmarks
2021-06-11 12:43:35 -07:00
Esteban Papp
John Jones-Steele
hultonha
moraaar
pappeste
srikappa-amzn
dtamkin1
nemerle
Steve Pham
hultonha
srikappa
aaguilea
Danilo Aimini
Chris Galvan
Gene Walters
Terry Michaels
nvsickle
sconel