diff --git a/README.md b/README.md index 9876b4dad..87e756644 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Download ======== The latest stable miniSphere release at the time of this writing is -**miniSphere 5.0.1**, released on Thursday, November 2, 2017. miniSphere +**miniSphere 5.0.2**, released on Saturday, May 5, 2018. miniSphere binaries are provided through GitHub, and the latest version is always available for download here: diff --git a/VERSION b/VERSION index 32f3eaad0..3e827a3a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.1 \ No newline at end of file +5.0.2 \ No newline at end of file diff --git a/assets/system/game_modules/console.mjs b/assets/system/game_modules/console.mjs index fb9a4983a..0bbec8a0e 100644 --- a/assets/system/game_modules/console.mjs +++ b/assets/system/game_modules/console.mjs @@ -31,7 +31,6 @@ **/ import from from 'from'; -import Logger from 'logger'; import Prim from 'prim'; import Scene from 'scene'; import Thread from 'thread'; @@ -57,7 +56,6 @@ class Console extends Thread this.cursorColor = Color.Gold; this.entry = ""; this.font = Font.Default; - this.logger = null; this.keyboard = Keyboard.Default; this.mouse = Mouse.Default; this.nextLine = 0; @@ -104,10 +102,6 @@ class Console extends Thread ++this.nextLine; this.view.line = 0.0; SSj.log(this.buffer[lineInBuffer]); - - // if we have a logger, write the line to the log file - if (this.logger !== null) - this.logger.write(this.buffer[lineInBuffer]); } start() @@ -122,10 +116,6 @@ class Console extends Thread .end() .run(); - // create a log file only if the game has a save ID defined - if ('saveID' in Sphere.Game) - this.logger = new Logger('consoleOutput'); - this.log(`initializing the Sphere Runtime Console`); this.log(` ${Sphere.Game.name} by ${Sphere.Game.author}`); this.log(` Sphere v${Sphere.Version} API L${Sphere.APILevel} (${Sphere.Engine})`); diff --git a/manpages/cell.1 b/manpages/cell.1 index d7fe66926..4abbfeddf 100644 --- a/manpages/cell.1 +++ b/manpages/cell.1 @@ -1,4 +1,4 @@ -.TH CELL 1 "2017-11-02" "miniSphere-5.0.1" "Sphere Game Development Kit" +.TH CELL 1 "2018-05-05" "miniSphere-5.0.2" "Sphere Game Development Kit" .SH NAME cell \- Sphere v2 game compiler and packager .SH SYNOPSIS diff --git a/manpages/minisphere.1 b/manpages/minisphere.1 index 6f4612ffb..f64323d4f 100644 --- a/manpages/minisphere.1 +++ b/manpages/minisphere.1 @@ -1,4 +1,4 @@ -.TH MINISPHERE 1 "2017-11-02" "miniSphere-5.0.1" "miniSphere JS Game Engine" +.TH MINISPHERE 1 "2018-05-05" "miniSphere-5.0.2" "miniSphere JS Game Engine" .SH NAME minisphere \- lightweight JavaScript-powered game engine .SH SYNOPSIS diff --git a/manpages/spherun.1 b/manpages/spherun.1 index 4e9d15c86..9ad121a64 100644 --- a/manpages/spherun.1 +++ b/manpages/spherun.1 @@ -1,4 +1,4 @@ -.TH SPHERUN 1 "2017-11-02" "miniSphere-5.0.1" "Sphere Game Development Kit" +.TH SPHERUN 1 "2018-05-05" "miniSphere-5.0.2" "Sphere Game Development Kit" .SH NAME spherun \- run a Sphere game in a dev-friendly environment .SH SYNOPSIS diff --git a/manpages/ssj.1 b/manpages/ssj.1 index 7762f6291..62632f464 100644 --- a/manpages/ssj.1 +++ b/manpages/ssj.1 @@ -1,4 +1,4 @@ -.TH SSJ 1 "2017-11-02" "miniSphere-5.0.1" "Sphere Game Development Kit" +.TH SSJ 1 "2018-05-05" "miniSphere-5.0.2" "Sphere Game Development Kit" .SH NAME ssj \- the JavaScript debugger for miniSphere .SH SYNOPSIS diff --git a/msvs/cell.rc b/msvs/cell.rc index f4392250c..b01fcb1d7 100644 Binary files a/msvs/cell.rc and b/msvs/cell.rc differ diff --git a/msvs/minisphere.rc b/msvs/minisphere.rc index 5e151e639..488a82d7a 100644 Binary files a/msvs/minisphere.rc and b/msvs/minisphere.rc differ diff --git a/msvs/minisphere.vcxproj b/msvs/minisphere.vcxproj index c99f2ebc6..4207b43b2 100644 --- a/msvs/minisphere.vcxproj +++ b/msvs/minisphere.vcxproj @@ -156,7 +156,7 @@ false - minisphere + miniSphere ..\msw64\ obj64\release\minisphere\ StaticMonolithRelease @@ -178,7 +178,7 @@ true true false - minisphere + miniSphere ..\msw\ obj\release\minisphere\ diff --git a/msvs/ssj.rc b/msvs/ssj.rc index 50bf9f131..fe3e72bff 100644 Binary files a/msvs/ssj.rc and b/msvs/ssj.rc differ diff --git a/setup/minisphere.iss b/setup/minisphere.iss index 4232e93b3..ca7cf4bac 100644 --- a/setup/minisphere.iss +++ b/setup/minisphere.iss @@ -1,5 +1,5 @@ ; miniSphere JavaScript game engine -; Copyright (c) 2015-2017, Fat Cerberus +; Copyright (c) 2015-2018, Fat Cerberus ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ ; solution configurations. #define AppName "miniSphere" #define AppPublisher "Fat Cerberus" -#define AppVersion3 "5.0.1" +#define AppVersion3 "5.0.2" ; to create a bundle with Sphere Studio, copy the Sphere Studio binaries ; into msw/ide/ before building the installer. @@ -64,7 +64,7 @@ LicenseFile=../LICENSE.txt SetupIconFile=..\msvs\spherical.ico SolidCompression=yes UninstallDisplayName={#AppName} {#AppVersion3} -UninstallDisplayIcon={app}\minisphere.exe,0 +UninstallDisplayIcon={app}\miniSphere.exe,0 [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -94,13 +94,13 @@ Name: "assoc_ss/ssproj"; Description: ".ssproj - Sphere Studio project file"; Gr Name: "path"; Description: "Add the GDK tools to the system %&PATH%"; GroupDescription: "Develop on the command line:"; Components: spherun/cli; Flags: checkedonce unchecked [Files] -Source: "..\msw\minisphere.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: engine +Source: "..\msw\miniSphere.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: engine Source: "..\msw\spherun.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli Source: "..\msw\cell.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli Source: "..\msw\ssj.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli Source: "..\msw\ChakraCore.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: engine Source: "..\msw\gdk-cp.bat"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli -Source: "..\msw64\minisphere.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: engine; Check: IsWin64 +Source: "..\msw64\miniSphere.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: engine; Check: IsWin64 Source: "..\msw64\spherun.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli; Check: IsWin64 Source: "..\msw64\cell.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli; Check: IsWin64 Source: "..\msw64\ssj.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: spherun/cli; Check: IsWin64 @@ -118,16 +118,16 @@ Source: "..\msw\ide\*"; DestDir: "{app}\ide"; Flags: ignoreversion recursesubdir ; miniSphere associations Root: HKCR; Subkey: ".spk"; ValueType: string; ValueName: ""; ValueData: "miniSphere.SPK"; Flags: uninsdeletevalue; Tasks: assoc/spk Root: HKCR; Subkey: "miniSphere.SPK"; ValueType: string; ValueName: ""; ValueData: "Sphere Game Package"; Flags: uninsdeletekey; Tasks: assoc/spk -Root: HKCR; Subkey: "miniSphere.SPK\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\minisphere.exe,0"; Tasks: assoc/spk -Root: HKCR; Subkey: "miniSphere.SPK\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\minisphere.exe"" ""%1"""; Tasks: assoc/spk +Root: HKCR; Subkey: "miniSphere.SPK\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\miniSphere.exe,0"; Tasks: assoc/spk +Root: HKCR; Subkey: "miniSphere.SPK\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\miniSphere.exe"" ""%1"""; Tasks: assoc/spk Root: HKCR; Subkey: ".sgm"; ValueType: string; ValueName: ""; ValueData: "miniSphere.SGM"; Flags: uninsdeletevalue; Tasks: assoc/sgm Root: HKCR; Subkey: "miniSphere.SGM"; ValueType: string; ValueName: ""; ValueData: "Sphere Game Manifest"; Flags: uninsdeletekey; Tasks: assoc/sgm -Root: HKCR; Subkey: "miniSphere.SGM\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\minisphere.exe,0"; Tasks: assoc/sgm -Root: HKCR; Subkey: "miniSphere.SGM\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\minisphere.exe"" ""%1"""; Tasks: assoc/sgm +Root: HKCR; Subkey: "miniSphere.SGM\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\miniSphere.exe,0"; Tasks: assoc/sgm +Root: HKCR; Subkey: "miniSphere.SGM\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\miniSphere.exe"" ""%1"""; Tasks: assoc/sgm Root: HKCR; Subkey: ".s2gm"; ValueType: string; ValueName: ""; ValueData: "miniSphere.S2GM"; Flags: uninsdeletevalue; Tasks: assoc/s2gm Root: HKCR; Subkey: "miniSphere.S2GM"; ValueType: string; ValueName: ""; ValueData: "Sphere Game Manifest"; Flags: uninsdeletekey; Tasks: assoc/s2gm -Root: HKCR; Subkey: "miniSphere.S2GM\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\minisphere.exe,0"; Tasks: assoc/s2gm -Root: HKCR; Subkey: "miniSphere.S2GM\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\minisphere.exe"" ""%1"""; Tasks: assoc/s2gm +Root: HKCR; Subkey: "miniSphere.S2GM\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\miniSphere.exe,0"; Tasks: assoc/s2gm +Root: HKCR; Subkey: "miniSphere.S2GM\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\miniSphere.exe"" ""%1"""; Tasks: assoc/s2gm ; Sphere Studio associations #ifdef INCLUDE_SPHERE_STUDIO Root: HKCR; Subkey: ".ssproj"; ValueType: string; ValueName: ""; ValueData: "miniSphere.SSPROJ"; Flags: uninsdeletevalue; Tasks: assoc_ss/ssproj @@ -139,7 +139,7 @@ Root: HKCR; Subkey: "miniSphere.SSPROJ\shell\open\command"; ValueType: string; V Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{app};{olddata}"; Tasks: path [Icons] -Name: "{commonprograms}\{#AppName}"; Filename: "{app}\minisphere.exe" +Name: "{commonprograms}\{#AppName}"; Filename: "{app}\miniSphere.exe" #ifdef INCLUDE_SPHERE_STUDIO Name: "{commonprograms}\Sphere Studio"; Filename: "{app}\ide\Sphere Studio.exe"; Components: spherun/ide #endif diff --git a/src/plugin/PluginMain.cs b/src/plugin/PluginMain.cs index a2f25b883..d96f47238 100644 --- a/src/plugin/PluginMain.cs +++ b/src/plugin/PluginMain.cs @@ -16,7 +16,7 @@ public class PluginMain : IPluginMain { public string Name { get; } = "miniSphere Support"; public string Description { get; } = "Provides support for the miniSphere toolchain."; - public string Version { get; } = "5.0.1"; + public string Version { get; } = "5.0.2"; public string Author { get; } = "Fat Cerberus"; internal PluginConf Conf { get; private set; } diff --git a/src/plugin/Properties/AssemblyInfo.cs b/src/plugin/Properties/AssemblyInfo.cs index 691913463..10d623b99 100644 --- a/src/plugin/Properties/AssemblyInfo.cs +++ b/src/plugin/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.1.2621")] -[assembly: AssemblyFileVersion("5.0.1.2621")] +[assembly: AssemblyVersion("5.0.2.2631")] +[assembly: AssemblyFileVersion("5.0.2.2631")] diff --git a/src/shared/version.h b/src/shared/version.h index d8510dd58..bac2d0893 100644 --- a/src/shared/version.h +++ b/src/shared/version.h @@ -33,7 +33,7 @@ #ifndef SPHERE__VERSION_H__INCLUDED #define SPHERE__VERSION_H__INCLUDED -#define SPHERE_VERSION "5.0.1" +#define SPHERE_VERSION "5.0.2" #define SPHERE_ENGINE_NAME "miniSphere" #define SPHERE_COMPILER_NAME "Cell"