birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,806 Commits 3 Branches 3 Tags
0d8b0fe496a3b62bba714acc32add2befcee3321
Commit Graph

1661 Commits

Author SHA1 Message Date
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
Guthrie Adams 885357a6b5 AtomTools: restoring log message filter to ignore source control spam 
Added message filter support to TraceLogger

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-14 16:58:31 -05:00
Guthrie Adams d6c5f1444b fixing hidden variable warning 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-14 14:30:54 -05:00
Guthrie Adams fe3b30e42c AtomTools: Fix python terminal help crash ATOM-16242 
Checking EditorWindowRequests::GetAppMainWindow before searching for main window

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-14 14:07:36 -05:00
chcurran 5044204839 Move JsonUtils.h for support of SC serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-13 21:53:20 -07:00
mnaumov 9aa391bf74 Fixing Level Save As 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-13 19:51:55 -07:00
mnaumov e633b5bdc7 Addressing Ronald's feedback 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-13 19:50:35 -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
Esteban Papp b26107e98d Fix for NameDictionary 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-13 10:07:35 -07:00
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 09:58:21 -07:00
moudgils 4cf384c2c5 Fix minor typo (#3095) 
Signed-off-by: moudgils <moudgils@amazon.com>
 2021-08-12 21:12:41 -07:00
Esteban Papp 89e1b6db25 Making allocator use the MallocSchema so we can take full advantage of ASan 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-12 16:44:59 -07:00
Esteban Papp a087fc06a9 fixes for ASAn 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-12 16:44:25 -07:00
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
mnaumov c8cd3b1923 reverting another file 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-12 14:44:09 -07:00
mnaumov 8f21563ba9 Undoing old changes and storing linkId to prefabDom 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-12 14:44:07 -07:00
mnaumov 3fe5901a77 Fixing a crash when unparenting prefab instance in a new level 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-12 14:44:05 -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
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 2063e7f2dd Added missing header include. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 11:43:23 -05:00
Gene Walters 85d4abae83 Move MultiplayerComponent destructor to cpp (which #includes the controller) so that when it comes time to destroy the unique_ptr<Controller> it can do so on a complete type. Also, minor spelling error fix 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-08-12 09:22:56 -07:00
Chris Galvan b5828e327d Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 11:15:55 -05:00
abrmich f6e7760e85 Fix for checking environment variable existence 
Signed-off-by: abrmich <abrmich@amazon.com>
 2021-08-12 00:09:17 -07:00
Danilo Aimini 04e64e274f Fix typo in copypasting... 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-11 16:53:41 -07:00
Danilo Aimini ed199b736a Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-11 16:35:56 -07:00
Esteban Papp 3f34fa5636 Some cleanup of platform.h and other CryCommon files 2021-08-11 16:34:00 -07:00
SJ 0f347c11bf Add header file needed for no unity builds (#3047) 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-08-11 18:08:21 -05:00
chiyenteng 7e5cbdab1e Create a new automated test for Prefab basic workflows (#2715) 
Adds a new ebus for prefab apis and refactored the apis
Removed an empty test level
Auto delete tmp level when teardown tests
Add Base test level in Prefab folder
Removed unused comments
Checked if absolute path as an input of Create Prefab functions
Changed created prefab file path to support all platfroms
Added missing includes

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-08-11 14:11:26 -07:00
Danilo Aimini 8b8e249e05 Add new functions to mock unit test class. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-11 13:59:41 -07:00
Esteban Papp 5f22dc817c Merge branch 'development' into cmake/SPEC-7182 2021-08-11 12:39:51 -07:00
Danilo Aimini 31f40e5835 Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-11 11:33:59 -07:00
Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp
 2021-08-11 11:16:24 -07:00
sconel fbcb6510e6 Update storage of Prefab Dom info to be best effort (#2862) 
* Update storage of Prefab Dom info to be best effort

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

* Update IssueReporter to Skipped instead of PartialSkip

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

* Address PR feedback

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

* Fix failing Prefab Unit Test that expected default values to be stripped

Signed-off-by: sconel <sconel@amazon.com>
 2021-08-11 10:45:31 -07:00
Esteban Papp 3845f43088 missing header include after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-11 08:13:38 -07:00
Esteban Papp 9f7d280a1e Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
 2021-08-11 07:55:26 -07:00
AMZN-AlexOteiza da4dfea9ca Adjustment to property row so the label is more visible (#2866) 
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
 2021-08-11 11:15:41 +02:00
Esteban Papp fe635d5ab4 Merge branch 'development' into cmake/SPEC-7182 2021-08-10 18:05:28 -07:00
Danilo Aimini 737cf30937 Fix documentation comments to be more accurate. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 17:36:43 -07:00
Danilo Aimini 6db547302e Remove EditorSettingsOriginTracker (moved to prototype branch) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 17:32:39 -07:00
Danilo Aimini f3fe8439a7 Fix local variable declaration. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 17:29:27 -07:00
Artur K 4cee263033 Minimal TypeInfo header/reduce std interdependencies. (#2688) 
* Minimal TypeInfo header/reduce std interdependencies.

TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

* Windows build fixed

Removed algorithm.h from string_view.h

smoke-test passed

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Resotore dynamic_pointer_cast in intrusive_ptr

Requested by reviewer.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix CI build

string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
 2021-08-10 19:07:01 -05:00
AMZN-mnaumov 25844a9ed6 Selecting entities when duplicating prefabs (#2995) 
* Selecting entitie when duplicating prefabs

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

* PR feedback

Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-10 16:40:51 -07:00
Danilo Aimini 88762b2b69 Add #pragma once to EditorSettingsOriginTracker to make it build :) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 15:33:24 -07:00
Danilo Aimini 6f6b88ec2f Rename EditorSettingsOriginTracker 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 15:27:01 -07:00
Danilo Aimini a70a106fd2 Test code to add merge detection on Settings Registry keys 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 15:00:36 -07:00
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 2021-08-10 14:30:07 -07:00
Esteban Papp 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
carlitosan 1e0a1e1167 Merge pull request #2991 from aws-lumberyard-dev/carlitosan/development 
Add JSON serializer support for the Lua component properties
 2021-08-10 11:36:18 -07:00