Updated to NWjs 0.11.6

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 CloudKid
+Copyright (c) 2015 CloudKid
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -10,6 +10,6 @@ View the editor [here](http://cloudkidstudio.github.io/PixiParticlesEditor/).
 
 ## License
 
-Copyright (c) 2014 CloudKid
+Copyright (c) 2015 CloudKid
 
 Released under the MIT License.

deploy/assets/config/trail.json

@@ -1,16 +1,39 @@
 {
-	"alpha":{"start":0.8, "end":0.1},//Start and end alpha
-	"color":{"start":"#E3F9FF", "end":"#0EC8F8"},//start and end color (no alpha)
-	"scale":{"start":1, "end":0.3},//start and end scale
-	"speed":{"start":0, "end":0},//speed in units/sec to move at, at start and end of life
-	"startRotation":{"min":0, "max":0},//minimum and maximum rotation (affects movement) of particle when emitting
-	"lifetime":{"min":0.2, "max":0.2},//lifetime of particles in seconds
-	//"ease":[{"s":0,"cp":0.482,"e":0.732},{"s":0.732,"cp":0.982,"e":1}],//custom ease, as created by http://www.greensock.com/customease/
-	"frequency":0.008,//how often to emit particles, in seconds (emitter can handle doing more than one per frame)
-	"maxParticles":1000,//probably no more than 25 for the particle life and frequency for these settings
-	"emitterLifetime":-1,//-1 is emit forever
-	"spawnType":"point",//drop particles in place
-	"angle":{"min":0, "max":0},//minimum and maximum rotation (affects movement) when emitting
-	"pos":{"x":0, "y":0},//position relative to emitter's owner's origin
-	"addAtBack":false//add at back of display list
+    "alpha": {
+        "start": 0.8,
+        "end": 0.1
+    },
+    "color": {
+        "start": "#E3F9FF",
+        "end": "#0EC8F8"
+    },
+    "scale": {
+        "start": 1,
+        "end": 0.3
+    },
+    "speed": {
+        "start": 0,
+        "end": 0
+    },
+    "startRotation": {
+        "min": 0,
+        "max": 0
+    },
+    "lifetime": {
+        "min": 0.2,
+        "max": 0.2
+    },
+    "frequency": 0.008,
+    "maxParticles": 1000,
+    "emitterLifetime": -1,
+    "spawnType": "point",
+    "angle": {
+        "min": 0,
+        "max": 0
+    },
+    "pos": {
+        "x": 0,
+        "y": 0
+    },
+    "addAtBack": false
 }

deploy/package.json

@@ -10,7 +10,7 @@
 	"single-instance": true,
 	"window": {
 		"icon": "assets/images/icon512.png",
-		"show": false,
+		"show": true,
 		"toolbar": false,
 		"frame": true,
 		"position": "center",

installer/osx.json → installer/osx32.json

@@ -14,7 +14,7 @@
             "x": 192,
             "y": 344,
             "type": "file",
-            "path": "../build/PixiParticlesEditor/osx/PixiParticlesEditor.app"
+            "path": "../build/PixiParticlesEditor/osx32/PixiParticlesEditor.app"
         }
     ]
 }

installer/osx64.json

@@ -0,0 +1,20 @@
+{
+    "title": "PixiParticles Editor",
+    "icon": "../deploy/assets/images/icon.icns",
+    "background": "assets/background.png",
+    "icon-size": 80,
+    "contents": [
+        {
+            "x": 448,
+            "y": 344,
+            "type": "link",
+            "path": "/Applications"
+        },
+        {
+            "x": 192,
+            "y": 344,
+            "type": "file",
+            "path": "../build/PixiParticlesEditor/osx64/PixiParticlesEditor.app"
+        }
+    ]
+}

installer/win.nsi → installer/win32.nsi

@@ -15,7 +15,7 @@ Name "${APPNAME}"
 Icon "..\deploy\assets\images\icon.ico"
 
 # define the resulting installer's name:
-OutFile "..\build\${APPNAME}-Setup.exe"
+OutFile "..\build\${APPNAME}-Setup-x32.exe"
 
 # Destintation install directory
 InstallDir "$PROGRAMFILES\${APPNAME}"

installer/win64.nsi

