1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
ja2_VS2008.sln
+60 -16
View File
@@ -13,6 +13,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja2", "ja2_VS2008.vcproj",
{DF8C5F50-6FB1-4AFE-8EF4-6B7F360D9C28} = {DF8C5F50-6FB1-4AFE-8EF4-6B7F360D9C28}
{629F0A55-6A19-4107-8B5C-5B08B2B3949C} = {629F0A55-6A19-4107-8B5C-5B08B2B3949C}
{DB40B90D-13F9-4FEC-8F1D-0506CC496586} = {DB40B90D-13F9-4FEC-8F1D-0506CC496586}
{4B544F1A-6188-4255-8877-69FC312D0D2C} = {4B544F1A-6188-4255-8877-69FC312D0D2C}
{9AD14886-DB5C-4EFF-AE17-35F9BD684692} = {9AD14886-DB5C-4EFF-AE17-35F9BD684692}
{A67922A0-0A3F-497F-A724-19B513EFC078} = {A67922A0-0A3F-497F-A724-19B513EFC078}
{C63466D6-49B5-4C54-AA0D-864F6171FD9B} = {C63466D6-49B5-4C54-AA0D-864F6171FD9B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console\Console_VS2008.vcproj", "{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}"
@@ -35,6 +39,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TileEngine", "TileEngine\Ti
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils", "Utils\Utils_VS2008.vcproj", "{DB40B90D-13F9-4FEC-8F1D-0506CC496586}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VFS", "VFS\VFS_VS2008.vcproj", "{C63466D6-49B5-4C54-AA0D-864F6171FD9B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "ext\libpng\projects\visualc71\libpng.vcproj", "{4B544F1A-6188-4255-8877-69FC312D0D2C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "ext\libpng\projects\visualc71\zlib.vcproj", "{A67922A0-0A3F-497F-A724-19B513EFC078}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7z", "ext\7z\Archive\7z\7z.vcproj", "{9AD14886-DB5C-4EFF-AE17-35F9BD684692}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -51,6 +63,14 @@ Global
{B112F6BA-AF32-489C-B405-916C0F182D10}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{B112F6BA-AF32-489C-B405-916C0F182D10}.Release|Win32.ActiveCfg = Release|Win32
{B112F6BA-AF32-489C-B405-916C0F182D10}.Release|Win32.Build.0 = Release|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Debug|Win32.ActiveCfg = Debug|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Debug|Win32.Build.0 = Debug|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditor|Win32.Build.0 = MapEditor|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Release|Win32.ActiveCfg = Release|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Release|Win32.Build.0 = Release|Win32
{99341DB1-FD6E-4E87-919B-25C813F08D18}.Debug|Win32.ActiveCfg = Debug|Win32
{99341DB1-FD6E-4E87-919B-25C813F08D18}.Debug|Win32.Build.0 = Debug|Win32
{99341DB1-FD6E-4E87-919B-25C813F08D18}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
@@ -75,6 +95,14 @@ Global
{60D5BF89-B609-4A30-A38D-9FE417FB12B6}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{60D5BF89-B609-4A30-A38D-9FE417FB12B6}.Release|Win32.ActiveCfg = Release|Win32
{60D5BF89-B609-4A30-A38D-9FE417FB12B6}.Release|Win32.Build.0 = Release|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Debug|Win32.ActiveCfg = Debug|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Debug|Win32.Build.0 = Debug|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditor|Win32.Build.0 = MapEditor|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Release|Win32.ActiveCfg = Release|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Release|Win32.Build.0 = Release|Win32
{40475E2B-AD37-4A99-85A4-1E507010344C}.Debug|Win32.ActiveCfg = Debug|Win32
{40475E2B-AD37-4A99-85A4-1E507010344C}.Debug|Win32.Build.0 = Debug|Win32
{40475E2B-AD37-4A99-85A4-1E507010344C}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
@@ -115,22 +143,38 @@ Global
{DB40B90D-13F9-4FEC-8F1D-0506CC496586}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{DB40B90D-13F9-4FEC-8F1D-0506CC496586}.Release|Win32.ActiveCfg = Release|Win32
{DB40B90D-13F9-4FEC-8F1D-0506CC496586}.Release|Win32.Build.0 = Release|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Debug|Win32.ActiveCfg = Debug|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Debug|Win32.Build.0 = Debug|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditor|Win32.Build.0 = MapEditor|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Release|Win32.ActiveCfg = Release|Win32
{0BE7070B-C8C5-409A-82DD-0701D54A1C6C}.Release|Win32.Build.0 = Release|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Debug|Win32.ActiveCfg = Debug|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Debug|Win32.Build.0 = Debug|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditor|Win32.Build.0 = MapEditor|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Release|Win32.ActiveCfg = Release|Win32
{96FA90B1-2ABD-42E7-9CAB-14804DFD3240}.Release|Win32.Build.0 = Release|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.Debug|Win32.ActiveCfg = Debug|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.Debug|Win32.Build.0 = Debug|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.MapEditor|Win32.Build.0 = MapEditor|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.Release|Win32.ActiveCfg = Release|Win32
{C63466D6-49B5-4C54-AA0D-864F6171FD9B}.Release|Win32.Build.0 = Release|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.Debug|Win32.ActiveCfg = Debug|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.Debug|Win32.Build.0 = Debug|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.MapEditor|Win32.Build.0 = MapEditor|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.Release|Win32.ActiveCfg = Release|Win32
{4B544F1A-6188-4255-8877-69FC312D0D2C}.Release|Win32.Build.0 = Release|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.Debug|Win32.ActiveCfg = Debug|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.Debug|Win32.Build.0 = Debug|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.MapEditor|Win32.Build.0 = MapEditor|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.Release|Win32.ActiveCfg = Release|Win32
{A67922A0-0A3F-497F-A724-19B513EFC078}.Release|Win32.Build.0 = Release|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.Debug|Win32.ActiveCfg = Debug|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.Debug|Win32.Build.0 = Debug|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.MapEditor|Win32.Build.0 = MapEditor|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.Release|Win32.ActiveCfg = Release|Win32
{9AD14886-DB5C-4EFF-AE17-35F9BD684692}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE