a55cb3e35f
Fixed white-bar at bottom of Project Manager screen ( #3091 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-08-13 09:09:55 -07:00
99b369198b
Typo fix in duplicate project progress window ( #2969 )
...
Signed-off-by: Kevin Yu <kevinjoeyu@gmail.com >
2021-08-13 14:59:38 +02:00
f660990e8a
Merge branch 'development' into redcode/crythread-2nd-pass
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-12 16:47:02 -07:00
8f05c7aa2f
Several build fixes
2021-08-12 16:42:18 -07:00
b32cf24310
Merge branch 'development' into redcode/crythread-2nd-pass
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-12 14:20:15 -07:00
c3ee798acc
[redcode/crythread-2nd-pass] updated condition variable handling in Remote Console runtime to cut out extra unlock/lock
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-12 14:18:10 -07:00
cc3d2e9969
[redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-12 12:40:03 -07:00
bdb3132e27
Merge pull request #1997 from aws-lumberyard-dev/aztestrunner_retry_command
...
Adding C++ retry command
2021-08-12 11:15:46 -07:00
538276c993
Allow project path changing and auto-completion ( #3057 )
...
* Allow project path changing and auto-complete
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
* Improved error message regarding the absolute path requirement
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-08-12 09:32:23 -07:00
f55ffae994
Merge branch 'development' into redcode/crythread-2nd-pass
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-11 20:31:58 -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
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
c229191fad
removing unused output for aztestrunner
...
Signed-off-by: evanchia <evanchia@amazon.com >
2021-08-10 13:09:42 -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
01ed06c7e1
Implement TIAF sequence reporting for MARS
...
Merge pull request #3010 from aws-lumberyard-dev/TIF/Runtime_merge
2021-08-10 18:37:55 +01: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
0005f2b9da
Updated skeleton logic: ( #2957 )
...
Import all nodes as bones. O3DE's concept of a bone is different than AssImp's.
Updated GetLocalSpaceBindPoseTransform to only use the offset matrix if the parent is also a bone.
Results:
All test assets I've tried match Blender's "Rest Position" when loaded in the Character tool.
All test animations I've tried work generally as well as they worked before, and a few better. This resolves the issue that was originally opened, an internal test asset loaded the skeleton incorrectly.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-08-10 06:47:14 -07:00
c2a2d1c5c7
Add changes from TIF/Feature branch.
...
Signed-off-by: John <jonawals@amazon.com >
2021-08-10 14:20:46 +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
12505da6fc
Changed locale handling and added tests
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-08-09 16:01:18 +01:00
2f5927f1ac
[redcode/crythread-2nd-pass] remove dependency on cry threads in the remote console runtime
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-06 17:45:54 -07:00
7b0118268c
Remove missing header from cmake.
...
Signed-off-by: John <jonawals@amazon.com >
2021-08-06 20:40:37 +01:00
d7c1185dc2
Add previously approved changes.
...
Signed-off-by: John <jonawals@amazon.com >
2021-08-06 20:09:53 +01:00
f4164ef3a3
Merge branch 'development' into cmake/SPEC-2513_w4018
2021-08-06 11:57:55 -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
2c7f6f9742
Adds Links to Gem Directory and Documentation for Gems ( #2922 )
...
* Changed blue text to white that is not meant as a link, made 'View in Director' link work for gems in the inspector, added parsing for gem documentation link
Signed-off-by: nggieber <nggieber@amazon.com >
* Added documentation links for gems, changed markup for urls in summaries and requirements so they are clickable
Signed-off-by: nggieber <nggieber@amazon.com >
* Fixed a couple of the documentation links
Signed-off-by: nggieber <nggieber@amazon.com >
* Added documentation url to edit gem properties script and updated unit tests
Signed-off-by: nggieber <nggieber@amazon.com >
2021-08-06 10:19:35 -05: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
9f18b6f1be
fixes for new code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:58:46 -07:00
eb3e0b0998
updates after merging development
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:44:03 -07:00
10f950b726
fix w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:43:56 -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
895dc09176
addressing PR comments/suggestions
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:30:09 -07:00
84623dfb66
FixedMaxPathString replacement
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:25:26 -07:00
6c22e92db6
Use lambda instead of AZStd::bind ( #2658 )
...
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-08-05 20:10:26 -05:00
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
0dc829891a
fixing build
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 14:30:04 -07:00
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
e9ef0a02ec
minor fixes for c++ retry command
...
Signed-off-by: evanchia <evanchia@amazon.com >
2021-08-04 11:17:38 -07:00
9bab676109
enabling test impact framework tool build and fixed it
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-03 20:25:21 -07:00
e28602dbbb
linux fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-03 17:59:35 -07:00
a92ed42829
minor fixes for c++ retry command
...
Signed-off-by: evanchia <evanchia@amazon.com >
2021-08-03 16:51:19 -07:00
38fd92a15a
Always display all gems in Gem Catalog ( #2341 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-08-03 10:48:57 -07:00
149833af56
Merge pull request #2401 from aws-lumberyard-dev/PM-logs-and-processcheck
...
Check for build process exit status and display log link in more cases.
2021-08-03 09:32:56 -07:00
dd3f0b86e0
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/ToolBox.cpp
2021-08-02 18:45:25 -07:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
db7536acda
Gems/Maestro
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 11:44:34 -07:00
Alex Peterson
Kevin Y
AMZN-ScottR
Esteban Papp
Sean Sweeney
Artur K
evanchia
Terry Michaels
hultonha
SJ
AMZN-stankowi
John
John Jones-Steele
AMZN-nggieber
pappeste
AMZN-Phil