Commit Graph

175 Commits

Author SHA1 Message Date
Esteban Papp fa2032d21d Linux fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 19:02:38 -07:00
Esteban Papp fe635d5ab4 Merge branch 'development' into cmake/SPEC-7182 2021-08-10 18:05:28 -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
Terry Michaels 9b1ebb220a Changed locale handling and added tests 2021-08-10 12:40:56 -05:00
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>
2021-08-10 10:10:37 -05:00
John Jones-Steele be535172b5 Merge branch 'development' into UsingCommaAsDecimalSeperator
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-08-10 09:31:50 +01:00
Artur K 6bf6ae9485 Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 5 of a split #2847

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

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
2021-08-09 13:06:29 -05:00
John Jones-Steele 12505da6fc Changed locale handling and added tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-08-09 16:01:18 +01:00
hultonha 30c277bc56 Editor code: tidy up BOOLs,NULLs and overrides pt2.
Merge pull request #2873 from nemerle/tidy_up_editor_code_a_bit_split2
2021-08-09 15:29:54 +01:00
hultonha 3d15382fb6 Camera Component, Editor Viewport Widget refactoring.
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
2021-08-09 14:01:41 +01:00
igarri 7b5ecfb7d9 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
2021-08-09 09:32:42 +01:00
Esteban Papp d6744690ee platform.h cleanup
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-06 15:10:21 -07:00
Scott Romero 9a8a411a0b [development] removal of unused and low stakes code related to Cry-threading (#2896)
Removal highlights include:
 - File indexer (used CryThread<>) linked to long gone asset browser
 - Producer/consumer queues from CryMT
 - set/vector/CLocklessPointerQueue containers also from CryMT
 - Cry interlocked linked list and _InterlockedCompareExchange128
 - CryThread type
 - SAtomicVar types
 - CryAutoSet type
 - Various unused lock types
 -- AutoLockModify
 -- AutoLockRead
 -- CryOptionalAutoLock
 -- CryReadModifyLock
 -- CryRWLock
 -- ReadLock
 -- ReadLockCond
 -- WriteAfterReadLock
 - Misc. unused functions
 -- CryInterLockedAdd (not to be confused with CryInterlockedAdd, using a lower case "locked")
 -- CryInterlockedExchange64 (which was only defined for unix platforms)
 -- SpinLock
 -- JobSpinLock
 -- AtomicAdd
 -- JobAtomicAdd

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-06 13:23:14 -07:00
Esteban Papp f4164ef3a3 Merge branch 'development' into cmake/SPEC-2513_w4018 2021-08-06 11:57:55 -07:00
Esteban Papp db942e2cf5 addresses PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-06 10:36:53 -07:00
Chris Galvan c2c59eae05 Merge pull request #2932 from aws-lumberyard-dev/cgalvan/FixAssetBrowserPathMenuOptions
Fixed Asset Browser path related context menu options.
2021-08-06 10:27:50 -05:00
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>
2021-08-06 10:32:38 -04:00
Chris Galvan eeb1b68a72 Updated string to string_view per PR feedback.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-06 09:23:33 -05:00
hultonha 1cb0860d4d Editor code: tidy up BOOLs,NULLs and overrides pt4.
Merge pull request #2875 from nemerle/tidy_up_editor_code_a_bit_split4
2021-08-06 12:57:15 +01:00
Chris Galvan 3986a11396 Fixed Asset Browser path related context menu options.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-06 06:52:11 -05:00
hultonha 9a711cbb8c Editor code: tidy up BOOLs,NULLs and overrides pt6.
Merge pull request #2877 from nemerle/tidy_up_editor_code_a_bit_split6
2021-08-06 12:49:05 +01:00
Nemerle f2c482b03d Fixes for incorrect nullptr placement.
Incorrect DataElement overload getting called in
AndroidSplashscreens::Reflect

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-06 13:02:23 +02:00
hultonha 9612fe3def Editor code: tidy up BOOLs,NULLs and overrides pt3.
Merge pull request #2874 from nemerle/tidy_up_editor_code_a_bit_split3
2021-08-06 10:28:51 +01:00
igarri 9d2b99b558 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
2021-08-06 10:18:26 +01:00
hultonha 70ae5c2d40 Editor code: tidy up BOOLs,NULLs and overrides pt1.
Merge pull request #2872 from nemerle/tidy_up_editor_code_a_bit_split1
2021-08-06 09:44:14 +01:00
pappeste 97354ce90a Sandbox
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:43:50 -07:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
Artur K 7448bccea3 Bunch of small bug fixes (#2813)
* fix an error with addr_impl_ref assignment operator

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

* chrono duration unary '+' was missing a return

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

* HierarchyMenu constructor logic fix

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

* at least assert in case of invalid arguments to ring_buffer::insert

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

* EditorSettings using incorrect string_view::find result comparison

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 14:10:08 -07:00
Yuriy Toporovskyy 56dee47c6b Address more PR feedback
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 11:56:09 -04:00
Nemerle 769fd78189 Editor code: tidy up BOOLs,NULLs and overrides pt6.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 6 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:52:43 +02:00
Yuriy Toporovskyy 3ad3dfd662 Address PR feedback
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:50:29 -04:00
Nemerle 1a80d313e5 Editor code: tidy up BOOLs,NULLs and overrides pt4.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 4 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:49:02 +02:00
Nemerle c6760d8935 Editor code: tidy up BOOLs,NULLs and overrides pt3.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 3 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:48:00 +02:00
Nemerle 0d0d94f575 Editor code: tidy up BOOLs,NULLs and overrides pt2.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 2 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:46:38 +02:00
Nemerle b8bed115f0 Editor code: tidy up BOOLs,NULLs and overrides pt1.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 1 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:37:43 +02:00
Yuriy Toporovskyy ba33dd4433 Fix strange commit which was automatically created by Githubs 'Suggested Change' feature.
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:27:24 -04:00
Yuriy Toporovskyy a85b97d9ac Remove unused code
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:19:16 -04:00
Yuriy Toporovskyy e82342dce0 Delete code which was only commented out
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:22 -04:00
Yuriy Toporovskyy 70adac4f96 Remove ed_useAtomNativeViewport - Legacy Cry viewport no longer supported
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:21 -04:00
yuriy0 62214567c1 Handle non-default viewport context
Co-authored-by: Nicholas Van Sickle <NVShacker@gmail.com>
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:20 -04:00
Yuriy Toporovskyy 590de17343 Delete code which was only commented out
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:20 -04:00
Yuriy Toporovskyy 9d9ce7cc33 Fixup merge errors
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:19 -04:00
Yuriy Toporovskyy 2079b274c3 Fixup merge errors
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:19 -04:00
Yuriy Toporovskyy 73fee0c57e Camera Component, Editor Viewport Widget refactoring.
- Handle changing of active camera entirely inside CameraComponentController
- Remove a LOT of legacy Cry things related to cameras
- Add a CameraSystemComponent to handle ActiveCameraRequestBus and CameraSystemRequestBus

Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-05 10:05:19 -04:00
Terry Michaels 92a5fb6df2 Add a toggle to clear console every time ctrl+G is activated
LYN-3705 As a dev I want a toggle to clear console every time I hit ctrl+G
2021-08-05 08:11:31 -05:00
hultonha 6c7365918b Fix a few issues in CCryEditDoc
Merge pull request #2846 from nemerle/cryedit_fixups_try2
2021-08-05 10:36:08 +01:00
hultonha 5640880aea Changes to update where some viewport actions are called from (legacy removal)
Merge pull request #2828 from aws-lumberyard-dev/legacy_shortcut_update

This change removes code from CCryEditApp that no longer needs to be there
2021-08-05 09:56:56 +01:00
sphrose 126280bb93 Merge branch 'development' into LYN-3705-2 2021-08-05 09:51:31 +01:00
hultonha 1169c82b98 Make camera controller priority customizable (#2826)
* make 'should handle' logic customizable

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

* updates to get priority function

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

* minor comment tweak

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-05 09:45:03 +01:00
nemerle 627dcc49f1 GetActivePathName was using default - constructed enum DocumentEditingMode()
Also, SaveLevel was not using destName when constructing newFilePath

Other code changes:

* LogLoadTime is simplified by using QFile
* reduce nesting in DoSaveDocument by using early return.
* marked a few eligible methods as const
* Simplified OnEnvironmentPropertyChanged a bit

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-04 21:01:52 +02:00