birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

676 Commits

Author SHA1 Message Date
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
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
 2021-08-05 20:05:25 -07: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 4358b6eb27 runtime fixes (Editor running) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 19:31:12 -07:00
Esteban Papp 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
Esteban Papp 84623dfb66 FixedMaxPathString replacement 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 19:25:26 -07:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
Esteban Papp 0dc829891a fixing build 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 14:30:04 -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
Esteban Papp aa12434728 removing some dead code, commented code referring old types, static AZStd::strings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 12:47:36 -07:00
Esteban Papp 0545ce4f59 More PR comments/fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 12:46:50 -07:00
Esteban Papp d955189a31 Removal of unused files from Code/Editor 
XmlHistoryManager.cpp was being compiled but unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 12:43:46 -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
lumberyard-employee-dm 21ca3a4aea The enable-gem command registers gem with project if not registered (#2817) 
* The enable_gems command now registers the gem with the project if only registered with o3de_manifest.json

Updated the `enable_gems` command to register the gem with the project if the gem is not registered with either the project or the engine being used.
This allows the gem to be added to the build system if it wasn't registered before.

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

* Adding quoting around the invocation of the OpenProjectManager command

The --project-path parameter now is able to pass in a path with spaces
to the invocation of the Project Manager.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-08-04 13:13:28 -05:00
aaguilea c9e16c1c42 Erased some legacy function that are no longer necessary 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-08-04 14:44:50 +01:00
aaguilea d06ec45aaa changes to the move rotate and scale 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-08-04 13:05:00 +01:00
igarri 6fb250c66b Merge branch 'develop' into LYN-4700 
Signed-off-by: igarri <igarri@amazon.com>
 2021-08-04 09:52:42 +01:00
Esteban Papp eeed7df429 fixing no unity builds 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 20:24:36 -07:00
Esteban Papp e28602dbbb linux fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 17:59:35 -07:00
Chris Galvan eb94d5b7a0 Merge pull request #2717 from aws-lumberyard-dev/nvsickle/EditorCameraFOV 
Ensure Editor FOV corrects on viewport resize
 2021-08-03 12:41:22 -05:00