birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,702 Commits 3 Branches 3 Tags
bb4fdc8fe86c674fe02429832843bbf95e116a67
Commit Graph

3324 Commits

Author SHA1 Message Date
Alex Peterson 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
Kevin Y 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
Scott Romero f2958bac93 [development] complete removal of CryThread*.h and MultiThread.h from CryCommon (#3067) 
- Replaced Cry-threading related code with AZ equivalents in the Remote Console runtime
 - Replaced (or removed) usage of CryMutex/CryLock with appropriate AZStd mutex type
 - Replaced usage of CrySpinLock/CryWriteLock with equivalent AZStd::spin_mutex
 - Replaced usage of CryInterlocked* with AZStd atomics
 - Removed all CryThread*.h files
 - Removed MultiThread.h
 -- Includes removal of the CryInterlocked* and Cry*CriticalSection functions defined elsewhere
 - Removed re-implemented stubs of Windows synchapi.h functions

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-08-13 05:43:21 -07:00
moudgils 4cf384c2c5 Fix minor typo (#3095) 
Signed-off-by: moudgils <moudgils@amazon.com>
 2021-08-12 21:12:41 -07:00
Chris Galvan f46f9fb7bc Merge pull request #3094 from aws-lumberyard-dev/cgalvan/CreateEntitiesInViewportCorrectPosition 
Fixed creating entities in the viewport logic to use hit test detection.
 2021-08-12 19:15:22 -05:00
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 89e1b6db25 Making allocator use the MallocSchema so we can take full advantage of ASan 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-12 16:44:59 -07:00
Esteban Papp a087fc06a9 fixes for ASAn 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-12 16:44:25 -07:00
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
mnaumov c8cd3b1923 reverting another file 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-12 14:44:09 -07:00
mnaumov 8f21563ba9 Undoing old changes and storing linkId to prefabDom 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-12 14:44:07 -07:00
mnaumov 3fe5901a77 Fixing a crash when unparenting prefab instance in a new level 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-12 14:44:05 -07:00
Chris Galvan 11d5009f46 Fixed creating entities in the viewport logic to use hit test detection. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 16:31:39 -05:00
AMZN-ScottR 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
AMZN-ScottR 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
Chris Galvan 48503679c4 Merge pull request #3081 from aws-lumberyard-dev/cgalvan/StyledTreeView 
Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view.
 2021-08-12 15:21:49 -05: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
moudgils c2b8542bbd Support for refresh rate and sync interval (#2989) 
* Add support for querying the refresh rate and sync interval
 2021-08-12 12:07:46 -07:00
Chris Galvan c9df7c69a4 Updated slice entity outliner to use new consolidated StyledTreeView as well. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 13:20:55 -05:00
Sean Sweeney bdb3132e27 Merge pull request #1997 from aws-lumberyard-dev/aztestrunner_retry_command 
Adding C++ retry command
 2021-08-12 11:15:46 -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 28c477997d [redcode/crythread-2nd-pass] fixed missing iOS include 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-08-12 10:58:41 -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
Chris Galvan 8997cab253 Merge pull request #3070 from aws-lumberyard-dev/michabr/env_var 
Fix for checking environment variable existence
 2021-08-12 12:52:03 -05:00
Chris Galvan 2063e7f2dd Added missing header include. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 11:43:23 -05:00
Alex Peterson 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
Gene Walters 85d4abae83 Move MultiplayerComponent destructor to cpp (which #includes the controller) so that when it comes time to destroy the unique_ptr<Controller> it can do so on a complete type. Also, minor spelling error fix 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-08-12 09:22:56 -07:00
Chris Galvan b5828e327d Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-12 11:15:55 -05:00
Chris Galvan d273298840 Merge pull request #3064 from aws-lumberyard-dev/michabr/editor_input 
Fix for input not being reenabled after game mode
 2021-08-12 10:20:46 -05:00
AMZN-Alexandre Corcia Aguilera 83e56b6ab5 Remove new camera flag functions and legacy code paths (#3071) 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-08-12 15:06:16 +01:00
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