Skip to content

Commit

Permalink
miniSphere 5.0.2
Browse files Browse the repository at this point in the history
Just some backports from 5.1 and 5.2 in the interest of simplifying the
distinction between API levels.  Particularly considering some of these
changes were oversights in the original L1 API freeze...
  • Loading branch information
fatcerberus committed May 6, 2018
1 parent acd244b commit 8d91edb
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 34 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.1
5.0.2
10 changes: 0 additions & 10 deletions assets/system/game_modules/console.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
**/

import from from 'from';
import Logger from 'logger';
import Prim from 'prim';
import Scene from 'scene';
import Thread from 'thread';
Expand All @@ -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;
Expand Down Expand Up @@ -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()
Expand All @@ -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})`);
Expand Down
2 changes: 1 addition & 1 deletion manpages/cell.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion manpages/minisphere.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion manpages/spherun.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion manpages/ssj.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file modified msvs/cell.rc
Binary file not shown.
Binary file modified msvs/minisphere.rc
Binary file not shown.
4 changes: 2 additions & 2 deletions msvs/minisphere.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>minisphere</TargetName>
<TargetName>miniSphere</TargetName>
<OutDir>..\msw64\</OutDir>
<IntDir>obj64\release\minisphere\</IntDir>
<Allegro_LibraryType>StaticMonolithRelease</Allegro_LibraryType>
Expand All @@ -178,7 +178,7 @@
<Allegro_AddonMemfile>true</Allegro_AddonMemfile>
<Allegro_AddonColor>true</Allegro_AddonColor>
<LinkIncremental>false</LinkIncremental>
<TargetName>minisphere</TargetName>
<TargetName>miniSphere</TargetName>
<OutDir>..\msw\</OutDir>
<IntDir>obj\release\minisphere\</IntDir>
</PropertyGroup>
Expand Down
Binary file modified msvs/ssj.rc
Binary file not shown.
24 changes: 12 additions & 12 deletions setup/minisphere.iss
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/PluginMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
4 changes: 2 additions & 2 deletions src/plugin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion src/shared/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8d91edb

Please sign in to comment.