birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,870 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f55ffae994'
${ noResults }
Commit Graph

77 Commits (f55ffae99425b95680ba3d10ddc8eb40e1f7a477)

Author SHA1 Message Date
AMZN-ScottR f55ffae994 Merge branch 'development' into redcode/crythread-2nd-pass 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
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>
 5 years ago
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>
 5 years ago
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>
 5 years ago
Esteban Papp 041aa42307 fixes after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
AMZN-ScottR ce7598c10b [redcode/crythread-2nd-pass] fixed missing includes 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
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
 5 years ago
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
 5 years ago
AMZN-ScottR 6f2b7baae8 [redcode/crythread-2nd-pass] removed CryThread*.h files 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
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>
 5 years ago
Esteban Papp 2361490c8b Fixes for Android 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp fa2032d21d Linux fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp fe635d5ab4 Merge branch 'development' into cmake/SPEC-7182 5 years ago
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>
 5 years ago
Esteban Papp d71674579a fixing startup on game launcher 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 5 years ago
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>
 5 years ago
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
 5 years ago
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>
 5 years ago
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
 5 years ago
AMZN-ScottR 3bf4caf7d2 [redcode/crythread-2nd-pass] removed Cry*CriticalSection functions 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
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>
 5 years ago
AMZN-ScottR 2e2bbe80b1 [redcode/crythread-2nd-pass] removed CryEvent types 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
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>
 5 years ago
AMZN-ScottR 635b9686c6 [redcode/crythread-2nd-pass] removed CrySimpleThread and related code 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
amzn-phist f03df3e546
Fix issues with audio localization bank switching (#2945) 
* Fix issues with locating and loading loc banks

The code that initially checked the g_languageAudio cvar wasn't properly
detecting when the cvar wasn't set.  Fixed an issue discovering
localized banks wasn't properly recursing into subdirectories.
Simplified handling of audio language switching for Wwise.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address feedback on PR

Change .size() == 0 to .empty()

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 5 years ago
hultonha 3d15382fb6
Camera Component, Editor Viewport Widget refactoring. 
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
 5 years ago
AMZN-ScottR 3e7d7d150e [redcode/crythread-2nd-pass] removed CryThread_dummy.h 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 5 years ago
Esteban Papp 360d0bdd0b removing more unused stuff 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp d6744690ee platform.h cleanup 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
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>
 5 years ago
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>
 5 years ago
Esteban Papp c85e5a6886 Some more build fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
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
 5 years ago
pappeste 10f950b726 fix w4018 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 4358b6eb27 runtime fixes (Editor running) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 895dc09176 addressing PR comments/suggestions 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 0dc829891a fixing build 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
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>
 5 years ago
Yuriy Toporovskyy bb36a4d40c Style 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
 5 years ago
Yuriy Toporovskyy 83099a7f5b Update mocks for ISystem changes 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
 5 years ago
Yuriy Toporovskyy 590de17343 Delete code which was only commented out 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
 5 years ago
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>
 5 years ago
Esteban Papp eeed7df429 fixing no unity builds 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 82c5f80fbd More windows/linux fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp e28602dbbb linux fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp a14b4e478e Code/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 061cb98f74 auto-search/replace 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp 29a2ad79a4 Gems/Gestures 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Esteban Papp db7536acda Gems/Maestro 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago