Merged new MINT lobby into master.

razodactyl · Jul 8, 2020 · cfc2aa5 · cfc2aa5
1 parent 2bf8b9a
commit cfc2aa5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -199,3 +199,4 @@ ModelManifest.xml
 /.vs/dr2/v16
 /Development/appdr2
 .vs
+*.res
diff --git a/appdr2/appdr2.vcxproj b/appdr2/appdr2.vcxproj
@@ -94,7 +94,7 @@
       <DisableSpecificWarnings>4996;</DisableSpecificWarnings>
     </ClCompile>
     <PreLinkEvent>
-      <Command>..\tools\version version.rc -include=dr2.rc -company="Pandemic Studios" -description="Dark Reign 2" -comments="RELEASE" -version=1,1
+      <Command>..\tools\version version.rc -include=dr2.rc -company="Pandemic Studios" -description="Dark Reign 2" -comments="RELEASE" -version=1,4
 rc version.rc</Command>
     </PreLinkEvent>
     <PostBuildEvent>
@@ -143,7 +143,7 @@ rc version.rc</Command>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <PreLinkEvent>
-      <Command>..\tools\version version.rc -include=dr2.rc -company="Pandemic Studios" -description="Dark Reign 2" -comments="DEVELOPMENT" -version=1,1
+      <Command>..\tools\version version.rc -include=dr2.rc -company="Pandemic Studios" -description="Dark Reign 2" -comments="DEVELOPMENT" -version=1,4
 rc version.rc</Command>
     </PreLinkEvent>
     <PostBuildEvent>
@@ -191,7 +191,7 @@ rc version.rc</Command>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <PreLinkEvent>
-      <Command>..\tools\version version.rc -include=dr2.rc -company="Pandemic Studios" -description="Dark Reign 2" -comments="DEVELOPMENT" -version=1,1
+      <Command>..\tools\version version.rc -include=dr2.rc -company="Pandemic Studios" -description="Dark Reign 2" -comments="DEVELOPMENT" -version=1,4
 rc version.rc</Command>
     </PreLinkEvent>
     <PostBuildEvent>

diff --git a/appdr2/version.rc b/appdr2/version.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,0,0
- PRODUCTVERSION 1,4,0,0
+ FILEVERSION 1,1,0,0
+ PRODUCTVERSION 1,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,14 +22,14 @@ BEGIN
   BEGIN
     BLOCK "040904b0"
     BEGIN
-      VALUE "FileVersion", "1,4\0"
+      VALUE "FileVersion", "1,1\0"
       VALUE "FileDescription", "Dark Reign 2\0"
       VALUE "LegalCopyright", "Copyright � 1997-2000\0"
       VALUE "CompanyName", "Pandemic Studios\0"
       VALUE "Comments", "DEVELOPMENT\0"
-      VALUE "Build String", "Dark Reign 2 b0 [DEVELOPMENT] Wed Jul 08 18:05:28 2020\0"
-      VALUE "Build Time", "18:05:28\0"
-      VALUE "Build Date", "07/08/20\0"
+      VALUE "Build String", "Dark Reign 2 b0 [DEVELOPMENT] Thu Jul 09 01:30:08 2020\0"
+      VALUE "Build Time", "01:30:08\0"
+      VALUE "Build Date", "07/09/20\0"
       VALUE "Build Number", "0\0"
       VALUE "Build User", "razod\0"
       VALUE "Build Machine", "JONATHAN-WIN10\0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -199,3 +199,4 @@ ModelManifest.xml @@
     /.vs/dr2/v16
     /Development/appdr2
     .vs
+    *.res