*** Merged Code from Multiplayer Branch Revision 2960 ***

- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-04 21:01:45 +00:00
parent 17f44f63e8
commit 47db604b50
301 changed files with 76701 additions and 1843 deletions
+15 -7
View File
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="\games\jagged alliance 2"
OutputDirectory="C:\games\jagged alliance 2 EN"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops"
@@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_EN_Debug_2949.exe"
OutputFile="$(OutDir)\JA2_EN_Debug_New.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -145,7 +145,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_EN_Release_2949.exe"
OutputFile="$(OutDir)\JA2_MP_EN_v1.1.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
@@ -183,7 +183,7 @@
</Configuration>
<Configuration
Name="MapEditor|Win32"
OutputDirectory="\games\jagged alliance 2"
OutputDirectory="\Games\Jagged Alliance 2"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops"
@@ -229,7 +229,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\MapEditor_2736_EN_Release.exe"
OutputFile="$(OutDir)\MapEditor_2634_EN_Release.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
@@ -267,7 +267,7 @@
</Configuration>
<Configuration
Name="MapEditorD|Win32"
OutputDirectory="\games\jagged alliance 2"
OutputDirectory="\Games\Jagged Alliance 2"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops"
@@ -316,7 +316,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\MapEditor_2736_EN_Debug.exe"
OutputFile="$(OutDir)\MapEditor_2634_EN_Debug.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -428,6 +428,10 @@
RelativePath=".\MPChatScreen.cpp"
>
</File>
<File
RelativePath=".\MPConnectScreen.cpp"
>
</File>
<File
RelativePath=".\MPHostScreen.cpp"
>
@@ -570,6 +574,10 @@
RelativePath=".\MPChatScreen.h"
>
</File>
<File
RelativePath=".\MPConnectScreen.h"
>
</File>
<File
RelativePath=".\MPHostScreen.h"
>