birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,238 Commits 3 Branches 3 Tags
4e618db62d6274cefa56e84591df01db0afb3aeb
Commit Graph

2440 Commits

Author SHA1 Message Date
hultonha 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
abrmich f6e7760e85 Fix for checking environment variable existence 
Signed-off-by: abrmich <abrmich@amazon.com>
 2021-08-12 00:09:17 -07:00
AMZN-ScottR 3fc0a197a0 [redcode/crythread-2nd-pass] removed re-implemented stubs of Windows synchapi.h functions and CrySimpleThread define in platform.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 21:32:02 -07:00
AMZN-ScottR 8dd44075c8 [redcode/crythread-2nd-pass] post merge include fixes 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 21:04:19 -07:00
AMZN-ScottR 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
abrmich 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
Danilo Aimini 04e64e274f Fix typo in copypasting... 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-11 16:53:41 -07:00
AMZN-ScottR c173dee2bc [redcode/crythread-2nd-pass] removed MultiThread.h along with external CryInterlocked* definitions 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 16:38:54 -07:00
Danilo Aimini ed199b736a Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-11 16:35:56 -07:00
Esteban Papp 3f34fa5636 Some cleanup of platform.h and other CryCommon files 2021-08-11 16:34:00 -07:00
SJ 0f347c11bf Add header file needed for no unity builds (#3047) 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-08-11 18:08:21 -05:00
AMZN-ScottR 337ea488b6 [redcode/crythread-2nd-pass] replaced remaining CryInterlocked* usage with equivalent AZStd version 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 15:57:49 -07:00
AMZN-ScottR 5a891c8cbd [redcode/crythread-2nd-pass] replaced remaining CrySpinLock/CryWriteLock usage with equivalent AZStd version 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 15:54:59 -07:00
AMZN-ScottR 6c83dcd702 [redcode/crythread-2nd-pass] fixed another missing include 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 15:44:04 -07:00
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>
 2021-08-11 14:11:26 -07:00
Danilo Aimini 8b8e249e05 Add new functions to mock unit test class. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-11 13:59:41 -07:00
Esteban Papp 041aa42307 fixes after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-11 13:56:03 -07:00
AMZN-ScottR ce7598c10b [redcode/crythread-2nd-pass] fixed missing includes 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-11 12:59:32 -07:00
Esteban Papp 5f22dc817c Merge branch 'development' into cmake/SPEC-7182 2021-08-11 12:39:51 -07:00
Danilo Aimini 31f40e5835 Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-11 11:33:59 -07:00
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
 2021-08-11 11:16:24 -07:00
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>
 2021-08-11 10:45:31 -07:00
Esteban Papp 3845f43088 missing header include after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-11 08:13:38 -07:00
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
 2021-08-11 07:55:26 -07:00
hultonha a26d6d5ec9 Editor: code style fixups in 2 files 
Merge pull request #2933 from nemerle/denitify_1
 2021-08-11 13:43:56 +01:00
AMZN-Alexandre Corcia Aguilera 9ecd0ff9df Bad Merge fix 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-08-11 13:31:44 +01:00
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>
 2021-08-11 11:15:41 +02:00
AMZN-ScottR 6f2b7baae8 [redcode/crythread-2nd-pass] removed CryThread*.h files 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-10 21:27:22 -07:00
AMZN-ScottR f99f1f00f4 [redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-10 20:35:55 -07:00
Esteban Papp 2361490c8b Fixes for Android 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-10 20:18:59 -07:00
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
Danilo Aimini 737cf30937 Fix documentation comments to be more accurate. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 17:36:43 -07:00
Danilo Aimini 6db547302e Remove EditorSettingsOriginTracker (moved to prototype branch) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 17:32:39 -07:00
Danilo Aimini f3fe8439a7 Fix local variable declaration. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 17:29:27 -07:00
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>
 2021-08-10 19:07:01 -05:00
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>
 2021-08-10 16:40:51 -07:00
Esteban Papp d71674579a fixing startup on game launcher 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-10 16:23:04 -07:00
Danilo Aimini 88762b2b69 Add #pragma once to EditorSettingsOriginTracker to make it build :) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 15:33:24 -07:00
Danilo Aimini 6f6b88ec2f Rename EditorSettingsOriginTracker 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-08-10 15:27:01 -07:00
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>
 2021-08-10 15:00:36 -07:00
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 2021-08-10 14:30:07 -07:00
evanchia c229191fad removing unused output for aztestrunner 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-08-10 13:09:42 -07:00
Esteban Papp a9cd126026 Adding PLATFORM_H_SECTION_15 back since it is used in restricted 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-10 12:30:04 -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
carlitosan 1e0a1e1167 Merge pull request #2991 from aws-lumberyard-dev/carlitosan/development 
Add JSON serializer support for the Lua component properties
 2021-08-10 11:36:18 -07:00
Esteban Papp 3b9044ce5d Addressing missing test identified by @hultonha 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-10 11:32:54 -07:00
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>
 2021-08-10 11:32:49 -07:00
Terry Michaels 9b1ebb220a Changed locale handling and added tests 2021-08-10 12:40:56 -05:00
hultonha 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