@@ -0,0 +1,89 @@
+!define APPNAME "PixiParticlesEditor"
+!define COMPANYNAME "CloudKid"
+!define DESCRIPTION "A GUI for the PixiParticles library"
+# These three must be integers
+!define VERSIONMAJOR 0
+!define VERSIONMINOR 2
+!define VERSIONBUILD 0
+# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
+# It is possible to use "mailto:" links in here to open the email client
+!define HELPURL "https://github.com/CloudKidStudio/${APPNAME}/issues"
+!define UPDATEURL "https://github.com/CloudKidStudio/${APPNAME}/releases"
+!define ABOUTURL "https://github.com/CloudKidStudio/${APPNAME}"
+
+Name "${APPNAME}"
+Icon "..\deploy\assets\images\icon.ico"
+
+# define the resulting installer's name:
+OutFile "..\build\${APPNAME}-Setup-x64.exe"
+
+# Destintation install directory
+InstallDir "$PROGRAMFILES\${APPNAME}"
+
+# default section start
+Section
+
+  # define the path to which the installer should install
+  SetOutPath "$INSTDIR"
+
+  # specify the files to go in the output path
+  # these are the Windows files produced by grunt-node-webkit-builder
+  File "../deploy/assets/images/icon.ico"
+  File "../build/${APPNAME}/win/ffmpegsumo.dll"
+  File "../build/${APPNAME}/win/icudtl.dat"
+  File "../build/${APPNAME}/win/libEGL.dll"
+  File "../build/${APPNAME}/win/libGLESv2.dll"
+  File "../build/${APPNAME}/win/nw.pak"
+  File "../build/${APPNAME}/win/${APPNAME}.exe"
+
+  # define the uninstaller name
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  # create a shortcut in the start menu
+  CreateDirectory "$SMPROGRAMS\${APPNAME}"
+  CreateShortCut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\${APPNAME}.exe" "" "$INSTDIR\icon.ico"
+
+  # Registry information for add/remove programs
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${COMPANYNAME} - ${APPNAME} - ${DESCRIPTION}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\icon.ico$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "$\"${COMPANYNAME}$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "HelpLink" "$\"${HELPURL}$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "URLUpdateInfo" "$\"${UPDATEURL}$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayVersion" "$\"${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}$\""
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "VersionMajor" ${VERSIONMAJOR}
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "VersionMinor" ${VERSIONMINOR}
+
+  # There is no option for modifying or repairing the install
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoRepair" 1
+
+SectionEnd
+
+# create a section to define what the uninstaller does
+Section "Uninstall"
+
+  # delete the uninstaller
+  Delete $INSTDIR\Uninstall.exe
+
+  # delete the installed files
+  Delete "$INSTDIR\icon.ico"
+  Delete "$INSTDIR\ffmpegsumo.dll"
+  Delete "$INSTDIR\icudt.dll"
+  Delete "$INSTDIR\libEGL.dll"
+  Delete "$INSTDIR\libGLESv2.dll"
+  Delete "$INSTDIR\nw.pak"
+  Delete "$INSTDIR\${APPNAME}.exe"
+  Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
+  Delete "$SMPROGRAMS\${APPNAME}\Uninstall.lnk"
+  rmDir "$SMPROGRAMS\${APPNAME}"
+  rmDir $INSTDIR
+
+  # Remove uninstaller information from the registry
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
+
+SectionEnd

package.json

@@ -3,9 +3,9 @@
 	"version": "0.2.0",
 	"dependencies": {
 		"grunt": "~0.4.2",
-		"project-grunt": "~0.5.0",
-		"grunt-node-webkit-builder": "~0.2.2",
+		"project-grunt": "*",
+		"grunt-node-webkit-builder": "~1.0.0",
 		"grunt-exec": "~0.4.6",
-		"grunt-gh-pages": "~0.9.1"
+		"grunt-gh-pages": "~0.10.0"
 	}
 }

build.json → project.json

@@ -9,8 +9,7 @@
 		"src/EditorInterface.js",
 		"src/Editor.js",
 		"src/App.js",
-		"src/main.js",
-		"src/main.less"
+		"src/App.less"
 	],
 	"libraries": [
 		"components/normalize.css/normalize.css",