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

5982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danilo Aimini 577c75d68d Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-16 09:43:10 -07:00
Esteban Papp 4f2d4d00ec Auto-completing the inserted text by pressing TAB within Editor's Console results in a silent crash 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 08:40:27 -07:00
jonawals 252c268ffd Fix corrupt merge. (#3142) 
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
 2021-08-16 16:09:36 +01:00
amzn-sean e630e3324d fixed joint crash when no lead entity is selected (#2867) 
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-08-16 15:46:46 +01:00
jonawals 5925bd22f6 Further subdivide TIAF data by suite. (#3128) 
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
 2021-08-16 14:15:02 +01:00
sphrose f7e536bfb1 compile fix - signed/unsigned mismatch (#3139) 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-08-16 12:37:12 +01:00
sphrose 181698b950 LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List (#3013) 
* LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Changes as per reviews.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Additional review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review change

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-08-16 10:54:15 +01:00
Steve Pham 83f6cb813a Fix Non-Unity compile error with Atom Sample Viewer and the Atom Gem (#3119) 
Signed-off-by: spham-amzn <spham@amazon.com>
 2021-08-13 18:38:48 -07:00
Steve Pham 87ae7e8653 Fix android gradle scripts to prevent cmake_dependencies.<game>.<game>_gamelauncher from being wiped out of the APK 
Update gradle script generation to correct task dependencies (#3120)
- copyNativeArtifacts must run after syncLYLayoutMode
- syncLYLayoutMode must must after externalNativeBuild

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-08-13 18:22:40 -07:00
Esteban Papp 093a03cfbc fix for non-unity mac build (#3118) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-13 15:58:01 -07:00
Danilo Aimini 564981ab0f Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 
# Conflicts:
#	Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
 2021-08-13 15:04:47 -07:00
lumberyard-employee-dm 9060423592 Settings registry notification deadlock fix (#3065) 
* Added a StealHandlers function to AZ Event

The StealHandlers function is able to take all the handlers from an AZ
Event parameter and register them with the current AZ Event

This allows stealing handlers from expiring AZ Events, which is useful
for a lock and swap algorithm for thread safety.
1. Lock persistent AZ::Event
2. Swap persistent AZ::Event with local AZ::Event
3. Unlock persistent AZ::Event - Other threads can now add to this
   AZ::Event
4. Invoke handlers from local AZ::Event
5. Relock persistent AZ::Event
5. Swap local AZ::Event with persistent AZ::Event
6. Local AZ::Event now contains handlers that were added when the lock
   was free
7. Persistent AZ::Event now steals from local AZ::Event
8. Unlock persistent AZ::Event

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Separated SettingRegistry update/query mutex from Notifier update mutex

The Settings Registry update/query mutex is also better scoped to reduce
the amount of lock time.

The Notifier mutex being separate allows the Settings Registry to signal
a notification event without being under any mutex, by locking and
swapping the notifier event with a local instance

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Renamed StealHandlers function to ClaimHandlers
Replaced decltype keywords in ClaimHandlers to auto

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-08-13 16:20:08 -05:00
jromnoa 63a78b906a fixes light component GPU test AttributeError (I forgot to update atom_component_helper to atom_constants since constants were split from hydra functions into a new module) (#3115) 
Signed-off-by: jromnoa <jromnoa@amazon.com>
 2021-08-13 14:16:34 -07:00
evanchia-ly-sdets 80aa4c42ce moving smoke test to sandbox suite to investigate failures (#3109) 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-08-13 15:41:56 -05:00
michabr cd5081a7c3 Fix byte alignment issue for index/vertex buffers (#3110) 
* Fix byte alignment issue for index/vertex buffers
* Remove default alignment value when getting dynamic buffer

Signed-off-by: abrmich <abrmich@amazon.com>
 2021-08-13 13:31:46 -07:00
antonmic 7d4022fbdf Merge pull request #3035 from aws-lumberyard-dev/Atom/antonmic/PassBuilder 
Changing pass builder to declare job dependencies on referenced .shader files and consequently removing the critical flag from the shader builder.
 2021-08-13 11:50:51 -07:00
mrieggeramzn 9571a15769 Atom/mriegger/explicit set pcf address mode (#3061) 
* Explicit setting the addressing mode for the pcf shadowing

* Explicitly setting addressing mode for sampler
 2021-08-13 11:36:58 -07:00
Alex Peterson a55cb3e35f Fixed white-bar at bottom of Project Manager screen (#3091) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-08-13 09:09:55 -07:00
Kevin Y 99b369198b Typo fix in duplicate project progress window (#2969) 
Signed-off-by: Kevin Yu <kevinjoeyu@gmail.com>
 2021-08-13 14:59:38 +02:00
Scott Romero f2958bac93 [development] complete removal of CryThread*.h and MultiThread.h from CryCommon (#3067) 
- Replaced Cry-threading related code with AZ equivalents in the Remote Console runtime
 - Replaced (or removed) usage of CryMutex/CryLock with appropriate AZStd mutex type
 - Replaced usage of CrySpinLock/CryWriteLock with equivalent AZStd::spin_mutex
 - Replaced usage of CryInterlocked* with AZStd atomics
 - Removed all CryThread*.h files
 - Removed MultiThread.h
 -- Includes removal of the CryInterlocked* and Cry*CriticalSection functions defined elsewhere
 - Removed re-implemented stubs of Windows synchapi.h functions

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-08-13 05:43:21 -07:00
greerdv d46c2f7be6 Merge pull request #3100 from aws-lumberyard-dev/tiaf_rerun_cornercase 
Address commit re-run corner case.
 2021-08-13 12:14:18 +01:00
John a1d855a920 Invert corner case flag for readability. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-13 10:03:09 +01:00
John 4dd39c3929 Address commit re-run corner case. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-13 09:55:06 +01:00
antonmic 706333466e Addressing PR feedback and making PassBuilder error if referenced shader isn't found 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-12 23:58:51 -07:00
moudgils 4cf384c2c5 Fix minor typo (#3095) 
Signed-off-by: moudgils <moudgils@amazon.com>
 2021-08-12 21:12:41 -07:00
Chris Galvan f46f9fb7bc Merge pull request #3094 from aws-lumberyard-dev/cgalvan/CreateEntitiesInViewportCorrectPosition 
Fixed creating entities in the viewport logic to use hit test detection.
 2021-08-12 19:15:22 -05:00
AMZN-ScottR f0ff8da1d7 [redcode/crythread-2nd-pass] post merge duplicates removed 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 16:51:54 -07:00
AMZN-ScottR f660990e8a Merge branch 'development' into redcode/crythread-2nd-pass 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 16:47:02 -07:00
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
Chris Galvan 11d5009f46 Fixed creating entities in the viewport logic to use hit test detection. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 16:31:39 -05:00
AMZN-ScottR b32cf24310 Merge branch 'development' into redcode/crythread-2nd-pass 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 14:20:15 -07:00
AMZN-ScottR c3ee798acc [redcode/crythread-2nd-pass] updated condition variable handling in Remote Console runtime to cut out extra unlock/lock 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 14:18:10 -07:00
Chris Galvan 48503679c4 Merge pull request #3081 from aws-lumberyard-dev/cgalvan/StyledTreeView 
Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view.
 2021-08-12 15:21:49 -05:00
lumberyard-employee-dm ecd3b015ee Fixed Signed/Unsigned Mismatch fix in LyShine UiAnimViewAnimNode.cpp (#3062) 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-08-12 15:10:33 -05:00
jonawals ff659fbbb6 Tiaf bucket top level fix (#3085) 
* Revert to regular run when invalid commits used.

* Cirrect s3 logging of last commit hash storage

* Add s3 top level url and build number script params.

* Use existing REPOSITORY_NAME env var.

Signed-off-by: John <jonawals@amazon.com>
 2021-08-12 12:48:23 -07:00
AMZN-ScottR cc3d2e9969 [redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 12:40:03 -07:00
carlitosan 8c21c85972 Merge pull request #3028 from aws-lumberyard-dev/carlitosan/development 
Addes JSON serialization support for properties stored in the EditorScriptCanvasComponent. Add tool tips to explain repeater node behavior, remove empty "User Functions" and "Script Event" headings from Editor.
 2021-08-12 12:38:40 -07:00
moudgils c2b8542bbd Support for refresh rate and sync interval (#2989) 
* Add support for querying the refresh rate and sync interval
 2021-08-12 12:07:46 -07:00
Chris Galvan 589a05062b Merge pull request #3084 from aws-lumberyard-dev/cgalvan/FixEMFXModalToastNotifications 
Prevent EMFX notifications from being modal, which was blocking input while visible.
 2021-08-12 13:49:35 -05:00
Chris Galvan c9df7c69a4 Updated slice entity outliner to use new consolidated StyledTreeView as well. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 13:20:55 -05:00
Sean Sweeney bdb3132e27 Merge pull request #1997 from aws-lumberyard-dev/aztestrunner_retry_command 
Adding C++ retry command
 2021-08-12 11:15:46 -07:00
AMZN-ScottR 72e99dd52b [redcode/crythread-2nd-pass] removed platform.h include hack linked to CryThread.h for apple platforms in ILog.h and ISystem.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 11:02:44 -07:00
AMZN-ScottR 28c477997d [redcode/crythread-2nd-pass] fixed missing iOS include 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 10:58:41 -07:00
Vincent Liu 9579826b5c [SPEC-7971] Update gem module name to match cmake target name (#3055) 
Fixes for module names so they match cmake target name
 2021-08-12 10:56:51 -07:00
AMZN-ScottR bbe6ff7b90 [redcode/crythread-2nd-pass] re-add LARGE_INTEGER definition to AppleSpecific.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 10:55:32 -07:00
Chris Galvan 8997cab253 Merge pull request #3070 from aws-lumberyard-dev/michabr/env_var 
Fix for checking environment variable existence
 2021-08-12 12:52:03 -05:00
chcurran fe21b89d8e working support for editor property json serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-12 10:24:16 -07:00
Chris Galvan 4ceff99ba1 Prevent EMFX notifications from being modal, which was blocking input while visible. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 12:10:13 -05:00
Junbo Liang 6d5d042e40 Set the default region for the Resource Mapping Tool when no region is configured via AWS CLI (#2856) 
Ensure a valid region is always present when generating resource mapping files.
 2021-08-12 10:05:13 -07:00
Chris Galvan 2063e7f2dd Added missing header include. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 11:43:23 -05:00