Merge branch 'tic_0.47.0'

nesbox · Oct 20, 2017 · 5d50811 · 5d50811
2 parents cd101d4 + cb05dfb
commit 5d50811
Show file tree

Hide file tree

Showing 35 changed files with 662 additions and 587 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 *.ipch
 *.opendb
 *.suo
+sexit
+.vscode/
 build/uwp/tic/Debug/
 build/uwp/tic/Release/
 build/uwp/tic/x64/

diff --git a/bin/assets/config.tic.dat b/bin/assets/config.tic.dat
diff --git a/bin/assets/tic.js.dat b/bin/assets/tic.js.dat
diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.nesbox.tic"
-      android:versionCode="4600"
-      android:versionName="0.46.0"
+      android:versionCode="4700"
+      android:versionName="0.47.0"
       android:installLocation="auto">
 
     <!-- Android 2.3.3 -->

diff --git a/build/android/default.properties b/build/android/default.properties
diff --git a/build/macosx/Info.plist b/build/macosx/Info.plist
@@ -19,9 +19,9 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.46.0</string>
+  <string>0.47.0</string>
   <key>CFBundleVersion</key>
-  <string>0.46.0</string>
+  <string>0.47.0</string>
   <key>NSHumanReadableCopyright</key>
   <string>http://tic.computer © 2017</string>
 </dict>

diff --git a/build/uwp/tic/Package.appxmanifest b/build/uwp/tic/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="50446Nesbox.TICcomputer" Publisher="CN=1040DC4A-04A1-4B33-9107-C1A9D74775D4" Version="0.46.0.0" />
+  <Identity Name="50446Nesbox.TICcomputer" Publisher="CN=1040DC4A-04A1-4B33-9107-C1A9D74775D4" Version="0.47.0.0" />
   <mp:PhoneIdentity PhoneProductId="93515db0-8ee3-478b-933a-5776b58247b2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>TIC-80</DisplayName>

diff --git a/build/uwp/tic/tic.vcxproj b/build/uwp/tic/tic.vcxproj
@@ -98,7 +98,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <PackageCertificateKeyFile>tic_StoreKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>FAF3D8EF7331C1BFD85A8A5CE536BBA943CFEF65</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>D14111A1389AE6F9821F879C5D6D066D87718B43</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>

diff --git a/build/windows/tic80/tic80.aps b/build/windows/tic80/tic80.aps
diff --git a/build/windows/tic80/tic80.rc b/build/windows/tic80/tic80.rc
diff --git a/config.tic b/config.tic
diff --git a/lib/windows/tic.rc b/lib/windows/tic.rc