Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 7c979c5

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/update-4.17'
2 parents 73f0cee + 1d9c019 commit 7c979c5

File tree

379 files changed

+25815
-1571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+25815
-1571
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,7 @@ ENV/
9191
Binaries/
9292

9393
#don't update this file again
94-
Content/Scripts/upyconfig.json
94+
Content/Scripts/upyconfig.json
95+
python35/
96+
python27/
97+
*.un~

CONTRIBUTORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Roberto De Ioris (maintainer and developer, 20Tab)
2+
Ikrima Elhassan (developer and sponsor, Kite & Lightning)
13
Tony Barbieri
24
Huey Park
35
Eric Feng
6+

Content/Scripts/upyconfig.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

Content/Scripts/upystartup.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import unreal_engine as ue
33
import json
44
import upycmd as cmd
5+
import os
56
from os import listdir
67
from os import path as ospath
78

@@ -12,6 +13,14 @@ def checkPipDirectory():
1213
configPath = cmd.PythonPluginScriptPath() + '/upyconfig.json'
1314
correctPipPath = cmd.PythonHomeScriptsPath()
1415

16+
#check that we have a config file, if not make an empty one
17+
if not (os.path.exists(configPath)):
18+
with open(configPath, "w+") as configFile:
19+
configs = {}
20+
configs['pipDirectoryPath'] = ""
21+
configFile.seek(0)
22+
configFile.write(json.dumps(configs))
23+
1524
#compare our current pip directory with the installed one, if they differ reinstall pip
1625

1726
with open(configPath, "r+") as configFile:

0 commit comments

Comments
 (0)