Skip to content

Commit

Permalink
update for 4.22
Browse files Browse the repository at this point in the history
  • Loading branch information
crocuis committed May 17, 2019
1 parent 17e90cf commit ed319d8
Show file tree
Hide file tree
Showing 12 changed files with 36,799 additions and 28,531 deletions.
111 changes: 106 additions & 5 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,108 @@
Plugins/* # Backup files from git mergetool
Saved/* *.orig
Intermediate/*
DerivedDataCache/* # TortoiseGit configuration file is too user specific and should not be shared
Content/* .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
Content/Scripts/node_modules Content/Scripts/node_modules
Binary file added Content/EntryWidget_C.uasset
Binary file not shown.
1,913 changes: 1,247 additions & 666 deletions Content/Scripts/aliases.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Content/Scripts/demos/build/demo-browserEd.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = function broserDesign(E) {
componentDidMount() { componentDidMount() {
let elem = this.TreeView.ueobj; let elem = this.TreeView.ueobj;
elem.JavascriptContext = Context; elem.JavascriptContext = Context;
elem.EntryWidgetClass = WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass;
elem.proxy = { elem.proxy = {
OnSelectionChanged: item => { OnSelectionChanged: item => {
let extra = elem.GetSelectedItems().OutItems; let extra = elem.GetSelectedItems().OutItems;
Expand Down
2 changes: 1 addition & 1 deletion Content/Scripts/demos/lib/npm.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async function npm(what) {


console.log(`trying to install node module: ${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) { function check(path,param) {
console.log(path) console.log(path)
Expand Down
3 changes: 2 additions & 1 deletion Content/Scripts/demos/src/demo-browserEd.jsx
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = function broserDesign(E) {
componentDidMount() { componentDidMount() {
let elem = this.TreeView.ueobj; let elem = this.TreeView.ueobj;
elem.JavascriptContext = Context; elem.JavascriptContext = Context;
elem.EntryWidgetClass = WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass
elem.proxy = { elem.proxy = {
OnSelectionChanged: item => { OnSelectionChanged: item => {
let extra = elem.GetSelectedItems().OutItems let extra = elem.GetSelectedItems().OutItems
Expand Down Expand Up @@ -121,7 +122,7 @@ module.exports = function broserDesign(E) {
Id: 'Name', Id: 'Name',
Width: 1.0 Width: 1.0
} }
], ],
OnGenerateRowEvent: (item, column, widget) => { OnGenerateRowEvent: (item, column, widget) => {
let name let name
if (item) { if (item) {
Expand Down
2 changes: 2 additions & 0 deletions Content/Scripts/extension-exampleWindow.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ function main() {
), ),
$link:elem => { $link:elem => {
elem.JavascriptContext = Context elem.JavascriptContext = Context
elem.EntryWidgetClass = WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass
elem.alive = true elem.alive = true
elem.proxy = { elem.proxy = {
OnSelectionChanged: item => contexts.setCurrent(item) OnSelectionChanged: item => contexts.setCurrent(item)
Expand Down Expand Up @@ -369,6 +370,7 @@ function main() {
UMG(JavascriptListView,{ UMG(JavascriptListView,{
ItemHeight:20, ItemHeight:20,
OnContextMenuOpening: packages.contextMenu, OnContextMenuOpening: packages.contextMenu,
EntryWidgetClass: WidgetBlueprint.Load('/Game/EntryWidget_C').GeneratedClass,
OnGenerateRowEvent:(item,column) => { OnGenerateRowEvent:(item,column) => {
const isName = column == 'Name' const isName = column == 'Name'
return I( return I(
Expand Down
2 changes: 1 addition & 1 deletion Content/Scripts/package.json
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"hex-rgb": "^1.0.0", "hex-rgb": "^1.0.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"react": "<=15.4.2", "react": "<=15.4.2",
"react-umg": "^0.1.7", "react-umg": "^0.2.0",
"springy": "^2.7.1" "springy": "^2.7.1"
}, },
"devDependencies": { "devDependencies": {
Expand Down

0 comments on commit ed319d8

Please sign in to comment.