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

72 Commits

Author SHA1 Message Date
AMZN-ScottR f0ff8da1d7 [redcode/crythread-2nd-pass] post merge duplicates removed 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 16:51:54 -07:00
AMZN-ScottR 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
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
AMZN-ScottR 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
AMZN-ScottR 72e99dd52b [redcode/crythread-2nd-pass] removed platform.h include hack linked to CryThread.h for apple platforms in ILog.h and ISystem.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 11:02:44 -07:00
AMZN-ScottR bbe6ff7b90 [redcode/crythread-2nd-pass] re-add LARGE_INTEGER definition to AppleSpecific.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 10:55:32 -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
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
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
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 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
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
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
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
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
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 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
AMZN-ScottR 3bf4caf7d2 [redcode/crythread-2nd-pass] removed Cry*CriticalSection functions 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-09 20:07:04 -07:00
AMZN-ScottR 2408f7dc37 [redcode/crythread-2nd-pass] removed more unused code from CryThread 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-09 14:49:29 -07:00
AMZN-ScottR 2e2bbe80b1 [redcode/crythread-2nd-pass] removed CryEvent types 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-09 13:19:41 -07:00
AMZN-ScottR 6a2d5cd370 [redcode/crythread-2nd-pass] removed Cry-TLS macros from platform.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-09 12:22:03 -07:00
AMZN-ScottR 635b9686c6 [redcode/crythread-2nd-pass] removed CrySimpleThread and related code 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-09 11:18:38 -07: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
AMZN-ScottR 3e7d7d150e [redcode/crythread-2nd-pass] removed CryThread_dummy.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-06 18:22:28 -07:00
Esteban Papp 360d0bdd0b removing more unused stuff 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-06 16:42:38 -07: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
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
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
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 895dc09176 addressing PR comments/suggestions 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-05 19:30:09 -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
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
Yuriy Toporovskyy 83099a7f5b Update mocks for ISystem changes 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
 2021-08-05 10:05:21 -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
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 82c5f80fbd More windows/linux fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 18:56:46 -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
Esteban Papp 061cb98f74 auto-search/replace 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-02 16:07:23 -07:00
Esteban Papp 29a2ad79a4 Gems/Gestures 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-02 14:04:18 -07:00
Esteban Papp db7536acda Gems/Maestro 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-02 11:44:34 -07:00
Esteban Papp f665f572f3 Gems/Atom builds 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 18:53:50 -07:00