Commit f519cf23 authored by fgp76's avatar fgp76

Nouveau système de versionning

Correction bug scan AI Prepar3D V4
parent 9df33a53
......@@ -79,8 +79,8 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="protobuf-net, Version=2.3.13.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.2.3.13\lib\net40\protobuf-net.dll</HintPath>
<Reference Include="protobuf-net, Version=2.3.14.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.2.3.14\lib\net40\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.22.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.22.0\lib\net45\SharpCompress.dll</HintPath>
......
......@@ -47,7 +47,7 @@
; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
!define OUTFILE "FFS2Play${expv_1}_${expv_2}_${expv_3}.exe"
!define OUTFILE "ffs2Play${expv_1}_${expv_2}_${expv_3}.exe"
OutFile ${OUTFILE}
InstallDir "$PROGRAMFILES\FFS2Play"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
......@@ -113,4 +113,4 @@ Section Uninstall
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
SectionEnd
!finalize '7z.exe a -mx9 "FFS2Play_${expv_1}_${expv_2}_${expv_3}.zip" ${OUTFILE}'
\ No newline at end of file
!finalize '7z.exe a -mx9 "ffs2play_${expv_1}_${expv_2}_${expv_3}.zip" ${OUTFILE}'
\ No newline at end of file
......@@ -48,7 +48,7 @@
; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
!define OutFile "FFS2PlayP3D_${expv_1}_${expv_2}_${expv_3}.exe"
!define OutFile "ffs2playp3d_${expv_1}_${expv_2}_${expv_3}.exe"
OutFile ${OUTFILE}
InstallDir "$PROGRAMFILES64\FFS2PlayP3D"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
......@@ -112,4 +112,4 @@ Section Uninstall
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
SectionEnd
!finalize '7z.exe a -mx9 "FFS2PlayP3D_${expv_1}_${expv_2}_${expv_3}.zip" ${OUTFILE}'
\ No newline at end of file
!finalize '7z.exe a -mx9 "ffs2playp3d_${expv_1}_${expv_2}_${expv_3}.zip" ${OUTFILE}'
\ No newline at end of file
......@@ -198,15 +198,15 @@ namespace ffs2play
scm.openConnection();
//Vérification de la version
string CheckVersionURL;
string CheckVersionURL = "http://download.ffsimulateur2.fr/download.php?soft=";
#if P3D
CheckVersionURL = "http://download.ffsimulateur2.fr/ffs2playp3d.php";
CheckVersionURL += "ffs2playp3d";
#else
CheckVersionURL = "http://download.ffsimulateur2.fr/ffs2play.php";
CheckVersionURL += "ffs2play";
#endif
if (Properties.Settings.Default.Beta)
{
CheckVersionURL += "?beta";
CheckVersionURL += "&beta=true";
}
HTTPRequestThread CheckVersion = new HTTPRequestThread(CheckVersionURL, CheckVersionCallBack);
......
......@@ -247,8 +247,8 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(288, 44);
this.label2.TabIndex = 1;
this.label2.Text = "Le port est utilisé par ffs2play écouter les autres trackers. La plage valide pou" +
"r utilisation P2P est de 49152 à 65535";
this.label2.Text = "Le port est utilisé par ffs2play pour écouter les autres joueurs. La plage valide" +
" pour utilisation P2P est de 49152 à 65535";
//
// gbMultijoueur
//
......
del "FFS2Play_*.zip"
del "ffs2play_*.zip"
makensis.exe /X"SetCompressor /SOLID /FINAL zlib" FFS2Play.nsi
del "*.exe"
\ No newline at end of file
......@@ -420,6 +420,7 @@ namespace ffs2play
double Static_Pitch = 0;
try
{
if (sEngine_Type.Length == 0) sEngine_Type = "0";
Engine_Type = Convert.ToInt32(sEngine_Type);
if (sStatic_CG_Height.Length == 0) sStatic_CG_Height = "0.0";
if (sStatic_Pitch.Length == 0) sStatic_Pitch = "0.0";
......
......@@ -2,7 +2,7 @@
<packages>
<package id="EntityFramework" version="6.2.0" targetFramework="net452" />
<package id="Open.NAT" version="2.1.0.0" targetFramework="net452" />
<package id="protobuf-net" version="2.3.13" targetFramework="net452" />
<package id="protobuf-net" version="2.3.14" targetFramework="net452" />
<package id="SharpCompress" version="0.22.0" targetFramework="net452" />
<package id="System.Buffers" version="4.5.0" targetFramework="net452" />
<package id="System.Data.SQLite" version="1.0.108.0" targetFramework="net452" />
......
......@@ -60,4 +60,6 @@ Notes de r
1.1.6 : Ajout de l'affichage du taux de chute avec la possibilité de le publier sur de réseau
1.1.7 : Ajout du simulateur utilisé dans le protocole serveur
\ No newline at end of file
1.1.7 : Ajout du simulateur utilisé dans le protocole serveur
1.1.8 : Correction Bug nouveaux AI vides dans P3DV4 + ajout nouveau système de versionning
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment