update for 4.22

ncsoft · May 17, 2019 · ed319d8f9de5595b13bebcf24e3543b8d55f6cd7 · ed319d8
1 parent 17e90cf
commit ed319d8f9de5595b13bebcf24e3543b8d55f6cd7
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,108 @@
-Plugins/*
-Saved/*
-Intermediate/*
-DerivedDataCache/*
-Content/*
+# Backup files from git mergetool 
+*.orig
+
+# TortoiseGit configuration file is too user specific and should not be shared
+.tgitconfig
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.tss
+*.VC.db
+*.VC.opendb
+.vs/
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/
+Plugins/*/Binaries/
+
+# Builds
+Build/*
+
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Built data for maps
+*_BuiltData.uasset
+
+# Configuration files generated by the Editor
+Saved/
+
+# Compiled source files for the engine to use
+Intermediate/
+Plugins/*/Intermediate/
+
+# Pre-compiled headers
+ipch/
+
+# Cache files for the editor to use
+DerivedDataCache/
+
+# Windows
+Thumbs.db
+ehThumbs.db
+*.lnk
+
+# Mac OS X
+.DS_Store
+.DS_Store?
+.AppleDouble
+.LSOverride
+._*
+
+# Linux
+*~
+.directory
+
+# vim
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+
 !Content/Scripts
 Content/Scripts/node_modules
diff --git a/Content/EntryWidget_C.uasset b/Content/EntryWidget_C.uasset
diff --git a/Content/Scripts/aliases.js b/Content/Scripts/aliases.js
diff --git a/Content/Scripts/demos/build/demo-browserEd.js b/Content/Scripts/demos/build/demo-browserEd.js
@@ -23,6 +23,7 @@ module.exports = function broserDesign(E) {
         componentDidMount() {
             let elem = this.TreeView.ueobj;
             elem.JavascriptContext = Context;
+            elem.EntryWidgetClass = WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass;
             elem.proxy = {
                 OnSelectionChanged: item => {
                     let extra = elem.GetSelectedItems().OutItems;

diff --git a/Content/Scripts/demos/lib/npm.js b/Content/Scripts/demos/lib/npm.js
@@ -7,7 +7,7 @@ async function npm(what) {
 
     console.log(`trying to install node module: ${what}`)
 
-    let paths = ['','/usr/local/bin/','/usr/bin/','c:\\Program Files (x86)\\nodejs\\']
+    let paths = ['','/usr/local/bin/','/usr/bin/','c:\\Program Files (x86)\\nodejs\\', 'C:\\Program Files\\nodejs\\']
 
     function check(path,param) {
         console.log(path)

diff --git a/Content/Scripts/demos/src/demo-browserEd.jsx b/Content/Scripts/demos/src/demo-browserEd.jsx
@@ -21,6 +21,7 @@ module.exports = function broserDesign(E) {
         componentDidMount() {
             let elem = this.TreeView.ueobj;
             elem.JavascriptContext = Context;
+            elem.EntryWidgetClass = WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass                
             elem.proxy = {
                 OnSelectionChanged: item => {
                     let extra = elem.GetSelectedItems().OutItems
@@ -121,7 +122,7 @@ module.exports = function broserDesign(E) {
                         Id: 'Name',
                         Width: 1.0
                     }
-                ],                
+                ],
                 OnGenerateRowEvent: (item, column, widget) => {
                     let name
                     if (item) {

diff --git a/Content/Scripts/extension-exampleWindow.js b/Content/Scripts/extension-exampleWindow.js
@@ -281,6 +281,7 @@ function main() {
                 ),
                 $link:elem => {
                     elem.JavascriptContext = Context
+                    elem.EntryWidgetClass = WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass
                     elem.alive = true
                     elem.proxy = {
                         OnSelectionChanged: item => contexts.setCurrent(item)
@@ -369,6 +370,7 @@ function main() {
                     UMG(JavascriptListView,{
                         ItemHeight:20,
                         OnContextMenuOpening: packages.contextMenu,
+                        EntryWidgetClass: WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass,                
                         OnGenerateRowEvent:(item,column) => {
                             const isName = column == 'Name'
                             return I(

diff --git a/Content/Scripts/package.json b/Content/Scripts/package.json
@@ -16,7 +16,7 @@
     "hex-rgb": "^1.0.0",
     "lodash": "^4.17.4",
     "react": "<=15.4.2",
-    "react-umg": "^0.1.7",
+    "react-umg": "^0.2.0",
     "springy": "^2.7.1"
   },
   "devDependencies": {