izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
47,238 Commits 23 Branches 254 Tags
e817c823533adcc27422c2849ea3776cd2ca0607
Commit Graph

89 Commits

Author SHA1 Message Date
michael trepka
eabcadecb2 Added a mutex in MacApplication to fix thread safety issue with SlateWindowsToClose array 
#jira UE-70164
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 5012119 in //UE4/Release-4.22/... via CL 5012130
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5083839 by michael trepka in Dev-VR branch]
 2019-02-19 19:24:22 -05:00
michael trepka
f0080a8573 Allow width and height of MacWindow to be 0 
#jira UE-70038
#rb trivial

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4998695 in //UE4/Release-4.22/... via CL 4998696
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5077303 by michael trepka in Dev-VR branch]
 2019-02-19 18:10:40 -05:00
michael trepka
7582973188 Fixed thread safety in a couple of places in MacApplication where we modify Windows array 
#jira UE-64696
#rb Richard.Wallis

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4996235 in //UE4/Release-4.22/... via CL 4996237
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5076740 by michael trepka in Dev-VR branch]
 2019-02-19 18:04:15 -05:00
michael trepka
5a7e2a61a3 Queue Slate CloseWindow calls in MacApplication so that they're called in Tick instead of at random times when main thread is doing blocked game thread calls. 
#jira UE-51711
#rb Richard.Wallis

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4993210 in //UE4/Release-4.22/... via CL 4993211
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5074232 by michael trepka in Dev-VR branch]
 2019-02-19 17:32:58 -05:00
nick shin
c4d6f2a64a HTML5 - downgrading emscripten back to 1.38.20 
- engine changes to use 1.38.20 toolchain

#jira UE-69753  Multithreaded HTML5 loads into a black screen
#rnx
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4981071 in //UE4/Release-4.22/... via CL 4981072
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5033400 by nick shin in Dev-VR branch]
 2019-02-16 07:31:09 -05:00
thomas ross
da3c16a7a8 Updating some missed copyright updates. 
#jira UE-69782
#rb none
#tests none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 4947990 via CL 4947994 via CL 4947995 via CL 4948327 via CL 4950892 via CL 4953396
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5027014 by thomas ross in Dev-VR branch]
 2019-02-16 03:56:07 -05:00
brandon schaefer
dd5f2cc2e3 Focus on folder creation the same way with assets if owner window doesnt have any focus 
Revert adding popup windows who are not set to be focused to the revert stack

#jira UE-69661
#rb Rex.Hill

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4938275 in //UE4/Release-4.22/... via CL 4938279
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5022488 by brandon schaefer in Dev-VR branch]
 2019-02-16 02:37:16 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
 2019-02-06 13:27:58 -05:00
michael trepka
0b77752777 Fixed the way we calculate screen position in pixels on Mac to properly handle a case where more than two monitors are attached and only the one most on the right is low DPI 
#rb Richard.Wallis
#jira UE-69586

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4899146 in //UE4/Release-4.22/... via CL 4899150
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4913735 by michael trepka in Dev-VR branch]
 2019-02-05 19:02:12 -05:00
michael trepka
5ce15798bf Added a command line option to override the cursor type on Mac for debugging (MacCursorTypeOverride) 
#rb Richard.Wallis

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4897701 via CL 4897702 via CL 4897703 via CL 4898888 via CL 4898983
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4913674 by michael trepka in Dev-VR branch]
 2019-02-05 19:01:57 -05:00
nick shin
5b77cf659c HTML5 - emscripten toolchain upgrade 1.38.24 
epic edits for coolchain upgrade

#jira UEMOB-475 Upgrade UE4 HTML5 toolchain to support multithreading
[RN]
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890171 in //UE4/Release-4.22/... via CL 4890177
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4890181 by nick shin in Dev-VR branch]
 2019-02-04 15:04:33 -05:00
brandon schaefer
e6d8207cb1 Move back to using the Popup_Menu window type as we are no longer grabbing the mouse/keyboard here 
Make sure if we are a popup, even if we dont take focus we will be taking activation away from the main editor. Put our selfs in the revert list to revert that activation

#jira UE-69175
#rb none
[FYI] Arciel.Rekman

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4883721 in //UE4/Release-4.22/... via CL 4883722
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4883725 by brandon schaefer in Dev-VR branch]
 2019-02-04 11:29:11 -05:00
mic rooney
785c3c5aec Defaulting controllers to use hat d-pads. 
[FYI] [at]Chris.Babcock

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mic.rooney
#ROBOMERGE-SOURCE: CL 4870370 via CL 4870372 via CL 4870373 via CL 4875187 via CL 4877607
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4877850 by mic rooney in Dev-VR branch]
 2019-02-02 10:13:55 -05:00
marcus wassmer
b259f65406 Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main) 
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4854570 by marcus wassmer in Dev-VR branch]
 2019-01-30 21:24:04 -05:00
chris gagnon
632b923945 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]
 2019-01-29 19:23:19 -05:00
Ryan Vance
cf29818a4d Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration
Unblocking RoboMerge

[CL 4836190 by Ryan Vance in Dev-VR branch]
 2019-01-29 17:41:46 -05:00
Ryan Vance
82046cb96e Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration
#lockdown nick.whiting

[CL 4819818 by Ryan Vance in Dev-VR branch]
 2019-01-25 23:58:19 -05:00
mic rooney
d2d5287c35 Adding support for Razer controllers in Android input and making trigger threshold in line with other platforms. 
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: mic.rooney
#ROBOMERGE-SOURCE: CL 4793200 via CL 4799034 via CL 4799084 via CL 4800920 via CL 4801057
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4803235 by mic rooney in Dev-VR branch]
 2019-01-24 14:51:44 -05:00
Joe Conley
c12a880a0c Unshelved from pending changelist '4791207': 
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5

#rb Ryan.Vance

[CL 4792243 by Joe Conley in Dev-VR branch]
 2019-01-23 19:56:41 -05:00
Ryan Vance
91cee27746 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration

[CL 4762854 by Ryan Vance in Dev-VR branch]
 2019-01-21 13:30:34 -05:00
Joe Conley
5f947a1737 Updating Copyright in files that were not in Main when it was updated. 
#rb trivial

[CL 4755242 by Joe Conley in Dev-VR branch]
 2019-01-18 16:10:54 -05:00
Ryan Vance
d57bbbcdaf Merging using MainToDevVR 
#rb integration

[CL 4748914 by Ryan Vance in Dev-VR branch]
 2019-01-17 19:43:28 -05:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
 2019-01-17 18:54:05 -05:00
Jason Bestimt
ad9d5e5189 Updated ML integration to MLSDK 0.19 
#CodeReview: ryan.vance
#RB: ryan.vance

[CL 4636504 by Jason Bestimt in Dev-VR branch]
 2018-12-06 10:11:06 -05:00
Jason Bestimt
e7ed7cd3ff Unblock robomerge from Main 
#RB:none

[CL 4604382 by Jason Bestimt in Dev-VR branch]
 2018-11-28 15:05:11 -05:00