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
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
d273298840
Merge pull request #3064 from aws-lumberyard-dev/michabr/editor_input
...
Fix for input not being reenabled after game mode
2021-08-12 10:20:46 -05:00
83e56b6ab5
Remove new camera flag functions and legacy code paths ( #3071 )
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-12 15:06:16 +01:00
c410f1385c
First step removing legacy code from the camera
...
Merge pull request #2997 from aws-lumberyard-dev/legacy_camera_removing
2021-08-12 09:36:45 +01:00
6f4951234d
Fix for input not being reenabled after game mode
...
Signed-off-by: abrmich <abrmich@amazon.com >
2021-08-11 17:35:19 -07:00
041aa42307
fixes after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-11 13:56:03 -07:00
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
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
a26d6d5ec9
Editor: code style fixups in 2 files
...
Merge pull request #2933 from nemerle/denitify_1
2021-08-11 13:43:56 +01:00
9ecd0ff9df
Bad Merge fix
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-11 13:31:44 +01:00
fa2032d21d
Linux fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-10 19:02:38 -07:00
fe635d5ab4
Merge branch 'development' into cmake/SPEC-7182
2021-08-10 18:05:28 -07:00
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
2147b1d128
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 14:30:07 -07:00
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
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 >
2021-08-10 11:32:49 -07:00
9b1ebb220a
Changed locale handling and added tests
2021-08-10 12:40:56 -05:00
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
2021-08-10 09:23:34 -07:00
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
48aa93a837
Merge branch 'development' into legacy_camera_removing
2021-08-10 12:11:09 +01:00
97d0456e5f
uber nit
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-10 12:08:01 +01:00
be535172b5
Merge branch 'development' into UsingCommaAsDecimalSeperator
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-08-10 09:31:50 +01:00
d124044498
First step removing legacy code from the camera
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-10 09:19:16 +01:00
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
fceb29fa5f
Editor: code style fixups in 2 files
...
A few small fixes ( for range loops + one -> check)
Signed-off-by: Nemerle <nemerle5+git@gmail.com >
2021-08-09 19:09:12 +02:00
12505da6fc
Changed locale handling and added tests
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-08-09 16:01:18 +01:00
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
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
7b5ecfb7d9
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-09 09:32:42 +01:00
d6744690ee
platform.h cleanup
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-06 15:10:21 -07:00
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
f4164ef3a3
Merge branch 'development' into cmake/SPEC-2513_w4018
2021-08-06 11:57:55 -07:00
db942e2cf5
addresses PR comments
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-06 10:36:53 -07:00
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
2021-08-06 10:08:37 -07:00
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
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
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
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
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
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
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
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
9d2b99b558
Merge branch 'develop' into LYN-4700
...
Signed-off-by: igarri <igarri@amazon.com >
2021-08-06 10:18:26 +01:00
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
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
2021-08-05 20:05:25 -07:00
97354ce90a
Sandbox
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:43:50 -07:00
4358b6eb27
runtime fixes (Editor running)
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:31:12 -07:00
6d79f1beee
more replacements of A functions
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:30:52 -07:00
84623dfb66
FixedMaxPathString replacement
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:25:26 -07:00
Chris Galvan
AMZN-Alexandre Corcia Aguilera
hultonha
abrmich
Esteban Papp
Artur K
Terry Michaels
SJ
aaguilea
John Jones-Steele
Nemerle
igarri
Scott Romero
Yuriy Toporovskyy
pappeste