diff --git a/.gitignore b/.gitignore index 1474e7f..7b2eec2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ Debug oa.ncb +Release +OpenArena-0.1.2-alpha.exe +vc70.idb diff --git a/ModelConverter/.gitignore b/ModelConverter/.gitignore new file mode 100644 index 0000000..1746e32 --- /dev/null +++ b/ModelConverter/.gitignore @@ -0,0 +1,2 @@ +bin +obj diff --git a/ModelConverter/App.ico b/ModelConverter/App.ico new file mode 100644 index 0000000..3a5525f Binary files /dev/null and b/ModelConverter/App.ico differ diff --git a/ModelConverter/AssemblyInfo.cs b/ModelConverter/AssemblyInfo.cs new file mode 100644 index 0000000..9f89a32 --- /dev/null +++ b/ModelConverter/AssemblyInfo.cs @@ -0,0 +1,58 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +// +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +// +[assembly: AssemblyTitle("")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: + +[assembly: AssemblyVersion("1.0.*")] + +// +// In order to sign your assembly you must specify a key to use. Refer to the +// Microsoft .NET Framework documentation for more information on assembly signing. +// +// Use the attributes below to control which key is used for signing. +// +// Notes: +// (*) If no key is specified, the assembly is not signed. +// (*) KeyName refers to a key that has been installed in the Crypto Service +// Provider (CSP) on your machine. KeyFile refers to a file which contains +// a key. +// (*) If the KeyFile and the KeyName values are both specified, the +// following processing occurs: +// (1) If the KeyName can be found in the CSP, that key is used. +// (2) If the KeyName does not exist and the KeyFile does exist, the key +// in the KeyFile is installed into the CSP and used. +// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. +// When specifying the KeyFile, the location of the KeyFile should be +// relative to the project output directory which is +// %Project Directory%\obj\. For example, if your KeyFile is +// located in the project directory, you would specify the AssemblyKeyFile +// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] +// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework +// documentation for more information on this. +// +[assembly: AssemblyDelaySign(false)] +[assembly: AssemblyKeyFile("")] +[assembly: AssemblyKeyName("")] diff --git a/ModelConverter/MS3DLoader.cs b/ModelConverter/MS3DLoader.cs new file mode 100644 index 0000000..78c3143 --- /dev/null +++ b/ModelConverter/MS3DLoader.cs @@ -0,0 +1,17 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for MS3DLoader. + /// + public class MS3DLoader + { + public MS3DLoader() + { + // + // TODO: Add constructor logic here + // + } + } +} diff --git a/ModelConverter/Model.cs b/ModelConverter/Model.cs new file mode 100644 index 0000000..17271a7 --- /dev/null +++ b/ModelConverter/Model.cs @@ -0,0 +1,17 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for Model. + /// + public class Model + { + public Model() + { + // + // TODO: Add constructor logic here + // + } + } +} diff --git a/ModelConverter/ModelConverter.csproj b/ModelConverter/ModelConverter.csproj new file mode 100644 index 0000000..07d2133 --- /dev/null +++ b/ModelConverter/ModelConverter.csproj @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ModelConverter/ModelConverter.csproj.user b/ModelConverter/ModelConverter.csproj.user new file mode 100644 index 0000000..dcd2b69 --- /dev/null +++ b/ModelConverter/ModelConverter.csproj.user @@ -0,0 +1,48 @@ + + + + + + + + + + + + diff --git a/ModelConverter/ModelLoader.cs b/ModelConverter/ModelLoader.cs new file mode 100644 index 0000000..e96643d --- /dev/null +++ b/ModelConverter/ModelLoader.cs @@ -0,0 +1,17 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for ModelLoader. + /// + public class ModelLoader + { + public ModelLoader() + { + // + // TODO: Add constructor logic here + // + } + } +} diff --git a/ModelConverter/ModelWriter.cs b/ModelConverter/ModelWriter.cs new file mode 100644 index 0000000..c4f0056 --- /dev/null +++ b/ModelConverter/ModelWriter.cs @@ -0,0 +1,17 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for ModelWriter. + /// + public class ModelWriter + { + public ModelWriter() + { + // + // TODO: Add constructor logic here + // + } + } +} diff --git a/ModelConverter/OAMLoader.cs b/ModelConverter/OAMLoader.cs new file mode 100644 index 0000000..5f1eed1 --- /dev/null +++ b/ModelConverter/OAMLoader.cs @@ -0,0 +1,17 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for OAMLoader. + /// + public class OAMLoader + { + public OAMLoader() + { + // + // TODO: Add constructor logic here + // + } + } +} diff --git a/ModelConverter/OAMWriter.cs b/ModelConverter/OAMWriter.cs new file mode 100644 index 0000000..a4c292d --- /dev/null +++ b/ModelConverter/OAMWriter.cs @@ -0,0 +1,17 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for OAMWriter. + /// + public class OAMWriter + { + public OAMWriter() + { + // + // TODO: Add constructor logic here + // + } + } +} diff --git a/ModelConverter/Startup.cs b/ModelConverter/Startup.cs new file mode 100644 index 0000000..66a9127 --- /dev/null +++ b/ModelConverter/Startup.cs @@ -0,0 +1,22 @@ +using System; + +namespace ModelConverter +{ + /// + /// Summary description for Class1. + /// + class Startup + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main(string[] args) + { + // + // TODO: Add code to start application here + // + System.Console.WriteLine("Poke!"); + } + } +} diff --git a/oa.nsi b/oa.nsi index 7bd4f51..d36ff67 100644 --- a/oa.nsi +++ b/oa.nsi @@ -11,17 +11,21 @@ Name "OpenArena" ; The installer icon -Icon "${NSISDIR}\contrib\Icons\setup.ico" +Icon "${NSISDIR}\Contrib\Graphics\Icons\modern-install-blue-full.ico" + +; The uninstaller icon +UninstallIcon "${NSISDIR}\Contrib\Graphics\Icons\modern-install-blue-full.ico" + ; The file to write -OutFile "OpenArena-0.1.0-alpha.exe" +OutFile "OpenArena-0.1.2-alpha.exe" ; The default installation directory -InstallDir "$PROGRAMFILES\HHPS\OpenArena-0.1.0-alpha" +InstallDir "$PROGRAMFILES\HHPS\OpenArena-0.1.2-alpha" ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) -InstallDirRegKey HKLM SOFTWARE\HHPS\OpenArena-0.1.0-alpha "Install_Dir" +InstallDirRegKey HKLM SOFTWARE\HHPS\OpenArena-0.1.2-alpha "Install_Dir" ; The text to prompt the user to enter a directory ComponentText "This will install OpenArena on your computer. Select which options you want installed." @@ -31,121 +35,170 @@ DirText "Choose a directory to install in to:" ;-------------------------------- -; The stuff to install +; Main section docs and libs Section "Base (required)" SectionIn RO - ; Set output path to the installation directory. + ;Dynamic libraries + CreateDirectory $INSTDIR SetOutPath $INSTDIR + File ".\OpenArena\bass.dll" + WriteUninstaller "uninstall.exe" - ; Put file there - File ".\bass.dll" - File ".\license.txt" - File ".\OpenArena User's Manual.doc" - File ".\OpenArena User's Manual.html" - SetOutPath $INSTDIR\OpenArena - File ".\bass.dll" - + ;Documentation + CreateDirectory "$INSTDIR\doc" + SetOutPath "$INSTDIR\doc" + File ".\doc\*.doc" + File ".\doc\*.html" + ; Write the installation path into the registry - WriteRegStr HKLM SOFTWARE\HHPS\OpenArena-0.1.0-alpha "Install_Dir" "$INSTDIR" + WriteRegStr HKLM SOFTWARE\HHPS\OpenArena-0.1.2-alpha "Install_Dir" "$INSTDIR" ; Write the uninstall keys for Windows - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenArena v0.1.0-alpha" "DisplayName" "OpenArena v0.1.0-alpha (remove only)" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenArena v0.1.0-alpha" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenArena v0.1.2-alpha" "DisplayName" "OpenArena v0.1.2-alpha (remove only)" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenArena v0.1.2-alpha" "UninstallString" '"$INSTDIR\uninstall.exe"' WriteUninstaller "uninstall.exe" CreateDirectory "$SMPROGRAMS\HHPS\OpenArena" SetOutPath $INSTDIR\OpenArena - CreateShortCut "$SMPROGRAMS\HHPS\OpenArena\Readme v0.1.0-alpha.lnk" "$INSTDIR\OpenArena User's Manual.html" + CreateShortCut "$SMPROGRAMS\HHPS\OpenArena\Readme v0.1.2-alpha.lnk" "$INSTDIR\doc\OpenArena User's Manual.html" - SectionEnd -; optional section (can be disabled by the user) +; Source Files required to create and compile a game using the OpenArena SDK Section "SDK" - SetOutPath $INSTDIR - File ".\oa.sln" - File ".\oa.vcproj" - File ".\oa.ncb" - File ".\oa.suo" - File ".\heading.txt" - SetOutPath $INSTDIR\include + CreateDirectory "$INSTDIR\sources" + SetOutPath "$INSTDIR\sources" + File ".\*.txt" + File ".\*.nsi" + File ".\oa.*" + File ".*" + File "Makefile" + + CreateDirectory "$INSTDIR\sources\lib" + SetOutPath "$INSTDIR\sources\lib" + File ".\lib\bass.lib" + + CreateDirectory "$INSTDIR\sources\include" + SetOutPath "$INSTDIR\sources\include" File ".\include\*.h" - SetOutPath $INSTDIR\lib - File ".\lib\*.lib" - SetOutPath $INSTDIR\src + + CreateDirectory "$INSTDIR\sources\src" + SetOutPath "$INSTDIR\sources\src" File ".\src\*.cpp" - SetOutPath $INSTDIR\OpenArena\oa\config + File ".\Makefile" + + CreateDirectory "$INSTDIR\sources\OpenArena" + SetOutPath "$INSTDIR\sources\OpenArena" + File ".\OpenArena\bass.dll" + + CreateDirectory "$INSTDIR\sources\OpenArena\oa" + CreateDirectory "$INSTDIR\sources\OpenArena\oa\config" + SetOutPath "$INSTDIR\sources\OpenArena\oa\config" File ".\OpenArena\oa\config\my.cfg" - CreateDirectory $INSTDIR\OpenArena\oa\maps - CreateDirectory $INSTDIR\OpenArena\oa\music\bgm - CreateDirectory $INSTDIR\OpenArena\oa\textures\menu - SetOutPath $INSTDIR\OpenArena - - CreateShortCut "$SMPROGRAMS\HHPS\OpenArena\OpenArena SDK v0.1.0-alpha.lnk" "$INSTDIR\oa.sln" + + CreateDirectory "$INSTDIR\sources\OpenArena\oa\maps" + SetOutPath "$INSTDIR\sources\OpenArena\oa\maps" + File ".\OpenArena\oa\maps\intro.map" + + CreateDirectory "$INSTDIR\sources\OpenArena\oa\music\bgm" + ;SetOutPath "$INSTDIR\sources\OpenArena\oa\music\bgm" + ;File ".\OpenArena\oa\music\bgm\*.mp3" + + CreateDirectory "$INSTDIR\sources\OpenArena\oa\textures" + SetOutPath "$INSTDIR\sources\OpenArena\oa\textures" + File ".\OpenArena\oa\textures\*.bmp" + File ".\OpenArena\oa\textures\*.tga" + CreateDirectory "$INSTDIR\sources\OpenArena\oa\textures\menu" + SetOutPath "$INSTDIR\sources\OpenArena\oa\textures\menu" + File ".\OpenArena\oa\textures\menu\*.bmp" + File ".\OpenArena\oa\textures\menu\*.tga" + + CreateDirectory "$INSTDIR\sources\ModelConverter" + SetOutPath "$INSTDIR\sources\ModelConverter" + File ".\ModelConverter\*.cs" + File ".\ModelConverter\*.ico" + File ".\ModelConverter\*.csproj" + File ".\ModelConverter\*.csproj.user" + + CreateShortCut "$SMPROGRAMS\HHPS\OpenArena\OpenArena SDK v0.1.2-alpha.lnk" "$INSTDIR\sources\oa.sln" SectionEnd Section "Media" - SetOutPath $INSTDIR\OpenArena + CreateDirectory "$INSTDIR" + SetOutPath "$INSTDIR" File ".\OpenArena\oa.exe" - SetOutPath $INSTDIR\OpenArena\oa\config + + CreateDirectory "$INSTDIR\oa" + CreateDirectory "$INSTDIR\oa\config" + SetOutPath "$INSTDIR\oa\config" File ".\OpenArena\oa\config\my.cfg" - SetOutPath $INSTDIR\OpenArena\oa\maps + + CreateDirectory "$INSTDIR\oa\maps" + SetOutPath $INSTDIR\oa\maps File ".\OpenArena\oa\maps\intro.map" File ".\OpenArena\oa\maps\oamap1.map" - SetOutPath $INSTDIR\OpenArena\oa\music\bgm + + CreateDirectory "$INSTDIR\oa\music" + CreateDirectory "$INSTDIR\oa\music\bgm" + SetOutPath $INSTDIR\oa\music\bgm File ".\OpenArena\oa\music\bgm\*.mp3" - SetOutPath $INSTDIR\OpenArena\oa\textures + + CreateDirectory "$INSTDIR\oa\textures" + SetOutPath $INSTDIR\oa\textures File ".\OpenArena\oa\textures\*.tga" File ".\OpenArena\oa\textures\*.bmp" - SetOutPath $INSTDIR\OpenArena\oa\textures\menu + + CreateDirectory "$INSTDIR\oa\textures\menu" + SetOutPath $INSTDIR\oa\textures\menu File ".\OpenArena\oa\textures\menu\*.bmp" File ".\OpenArena\oa\textures\menu\*.tga" - SetOutPath $INSTDIR\OpenArena - CreateShortCut "$SMPROGRAMS\HHPS\OpenArena\OpenArena v0.1.0-alpha.lnk" "$INSTDIR\OpenArena\oa.exe" - - + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\HHPS\OpenArena\OpenArena v0.1.2-alpha.lnk" "$INSTDIR\oa.exe" SectionEnd ;-------------------------------- - ; Uninstaller -UninstallText "This will uninstall example2. Hit next to continue." - +UninstallText "This will uninstall OpenArena. Hit next to continue." ; Uninstall section Section "Uninstall" ; remove registry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenArena v0.1.0-alpha" - DeleteRegKey HKLM SOFTWARE\HHPS\OpenArena-0.1.0-alpha + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenArena v0.1.2-alpha" + DeleteRegKey HKLM SOFTWARE\HHPS\OpenArena-0.1.2-alpha ; remove files and uninstaller - Delete /REBOOTOK $INSTDIR\OpenArena\*.* - Delete /REBOOTOK $INSTDIR\include\*.* - Delete /REBOOTOK $INSTDIR\lib\*.* - Delete /REBOOTOK $INSTDIR\src\*.* - Delete /REBOOTOK $INSTDIR\bass.dll - Delete /REBOOTOK $INSTDIR\heading.txt - Delete /REBOOTOK $INSTDIR\license.txt - Delete /REBOOTOK $INSTDIR\oa.ncb - Delete /REBOOTOK $INSTDIR\oa.sln - Delete /REBOOTOK $INSTDIR\oa.sou - Delete /REBOOTOK $INSTDIR\oa.vcproj - Delete /REBOOTOK "$INSTDIR\OpenArena User's Manual.doc" - Delete /REBOOTOK "$INSTDIR\OpenArena User's Manual.html" + Delete /REBOOTOK "$INSTDIR\oa" + Delete /REBOOTOK "$INSTDIR\sources" + Delete /REBOOTOK "$INSTDIR\doc" + Delete /REBOOTOK "$INSTDIR\*.exe" + Delete /REBOOTOK "$INSTDIR\*.dll" + + ;Delete /REBOOTOK $INSTDIR\lib\* + ;Delete /REBOOTOK $INSTDIR\src\*.* + ;Delete /REBOOTOK $INSTDIR\bass.dll + ;Delete /REBOOTOK $INSTDIR\heading.txt + ;Delete /REBOOTOK $INSTDIR\license.txt + ;Delete /REBOOTOK $INSTDIR\oa.ncb + ;Delete /REBOOTOK $INSTDIR\oa.sln + ;Delete /REBOOTOK $INSTDIR\oa.sou + ;Delete /REBOOTOK $INSTDIR\oa.vcproj + ;Delete /REBOOTOK "$INSTDIR\OpenArena User's Manual.doc" + ;Delete /REBOOTOK "$INSTDIR\OpenArena User's Manual.html" + Delete /REBOOTOK $INSTDIR\uninstall.exe ; remove shortcuts, if any - Delete /REBOOTOK "$SMPROGRAMS\HHPS\OpenArena\Readme v0.1.0-alpha.lnk" - Delete /REBOOTOK "$SMPROGRAMS\HHPS\OpenArena\OpenArena SDK v0.1.0-alpha.lnk" - Delete /REBOOTOK "$SMPROGRAMS\HHPS\OpenArena\OpenArena v0.1.0-alpha.lnk" + Delete /REBOOTOK "$SMPROGRAMS\HHPS\OpenArena\Readme v0.1.2-alpha.lnk" + Delete /REBOOTOK "$SMPROGRAMS\HHPS\OpenArena\OpenArena SDK v0.1.2-alpha.lnk" + Delete /REBOOTOK "$SMPROGRAMS\HHPS\OpenArena\OpenArena v0.1.2-alpha.lnk" ; remove directories used RMDIR /r $INSTDIR\include @@ -154,6 +207,4 @@ Section "Uninstall" RMDIR /r $INSTDIR\src RMDIR /r "$INSTDIR" - - SectionEnd \ No newline at end of file diff --git a/oa.sln b/oa.sln index 4adda6a..b992fcc 100644 --- a/oa.sln +++ b/oa.sln @@ -3,6 +3,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oa", "oa.vcproj", "{6F5D0FF ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelConverter", "ModelConverter\ModelConverter.csproj", "{4327B7E9-B631-479B-8419-BCE37C986360}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -13,6 +17,10 @@ Global {6F5D0FF6-A032-4356-932E-865B601E0DD4}.Debug.Build.0 = Debug|Win32 {6F5D0FF6-A032-4356-932E-865B601E0DD4}.Release.ActiveCfg = Release|Win32 {6F5D0FF6-A032-4356-932E-865B601E0DD4}.Release.Build.0 = Release|Win32 + {4327B7E9-B631-479B-8419-BCE37C986360}.Debug.ActiveCfg = Debug|.NET + {4327B7E9-B631-479B-8419-BCE37C986360}.Debug.Build.0 = Debug|.NET + {4327B7E9-B631-479B-8419-BCE37C986360}.Release.ActiveCfg = Release|.NET + {4327B7E9-B631-479B-8419-BCE37C986360}.Release.Build.0 = Release|.NET EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/oa.suo b/oa.suo index 6e2b32d..442b29e 100644 Binary files a/oa.suo and b/oa.suo differ