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

8166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allen Jackson 900aa4e5bc {lyn7065} adding ProcPrefab Prefab::Tempate flag method (#4765) 
* {lyn7065} adding ProcPrefab Prefab::Tempate flag method

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

* updated based on comments

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

* moved validation logic to IsValid()

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

* added more guards around the source string


Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2021-10-20 12:22:11 -05:00
AMZN-Phil 023e8fcff2 Add missing files for review 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-20 10:21:15 -07:00
AMZN-Phil e8cd6add51 Merge remote-tracking branch 'upstream/development' into ReturnCachedGemJsons 2021-10-20 10:00:39 -07:00
rgba16f [Amazon] c6afb1f0a3 Update all the hardcoded filenames inside the level.pak file to be lowercase now the editor no longer forces them to be lower case. (#4802) 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-10-20 10:35:31 -05:00
AMZN-AlexOteiza 181d12625f Reorganized Prefab tests and standarization (#4786) 
* Reorganized Prefab tests and standarization

* Restore changed file by accident
 2021-10-20 16:16:04 +01:00
AMZN-AlexOteiza 38f9dcb8ca Added option to reopen if the current level is the same. This contributes to stability for batched tests (#4043) 
* Added option to reopen if the current level is the same. This contributes to stability for batched tests

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments

* Addressed PR and cleaned Base level that had an entity by accident

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Cleaned up params

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments
 2021-10-20 14:55:20 +01:00
jonawals a1ee7b5a31 Merge pull request #4725 from aws-lumberyard-dev/hultonha_LYN-7394_focus_cursor 
Updates to support 'lock'/'forbidden' cursor when in Focus Mode
 2021-10-20 14:55:01 +01:00
AMZN-Olex 9e4a39f9ed Hierarchy code enhancements 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-20 09:30:21 -04:00
SergeyAMZN 2971dc9a3e Merge pull request #4425 from aws-lumberyard-dev/NetHierarchyInput 
Network hierarchy input processing
 2021-10-20 13:18:12 +01:00
Sergey Pereslavtsev 8e520c8db8 PR feedback 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-10-20 12:36:35 +01:00
AMZN-Phil 02364b869e First part of UI feedback for downloading gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-19 19:48:36 -07:00
amzn-mike f31b47f775 Switch stacktrace output to use Output function instead of AZ_Printf to avoid it being suppressed accidentally (#4805) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-10-19 16:51:34 -07:00
Luis Sempé cd1b08ce72 Merge pull request #4748 from aws-lumberyard-dev/animation/rhhong/renderOptions 
Add toolbar for anim viewport and some more camera controls.
 2021-10-19 15:21:34 -07:00
Scott Romero 10b175e453 [development] promoted Atom CPU profiler into its own gem (#4742) 
Extracted the CPU data and visualization systems out of Atom and turned them into a separate gem

NOTES:
 - A large portion of this change is code restructuring. The only changes made to such code was the minimum necessary for it to work in the new location.
 - The *CpuProfiler* files shown below as deletes/adds were originally moves (see 6946145), my guess is the namespace/formatting change in d193dc4 is the culprit for this.
 - There is one minor outstanding issue post move which is related to how the live CPU frame graph is displaying in the ImGui window. All the data is there and correct but the frame boundary is anchored to the wrong side (left instead of right).

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-10-19 14:20:30 -07:00
Mike Chang 8ab1cfacf5 Fixes for Test Screenshot upload build step (#4792) 
Fixes the test screenshot upload build step:

- Added missing positional parameters
- Double quoting the command statements to allow variable expansion (also fixes broken Python call)
- Escaping the double quotes within the command statement

Signed-off-by: Mike Chang <changml@amazon.com>
 2021-10-19 14:06:03 -07:00
Nicholas Van Sickle 1474cfdcbf Attempt a sanity check to ensure the Atom debug camera doesn't get an invalid aspect ratio (#4196) 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-10-19 13:41:20 -07:00
Guthrie Adams 9f5187b8bb Merge pull request #4772 from aws-lumberyard-dev/Atom/guthadam/prevent_multiple_preview_renderers 
Additional preview renderer checks to prevent multiple instances from being instantiated and remove images from the cache when entities are destroyed
 2021-10-19 14:41:49 -05:00
AMZN-ScottR 55bc403cd8 [atom_cpu_profiler_gem_promotion] added missing configuration entries pointed out in PR 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-19 12:15:28 -07:00
kberg-amzn c228e77e1c Fixes a bunch of bad casts in hierarchy tests 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-19 12:11:56 -07:00
Guthrie Adams 2625f1a3ac Merge branch 'development' into Atom/guthadam/prevent_multiple_preview_renderers 2021-10-19 13:47:33 -05:00
Guthrie Adams 132833238f Fixing compilation error and bug with counter 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-19 13:46:23 -05:00
AMZN-ScottR 1b1ef46d9d Merge branch 'development' into atom_cpu_profiler_gem_promotion 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-19 10:58:35 -07:00
AMZN-ScottR 02754ccbd0 [atom_cpu_profiler_gem_promotion] more quick small changes based on PR feedback 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-19 10:44:14 -07:00
Sergey Pereslavtsev e3a14c0809 Fixed warning about unused local variable 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-10-19 18:42:35 +01:00
Junbo Liang 34ec8cfc47 Add GameLift to the AWS menu (#4716) 
* Add GameLift to the AWS menu

Signed-off-by: Junbo Liang <junbo@amazon.com>
 2021-10-19 10:30:02 -07:00
puvvadar 66c4950de0 Merge pull request #4529 from aws-lumberyard-dev/mp_deltaserializer_perf 
Reworking DeltaSerializer to no longer require string based hashes
 2021-10-19 10:22:37 -07:00
Sergey Pereslavtsev faea65e840 Removed pragma once from cpp 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-10-19 17:59:06 +01:00
Guthrie Adams 65dd97af48 Merge branch 'development' into Atom/guthadam/prevent_multiple_preview_renderers 2021-10-19 11:58:52 -05:00
Guthrie Adams f0bf0b6e9c correcting const casing 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-19 11:57:40 -05:00
Benjamin Jillich 08ff38a7f1 EMotion FX: Adding/Removing/Changing Components to an Entity with Actor Component erases the "Motion extraction joint" (#4780) 
Applying meta data onto actors failed as the commands use the actor manager to search them by ID but the actor manager now stores actor assets. The temporarily created actor in the actor exporter was not registered at the actor manager for that reason and the commands were failing to find the actor. This resulted in that all meta data for actors could not be applied on the actors.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-10-19 18:28:24 +02:00
amzn-phist 005702b4bd Improve the errors in EngineFinder.cmake (#4713) 
* Improve the errors in EngineFinder.cmake

Added additional info on one of the errors to help users resolve the
issue (engine registration).
Improved readability of the errors.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Adds another error message to EngineFinder.cmake

An error message where the user's manifest is present and valid
but no matching engine name was found has been added.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-10-19 11:25:14 -05:00
Guthrie Adams fa3f3e4285 Merge pull request #4618 from aws-lumberyard-dev/Atom/EditorColorGrading 
Implement LUT Generation Pass and hook up into Editor
 2021-10-19 11:00:46 -05:00
Guthrie Adams 7c563efefd Merge branch 'development' into Atom/guthadam/prevent_multiple_preview_renderers 2021-10-19 10:49:12 -05:00
amzn-mike c1335f69c6 Convert resolved wildcard paths to relative path before saving in database (#4574) 
* Convert resolved wildcard paths to relative path before saving in database.

Warn if file could not be converted to a relative path.
Fix FindWildcardMatches path handling that could result in pathMatch missing the first character

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Handle abs path wildcard dependencies

Remove dependencies outside of scan folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to AZ::IO::PathView for abs path check

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Made code a little more clear

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-10-19 08:42:18 -07:00
AMZN-Phil 7ce376b5b2 Add some log output if the cached files cannot be found 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-19 08:40:36 -07:00
pereslav 725be128aa tidy up 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-19 16:20:40 +01:00
jonawals 0031016548 Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix 
Fix for PyTest editor test case names.
 2021-10-19 16:13:56 +01:00
jonawals befb97a80e Merge pull request #4627 from aws-lumberyard-dev/igarri/Fix-Viewport-camera-locations 
Make Go To Location affect the Default Viewport Camera
 2021-10-19 14:45:13 +01:00
amzn-sean 82b731b673 Increase the timeout for ForceRegion_LinearDampingForceOnRigidBodies. (#4784) 
The Test runs with a wait_for_condition, and the original timeout was right on the edge of how long the test takes to reach that condition.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-10-19 13:59:00 +01:00
pereslav 62971fa7bd PR feedback, removed unnecessary code 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-10-19 13:52:32 +01:00
John ae6005545e Fix for PyTest editor test case names. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-19 13:23:23 +01:00
rhhong bfa600ede4 CR feedback 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-10-18 22:29:36 -07:00
rhhong 32833c68c7 CR feedback 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-10-18 22:27:21 -07:00
Sean Sweeney 064a72bbac Merge pull request #4766 from aws-lumberyard-dev/remove_remoteconsole_test 
removing remote console smoke test
 2021-10-18 21:32:20 -07:00
AMZN-Olex ed43e7ef00 Merge branch 'Network/olexl/hierarchy_optimizations_cr' of https://github.com/aws-lumberyard-dev/o3de into Network/olexl/hierarchy_optimizations_cr 2021-10-18 22:54:12 -04:00
AMZN-Olex ceb9b7afd7 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/hierarchy_optimizations_cr 2021-10-18 22:54:06 -04:00
AMZN-ScottR 55bca4658f [atom_cpu_profiler_gem_promotion] quick small changes based on PR feedback 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-18 17:54:08 -07:00
Nicholas Van Sickle 3485bc08b1 Fix EntityOutlinerTest (#4771) 
The test was relying on immediate updates from the prefab system which are now scheduled for a later tick - this reworks the tests to wait for deferred updates before validating state

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-10-18 17:14:19 -07:00
puvvadar 87b5ac4236 Remove extra new lines 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-18 17:04:56 -07:00
AMZN-Phil c48d957485 Slightly better variable naming 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-18 16:34:07 -07:00