Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit e74a2b3

Browse files
Merge pull request #249 from MicrosoftDX/development-0.0.16
Development 0.0.16
2 parents 8170e54 + f23bbdc commit e74a2b3

File tree

131 files changed

+14453
-3683
lines changed

Some content is hidden

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

131 files changed

+14453
-3683
lines changed

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
npm-debug.log
22
*.log
3-
/plugins/**/*.css
3+
/plugins/vorlon/**/*.css
44
tsconfig.json
55
/Plugins/obj
66
**/node_modules
@@ -11,9 +11,8 @@ bin/
1111
GLE id�es.txt
1212
sync.bat
1313
Plugins/Vorlon/plugins/remoteDebugging.zip
14-
<<<<<<< HEAD
1514
.settings/launch.json
16-
=======
1715
*.dat
18-
>>>>>>> 8e38a9097a969c97676d00f30898bb85b7de6c5c
1916
Server/public/stylesheets/style.css
17+
vorlon
18+
/Server/public/stylesheets/style.css

.vscode/launch.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"version": "0.1.0",
3+
// List of configurations. Add new configurations or edit existing ones.
4+
// ONLY "node" and "mono" are supported, change "type" to switch.
5+
"configurations": [
6+
{
7+
// Name of configuration; appears in the launch configuration drop down menu.
8+
"name": "Launch Server/server.js",
9+
// Type of configuration. Possible values: "node", "mono".
10+
"type": "node",
11+
// Workspace relative or absolute path to the program.
12+
"program": "Server/server.js",
13+
// Automatically stop program after launch.
14+
"stopOnEntry": false,
15+
// Command line arguments passed to the program.
16+
"args": [],
17+
// Workspace relative or absolute path to the working directory of the program being debugged. Default is the current workspace.
18+
"cwd": ".",
19+
// Workspace relative or absolute path to the runtime executable to be used. Default is the runtime executable on the PATH.
20+
"runtimeExecutable": null,
21+
// Optional arguments passed to the runtime executable.
22+
"runtimeArgs": ["--nolazy"],
23+
// Environment variables passed to the program.
24+
"env": { },
25+
// Use JavaScript source maps (if they exist).
26+
"sourceMaps": false,
27+
// If JavaScript source maps are enabled, the generated code is expected in this directory.
28+
"outDir": null
29+
},
30+
{
31+
"name": "Attach",
32+
"type": "node",
33+
// TCP/IP address. Default is "localhost".
34+
"address": "localhost",
35+
// Port to attach to.
36+
"port": 5858,
37+
"sourceMaps": false
38+
}
39+
]
40+
}

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
4+
"editor.fontSize": 15,
5+
}

Plugins/Vorlon/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*.js
22
*.js.map
3-
*.min.js
3+
*.min.js
4+
!verge.min.js
5+
!res.min.js

0 commit comments

Comments
 (0)