2.5.0: Finally a merge of the source code of B2SBackglassServer & B2S…

…BackglassServerEXE into one. Should not be noticed while running, but huge for development.
vpinball · Jun 26, 2024 · ffa1038 · ffa1038
1 parent 10b0e06
commit ffa1038
Show file tree

Hide file tree

Showing 71 changed files with 15 additions and 18,980 deletions.
diff --git a/.github/workflows/b2s-backglass.yml b/.github/workflows/b2s-backglass.yml
@@ -70,7 +70,6 @@ jobs:
         shell: cmd
       - name: Bundle 
         run: |
-          ls -R b2sbackglassserver/b2sbackglassserver/bin
           mkdir tmp  
           cp b2s_screenresidentifier/b2s_screenresidentifier/bin/${{ matrix.platform }}/${{ matrix.config }}/B2S_ScreenResIdentifier.exe tmp
           cp b2s_screenresidentifier/b2s_screenresidentifier/bin/${{ matrix.platform }}/${{ matrix.config }}/B2S_ScreenResIdentifier.exe.config tmp

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,7 @@
+2.5.0
+- Finally a merge of the source code of B2SBackglassServer & B2SBackglassServerEXE into one. Should not be noticed while running, but huge for development.
+- Added new method B2SSetPos(ImageId, xpos, ypos) to move the images on the backglass.
+
 2.1.2
 - Request to turn off backglass in b2s settings #80   Thanks @stevejones72!
   It is a setting per table, so the table you save with hidden backglass will have it's backglass not shown. 

diff --git a/b2s_screenresidentifier/b2s_screenresidentifier/My Project/AssemblyInfo.vb b/b2s_screenresidentifier/b2s_screenresidentifier/My Project/AssemblyInfo.vb
@@ -31,6 +31,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.0.0")> 
-<Assembly: AssemblyFileVersion("3.0.0")> 
-<Assembly: AssemblyInformationalVersion("3.0.0")>
+<Assembly: AssemblyVersion("2.5.0")> 
+<Assembly: AssemblyFileVersion("2.5.0")> 
+<Assembly: AssemblyInformationalVersion("2.5.0")>
diff --git a/b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb b/b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb
@@ -27,7 +27,6 @@ Public Class B2SScreen
     Public Property PlayfieldSize() As Size = New Size(0, 0)
     Public Property BackglassMonitor() As String = String.Empty
     Public Property BackglassScreen() As Screen = Nothing
-    Public Property StartBackground() As Boolean = False
     Public Property BackglassSize() As Size = New Size(0, 0)
     Public Property BackglassLocation() As Point = New Point(0, 0)
     Public Property BackglassGrillHeight() As Integer = 0

diff --git a/b2sbackglassserver/b2sbackglassserver/Forms/formBackglass.vb b/b2sbackglassserver/b2sbackglassserver/Forms/formBackglass.vb
@@ -2738,7 +2738,7 @@ Public Class formBackglass
                         End If
                     End If
 
-                    If mergeBulbs Then
+#If mergeBulbs Then
                     ' look for the largest bulb amount
                         Dim topSize4Authentic As Integer = 0
                     Dim topkey4Authentic As String = String.Empty
@@ -2816,7 +2816,7 @@ Public Class formBackglass
                         CheckBulbs(TopRomID4Fantasy, TopRomIDType4Fantasy, TopRomInverted4Fantasy, B2SData.eDualMode.Fantasy)
                         CheckBulbs(SecondRomID4Fantasy, SecondRomIDType4Fantasy, SecondRomInverted4Fantasy, B2SData.eDualMode.Fantasy)
                     End If
-                    End If
+#End If
                 End If
 
                 ' get all animation info

diff --git a/b2sbackglassserver/b2sbackglassserver/My Project/AssemblyInfo.vb b/b2sbackglassserver/b2sbackglassserver/My Project/AssemblyInfo.vb
@@ -34,6 +34,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.0.0")> 
-<Assembly: AssemblyFileVersion("3.0.0")> 
-<Assembly: AssemblyInformationalVersion("3.0.0")> 
+<Assembly: AssemblyVersion("2.5.0")> 
+<Assembly: AssemblyFileVersion("2.5.0")> 
+<Assembly: AssemblyInformationalVersion("2.5.0")> 
diff --git a/b2sbackglassserverexe/B2SBackglassServerEXE.ico b/b2sbackglassserverexe/B2SBackglassServerEXE.ico
diff --git a/b2sbackglassserverexe/B2SBackglassServerEXE.sln b/b2sbackglassserverexe/B2SBackglassServerEXE.sln
diff --git a/b2sbackglassserverexe/B2SBackglassServerEXE.vbproj b/b2sbackglassserverexe/B2SBackglassServerEXE.vbproj
diff --git a/b2sbackglassserverexe/My Project/Application.Designer.vb b/b2sbackglassserverexe/My Project/Application.Designer.vb
diff --git a/b2sbackglassserverexe/My Project/Application.myapp b/b2sbackglassserverexe/My Project/Application.myapp
diff --git a/b2sbackglassserverexe/My Project/Settings.Designer.vb b/b2sbackglassserverexe/My Project/Settings.Designer.vb
diff --git a/b2sbackglassserverexe/My Project/Settings.settings b/b2sbackglassserverexe/My Project/Settings.settings
diff --git a/b2sbackglassserverexe/My Project/app.manifest b/b2sbackglassserverexe/My Project/app.manifest
diff --git a/b2sbackglassserverexe/My Project/launchSettings.json b/b2sbackglassserverexe/My Project/launchSettings.json