Commit Graph

1568 Commits (d40af1c70c852aae6e8e4e3fd91f55d8fea8ec99)

Author SHA1 Message Date
AMZN-koppersr 51792b8133
Merge pull request #3296 from aws-lumberyard-dev/mnaumov/LYN-3904
Improvements to Entity Outliner context menu
4 years ago
chcurran c701522adc update error messaging, remove unnecessary comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp 1e136a02b0 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/Crcfix/crcfix.cpp
4 years ago
Esteban Papp 3f31a6f8bf
Remove crcfix (#3294)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 2c4e5c5630 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-3904
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Mikhail Naumov 8589bb99de cleaned up comments
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
chcurran 1d1cea34dd Undo artifacts for JsonUtils sojourn into AzToolsFramework
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp dd80a3ebae Linux and non-unity build fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chiyenteng 28d035c275
Add a new auto test for delete prefab workflow (#3143)
* Add a new auto test for delete prefab

Signed-off-by: chiyteng <chiyteng@amazon.com>
4 years ago
John Jones-Steele 740ee1f8a4 Fixed wheel working on spinbox non focussed
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
Mikhail Naumov db91bdbf51 Improvements to Entity Outliner context menu
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp ac7be2fb5a PR observation about another race condition
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a49e07c8e9 improving comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 4adf5c051e more NameTest fixes, AzCore passing ASan
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e29479552b alignment fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran de9e991ccc merge development
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Mikhail Naumov fca71f9455 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
chcurran 88121f3bb4 move JsonUtils to AzCore
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 0270fb7fbe Initial saving/loading of JSON serialization of sc editor assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp 0c6a838c6f fix warnigns after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
4 years ago
Esteban Papp 7be2b0b6c3 Fix for a leaky test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 0d0a09b252 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
mnaumov a20428d393 Fixing non unity build
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp 3e06307461 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
mnaumov 6303b82976 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 4 years ago
hultonha 7f603c59ad
Fix for events that should have been consumed by manipulators (#3108)
* fix for events that should have been consumed by manipulators making their way to the main viewport handler

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing include for SANDBOX_API macro

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add dependency on Qt::Test for AzToolsFrameworkTestCommon

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix order of buttons passed to QMouseEvent

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* potential fix for vtable error on linux

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* potential fix for vtable error on linux again

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Guthrie Adams c95f491635
Merge pull request #3126 from aws-lumberyard-dev/Atom/guthadam/atomtools_restore_source_control_spam_filter
AtomTools: restoring log message filter to ignore source control spam
4 years ago
Nicholas Van Sickle d1cedba042
Fix NativeWindow_Windows returning the wrong size. (#3153)
Make sure WM_WINDOWPOSCHANGED bubbles up so that we can see WM_SIZE.

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Esteban Papp 964c2401df Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 9a8ec8bfcd fix for clang
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0f26a6508a fixing comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b8787739e1 more fixes after rebase
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f0fa62bde3 PR comments/observations
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3eb658534b More Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 06e6f83907 Cleanup and fixing of Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0eacd54b14 removing unnecessary bigobj flags from files (its applied globally)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e7f07147cb More fixes for Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 3172a82937 Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 58f8b563d0 fix them all
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Guthrie Adams ff4d65dc2d added functions to remove and clear trace logger filters
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3522f622f3 more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8b3ab8eb0b fixing warning issued in Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 52068911bb More fixes that are failing on Jenkins but not locally
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 75c388b746 change conversions to static_cast
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8ba0807cfc Code/Framework/AzCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste f6cdcddc52 fixes for Code/CryEngine
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 81d26d322d Code/Framework fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
mnaumov 0884f96997 PR feedback
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
mnaumov d5b92fa93a Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372 4 years ago
kberg-amzn 109ce65c7d
Merge pull request #2993 from aws-lumberyard-dev/MultiplayerDesyncsAndCorrectionFixes
Multiplayer desyncs and correction fixes
4 years ago
Guthrie Adams fe7d953568
Merge pull request #3124 from aws-lumberyard-dev/Atom/guthadam/ATOM-16242_fix_python_terminal_help_crash
AtomTools: Fix python terminal help crash ATOM-16242
4 years ago
Chris Galvan aff3b93297
Merge pull request #3023 from aws-lumberyard-dev/daimini/settings-registry-origin-tracking
Add Pre and Post merge handlers to Settings Registry
4 years ago
amzn-phist d6b268e84e
Remove ResourceSelectorHost and clean up/refactor related bits (#3050)
* Sever dependency on legacy resource selector host

Audio resource selectors (browse dialogs) no longer need to be
registered with the legacy IResourceSelectorHost system.  Set up a new
EBus specifically to handle browse button presses and directly invokes
the dialog.

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

* Hook up legacy audio control selector to new EBus

Remaining use of legacy audio selectors (trackview) need to be able to
bypass ResourceSelectorHost now.

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

* Removes ResourceSelectorHost and legacy selectors

This removes various Variable types that were tied to resource
selectors, such as GeomCache, Model, Animation, File.  Removes the
ResourceSelectorHost completely.  The two things that still appeared to
have selectors in TrackView are Audio Controls and Texture.  Fixed the
audio control selector to work via EBus and the Texture selector didn't
seem to work at all, but left it in as it was.

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

* Make the default audio selector return old value

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

* Fix some signed/unsigned comparison warnings

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

* Remove deleted function from Editor Mock

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

* Change audio selector api to use string_view

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
mnaumov e42c5c03ab Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 4 years ago
Danilo Aimini 577c75d68d Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 4 years ago
sphrose f7e536bfb1
compile fix - signed/unsigned mismatch (#3139)
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Guthrie Adams d6c5f1444b fixing hidden variable warning
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
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>
4 years ago
chcurran 5044204839 Move JsonUtils.h for support of SC serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
mnaumov 9aa391bf74 Fixing Level Save As
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
mnaumov e633b5bdc7 Addressing Ronald's feedback
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
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
4 years ago
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>
4 years ago
Esteban Papp b26107e98d Fix for NameDictionary
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 4 years ago
moudgils 4cf384c2c5
Fix minor typo (#3095)
Signed-off-by: moudgils <moudgils@amazon.com>
4 years ago
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>
4 years ago
Esteban Papp a087fc06a9 fixes for ASAn
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8f05c7aa2f
Several build fixes 4 years ago
mnaumov c8cd3b1923 reverting another file
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
mnaumov 8f21563ba9 Undoing old changes and storing linkId to prefabDom
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
mnaumov 3fe5901a77 Fixing a crash when unparenting prefab instance in a new level
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
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.
4 years ago
moudgils c2b8542bbd
Support for refresh rate and sync interval (#2989)
* Add support for querying the refresh rate and sync interval
4 years ago
Chris Galvan 2063e7f2dd Added missing header include.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
abrmich f6e7760e85 Fix for checking environment variable existence
Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
Danilo Aimini 04e64e274f Fix typo in copypasting...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini ed199b736a Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 4 years ago
Esteban Papp 3f34fa5636
Some cleanup of platform.h and other CryCommon files 4 years ago
SJ 0f347c11bf
Add header file needed for no unity builds (#3047)
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
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>
4 years ago
Danilo Aimini 8b8e249e05 Add new functions to mock unit test class.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Esteban Papp 5f22dc817c Merge branch 'development' into cmake/SPEC-7182 4 years ago
Danilo Aimini 31f40e5835 Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 4 years ago
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
4 years ago
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>
4 years ago
Esteban Papp 3845f43088 missing header include after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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
4 years ago
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>
4 years ago
Esteban Papp fe635d5ab4 Merge branch 'development' into cmake/SPEC-7182 4 years ago
Danilo Aimini 737cf30937 Fix documentation comments to be more accurate.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 6db547302e Remove EditorSettingsOriginTracker (moved to prototype branch)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini f3fe8439a7 Fix local variable declaration.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Danilo Aimini 88762b2b69 Add #pragma once to EditorSettingsOriginTracker to make it build :)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 6f6b88ec2f Rename EditorSettingsOriginTracker
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
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>
4 years ago
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 4 years ago
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
4 years ago
carlitosan 1e0a1e1167
Merge pull request #2991 from aws-lumberyard-dev/carlitosan/development
Add JSON serializer support for the Lua component properties
4 years ago
Esteban Papp 3b9044ce5d Addressing missing test identified by @hultonha
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e3b22f51b2 @lumberyard-employee-dm suggestion to use (w)string_view as the src to simplify functions in conversions.h
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Terry Michaels 9b1ebb220a
Changed locale handling and added tests 4 years ago
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
4 years ago
lumberyard-employee-dm adaeb7c203
Converted the AZStd implementations of unintialized construct to use std (#2843)
* Converted the AZStd implementations of unintialized construct to use std

The uninitialized_default_construct and uninitialized_value_construct
functions implementations have been removed and the Standard library
implementations have been brought into the AZStd namespace scope

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

* Added a default construct to the UninitializedValueConstruct test case
which value initializes the int member which uses zero initialization to
initalize it to zero.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
SJ 44b053df58
[Mac] Building and running game projects from an SDK (#2943)
* 1. Initial support for loading dylibs outside the bundle.
2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified).
3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep.
4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures.
With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove debug messages.
2. Fix license
3. Pass parent's environment variables to child processes by default(on Mac).

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some feedback from review

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
John Jones-Steele 2bf64879da Fixed the SpinBox tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele be535172b5 Merge branch 'development' into UsingCommaAsDecimalSeperator
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
kberg-amzn b957b26b54 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn f85e8124a9 Fixes and cleanup for recent correction changes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
chcurran 8571e71d93 Add JSON serializer support for the Lua component properties
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
michabr bb88f1f9df
Fix input not working in Ctrl-G mode after UI Editor is opened (#2948)
* Fix input not working in Ctrl-G mode after UI Editor is opened

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

* Delete environment variable

Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
Artur K fb3195d996
Reduce size of AllocationInfo struct to 64 bytes ( was 72 ) (#2771)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
John Jones-Steele 86d0ba7e6b Minor changes to tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele 3b60862237 Fixed order of tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele 12505da6fc Changed locale handling and added tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
hultonha 3d15382fb6
Camera Component, Editor Viewport Widget refactoring.
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
4 years ago
hultonha 1f9e976fe4
Adding Setting to allow the user to choose the max number of items to show in the Search View
Merge pull request #1679 from aws-lumberyard-dev/LYN-4700
4 years ago
hultonha 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>
4 years ago
igarri 7b5ecfb7d9 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Esteban Papp 360d0bdd0b removing more unused stuff
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f4164ef3a3 Merge branch 'development' into cmake/SPEC-2513_w4018 4 years ago
Esteban Papp 7447df3576 Merge branch 'development' into cmake/SPEC-7484 4 years ago
Esteban Papp 6db7488939 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
4 years ago
Esteban Papp 03cf71b12d android fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8adf8fd7a1 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp ae9d15c977 Mac/iOS fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong 4ab7aa551d Resolve size_t conversion werrors
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
moraaar 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>
4 years ago
Jeremy Ong 5a05fe93d4
Merge pull request #2815 from aws-lumberyard-dev/AzCore/JobGraph
Add initial TaskGraph prototype
4 years ago
Yuriy Toporovskyy fd616fdcfb Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
hultonha ff8c4dce00
Ensure we disconnect from EditorInteractionSystemViewportSelectionRequestBus while recreating m_interactionRequests (#2884)
Fixes a crash while selecting an entity in the viewport while in 'pick' mode.
4 years ago
igarri 9d2b99b558 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Jeremy Ong 4f9c2cf693 Remove TaskGraph::Drain which was only added initially for testing
The drain function was used only before the API gained the ability to
wait on the completion of a graph. This is the correct way to "drain"
the task executor of work.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp c85e5a6886 Some more build fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
pappeste eb3e0b0998 updates after merging development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 10f950b726 fix w4018
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 6d79f1beee more replacements of A functions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 895dc09176 addressing PR comments/suggestions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 84623dfb66 FixedMaxPathString replacement
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Artur K e193e5b353
EnvironmentVariableHolder: reduce the size of template instantiation. (#2857)
* EnvironmentVariableHolder: reduce the size of template instantiation.

Move almost all destruction logic to EnvironmentVariableHolderBase::UnregisterAndDestroy.
Specialized templates have DestructDispatchNoLock instead that can either destroy the held value,
or the holder itself.

UnregisterAndDestroy has been moved to the cpp file.

All of these changes reduce the profile build time and size on linux
Here, the size of bin/profile goes down by ~200MB.

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

* Requested changes/fixups.

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

* Use scoped_lock to simplify mutex management.

Updated comments.

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

* Hopefully a fix for env variables released at a wrong time

Conditional was using incorrect variable

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

* Comment fixup

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

* Missing negation in conditional

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

* Cleanup the internal logic in UnregisterAndDestroy

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
Jeremy Ong 4743ca8bc1 Fix segfault when checking detached graph completion status
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago