diff --git a/deps b/deps index ed45883a..49ef5853 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit ed45883a444c6de548b6211a83a079ff2ecfce15 +Subproject commit 49ef5853662500ec9634af75b73b61f8168a14f9 diff --git a/resources/Axyz.ico b/resources/Axyz.ico new file mode 100755 index 00000000..b033831f Binary files /dev/null and b/resources/Axyz.ico differ diff --git a/resources/Schema/Entities/CP_Rocky2.xml b/resources/Schema/Entities/CP_Rocky2.xml index 77a80eac..cd56e869 100644 --- a/resources/Schema/Entities/CP_Rocky2.xml +++ b/resources/Schema/Entities/CP_Rocky2.xml @@ -3,7 +3,7 @@ - 4.4633678722447598 + 7.7050251588169658 @@ -1620,11 +1620,11 @@ 12 - + - + @@ -1676,11 +1676,11 @@ 12 - + - + @@ -1748,11 +1748,11 @@ 12 - + - + @@ -3775,11 +3775,11 @@ 2 - + - + @@ -3801,7 +3801,7 @@ - + @@ -3828,11 +3828,11 @@ 2 - + - + @@ -3854,7 +3854,7 @@ - + @@ -3882,11 +3882,11 @@ 2 - + - + @@ -3908,7 +3908,7 @@ - + @@ -3936,11 +3936,11 @@ 2 - + - + @@ -3962,7 +3962,7 @@ - + @@ -3989,11 +3989,11 @@ 2 - + - + @@ -4015,7 +4015,7 @@ - + @@ -4043,11 +4043,11 @@ 2 - + - + @@ -4069,7 +4069,7 @@ - + @@ -5034,11 +5034,11 @@ 12 - + - + @@ -5115,11 +5115,11 @@ 12 - + - + @@ -5172,11 +5172,11 @@ 12 - + - + @@ -6599,11 +6599,11 @@ 2 - + - + @@ -6625,7 +6625,7 @@ - + @@ -6653,11 +6653,11 @@ 2 - + - + @@ -6679,7 +6679,7 @@ - + @@ -6707,11 +6707,11 @@ 2 - + - + @@ -6733,7 +6733,7 @@ - + @@ -6761,11 +6761,11 @@ 2 - + - + @@ -6787,7 +6787,7 @@ - + @@ -6815,11 +6815,11 @@ 2 - + - + @@ -6841,7 +6841,7 @@ - + @@ -6869,11 +6869,11 @@ 2 - + - + @@ -6895,7 +6895,7 @@ - + @@ -6923,11 +6923,11 @@ 2 - + - + @@ -6949,7 +6949,7 @@ - + @@ -6977,11 +6977,11 @@ 2 - + - + @@ -7003,7 +7003,7 @@ - + @@ -8496,11 +8496,11 @@ 2 - + - + @@ -8522,7 +8522,7 @@ - + @@ -8550,11 +8550,11 @@ 2 - + - + @@ -8576,7 +8576,7 @@ - + @@ -8997,12 +8997,12 @@ 6 - + 0.10000000149011612 - + @@ -9027,12 +9027,12 @@ 6 - + 0.10000000149011612 - + @@ -9057,12 +9057,12 @@ 6 - + 0.10000000149011612 - + @@ -9087,12 +9087,12 @@ 6 - + 0.10000000149011612 - + @@ -9130,13 +9130,13 @@ 20 - + 3 - - + + @@ -9162,13 +9162,13 @@ 10 - + 0.5 - - + + @@ -9193,7 +9193,7 @@ - + @@ -9265,13 +9265,13 @@ 30 - + 3.5 - - + + @@ -9314,12 +9314,12 @@ 6 - + 0.10000000149011612 - + @@ -9344,12 +9344,12 @@ 6 - + 0.10000000149011612 - + @@ -9374,12 +9374,12 @@ 6 - + 0.10000000149011612 - + @@ -9404,12 +9404,12 @@ 6 - + 0.10000000149011612 - + @@ -9447,13 +9447,13 @@ 20 - + 3 - - + + @@ -9479,13 +9479,13 @@ 10 - + 0.5 - - + + @@ -9508,7 +9508,7 @@ - + @@ -9580,13 +9580,13 @@ 30 - + 3.5 - - + + @@ -9632,13 +9632,13 @@ 20 - + 3 - - + + @@ -9662,13 +9662,13 @@ 10 - + 0.5 - - + + @@ -9679,7 +9679,7 @@ - + @@ -9755,13 +9755,13 @@ 30 - + 3.5 - - + + @@ -9790,12 +9790,12 @@ 6 - + 0.10000000149011612 - + @@ -9819,12 +9819,12 @@ 6 - + 0.10000000149011612 - + @@ -9848,12 +9848,12 @@ 6 - + 0.10000000149011612 - + @@ -9877,12 +9877,12 @@ 6 - + 0.10000000149011612 - + @@ -9959,13 +9959,13 @@ 10 - + 0.5 - - + + @@ -9976,7 +9976,7 @@ - + @@ -10060,13 +10060,13 @@ 30 - + 3.5 - - + + @@ -10092,13 +10092,13 @@ 20 - + 3 - - + + @@ -10130,12 +10130,12 @@ 6 - + 0.10000000149011612 - + @@ -10160,12 +10160,12 @@ 6 - + 0.10000000149011612 - + @@ -10190,12 +10190,12 @@ 6 - + 0.10000000149011612 - + @@ -10220,12 +10220,12 @@ 6 - + 0.10000000149011612 - + @@ -10274,13 +10274,13 @@ 20 - + 3 - - + + @@ -10305,13 +10305,13 @@ 10 - + 0.5 - - + + @@ -10335,7 +10335,7 @@ - + @@ -10403,13 +10403,13 @@ 30 - + 3.5 - - + + @@ -10439,12 +10439,12 @@ 6 - + 0.10000000149011612 - + @@ -10468,12 +10468,12 @@ 6 - + 0.10000000149011612 - + @@ -10497,12 +10497,12 @@ 6 - + 0.10000000149011612 - + @@ -10526,12 +10526,12 @@ 6 - + 0.10000000149011612 - + @@ -10580,13 +10580,13 @@ 20 - + 3 - - + + @@ -10611,13 +10611,13 @@ 30 - + 3.5 - - + + @@ -10642,13 +10642,13 @@ 10 - + 0.5 - - + + @@ -10672,7 +10672,7 @@ - + @@ -10745,12 +10745,12 @@ 6 - + 0.10000000149011612 - + @@ -10775,12 +10775,12 @@ 6 - + 0.10000000149011612 - + @@ -10805,12 +10805,12 @@ 6 - + 0.10000000149011612 - + @@ -10835,12 +10835,12 @@ 6 - + 0.10000000149011612 - + @@ -10906,12 +10906,12 @@ 6 - + 0.10000000149011612 - + @@ -10935,12 +10935,12 @@ 6 - + 0.10000000149011612 - + @@ -10964,12 +10964,12 @@ 6 - + 0.10000000149011612 - + @@ -10993,12 +10993,12 @@ 6 - + 0.10000000149011612 - + @@ -11035,13 +11035,13 @@ 30 - + 3.5 - - + + @@ -11065,13 +11065,13 @@ 10 - + 0.5 - - + + @@ -11082,7 +11082,7 @@ - + @@ -11159,13 +11159,13 @@ 20 - + 3 - - + + @@ -11206,12 +11206,12 @@ 6 - + 0.10000000149011612 - + @@ -11236,12 +11236,12 @@ 6 - + 0.10000000149011612 - + @@ -11266,12 +11266,12 @@ 6 - + 0.10000000149011612 - + @@ -11296,12 +11296,12 @@ 6 - + 0.10000000149011612 - + @@ -11339,13 +11339,13 @@ 10 - + 0.5 - - + + @@ -11356,7 +11356,7 @@ - + @@ -11440,13 +11440,13 @@ 30 - + 3.5 - - + + @@ -11472,13 +11472,13 @@ 20 - + 3 - - + + @@ -11525,13 +11525,13 @@ 10 - + 0.5 - - + + @@ -11542,7 +11542,7 @@ - + @@ -11628,13 +11628,13 @@ 30 - + 3.5 - - + + @@ -11660,13 +11660,13 @@ 20 - + 3 - - + + @@ -11697,12 +11697,12 @@ 6 - + 0.10000000149011612 - + @@ -11727,12 +11727,12 @@ 6 - + 0.10000000149011612 - + @@ -11757,12 +11757,12 @@ 6 - + 0.10000000149011612 - + @@ -11787,12 +11787,12 @@ 6 - + 0.10000000149011612 - + @@ -11859,12 +11859,12 @@ 6 - + 0.10000000149011612 - + @@ -11889,12 +11889,12 @@ 6 - + 0.10000000149011612 - + @@ -11919,12 +11919,12 @@ 6 - + 0.10000000149011612 - + @@ -11949,12 +11949,12 @@ 6 - + 0.10000000149011612 - + @@ -11992,13 +11992,13 @@ 30 - + 3.5 - - + + @@ -12024,13 +12024,13 @@ 20 - + 3 - - + + @@ -12056,13 +12056,13 @@ 10 - + 0.5 - - + + @@ -12073,7 +12073,7 @@ - + @@ -12176,12 +12176,12 @@ 6 - + 0.10000000149011612 - + @@ -12206,12 +12206,12 @@ 6 - + 0.10000000149011612 - + @@ -12236,12 +12236,12 @@ 6 - + 0.10000000149011612 - + @@ -12266,12 +12266,12 @@ 6 - + 0.10000000149011612 - + @@ -12309,13 +12309,13 @@ 10 - + 0.5 - - + + @@ -12338,7 +12338,7 @@ - + @@ -12410,13 +12410,13 @@ 20 - + 3 - - + + @@ -12442,13 +12442,13 @@ 30 - + 3.5 - - + + @@ -12494,13 +12494,13 @@ 30 - + 3.5 - - + + @@ -12524,13 +12524,13 @@ 20 - + 3 - - + + @@ -12554,13 +12554,13 @@ 10 - + 0.5 - - + + @@ -12571,7 +12571,7 @@ - + @@ -12652,12 +12652,12 @@ 6 - + 0.10000000149011612 - + @@ -12681,12 +12681,12 @@ 6 - + 0.10000000149011612 - + @@ -12710,12 +12710,12 @@ 6 - + 0.10000000149011612 - + @@ -12739,12 +12739,12 @@ 6 - + 0.10000000149011612 - + @@ -12818,12 +12818,12 @@ 6 - + 0.10000000149011612 - + @@ -12848,12 +12848,12 @@ 6 - + 0.10000000149011612 - + @@ -12878,12 +12878,12 @@ 6 - + 0.10000000149011612 - + @@ -12908,12 +12908,12 @@ 6 - + 0.10000000149011612 - + @@ -12951,13 +12951,13 @@ 30 - + 3.5 - - + + @@ -12983,13 +12983,13 @@ 10 - + 0.5 - - + + @@ -13014,7 +13014,7 @@ - + @@ -13082,13 +13082,13 @@ 20 - + 3 - - + + @@ -13134,13 +13134,13 @@ 20 - + 3 - - + + @@ -13165,13 +13165,13 @@ 30 - + 3.5 - - + + @@ -13196,13 +13196,13 @@ 10 - + 0.5 - - + + @@ -13224,7 +13224,7 @@ - + @@ -13297,12 +13297,12 @@ 6 - + 0.10000000149011612 - + @@ -13326,12 +13326,12 @@ 6 - + 0.10000000149011612 - + @@ -13355,12 +13355,12 @@ 6 - + 0.10000000149011612 - + @@ -13384,12 +13384,12 @@ 6 - + 0.10000000149011612 - + @@ -13438,13 +13438,13 @@ 20 - + 3 - - + + @@ -13469,13 +13469,13 @@ 10 - + 0.5 - - + + @@ -13499,7 +13499,7 @@ - + @@ -13563,13 +13563,13 @@ 30 - + 3.5 - - + + @@ -13599,12 +13599,12 @@ 6 - + 0.10000000149011612 - + @@ -13629,12 +13629,12 @@ 6 - + 0.10000000149011612 - + @@ -13659,12 +13659,12 @@ 6 - + 0.10000000149011612 - + @@ -13689,12 +13689,12 @@ 6 - + 0.10000000149011612 - + @@ -13795,14 +13795,15 @@ - + + + - @@ -13827,7 +13828,7 @@ Models/Core/UnitCube.mesh - false + false @@ -13883,17 +13884,17 @@ - + - Deaths + KD Fonts/DroidSans.ttf,64 - + @@ -13915,17 +13916,17 @@ - + - KD + Deaths Fonts/DroidSans.ttf,64 - + @@ -13940,11 +13941,12 @@ - Models/Core/UnitCube.mesh + 0.80000019073486328 + Models/Props/ScoreBoard/Scoreboard.mesh false - + @@ -13952,12 +13954,13 @@ - Models/Core/UnitCube.mesh + 0.70000028610229492 + Models/Props/ScoreBoard/Spectatorboard.mesh false - + @@ -13977,6 +13980,20 @@ + + + + Models/Core/UnitCube.mesh + + false + + + + + + + + @@ -13992,49 +14009,17 @@ - + - Deaths + ID Fonts/DroidSans.ttf,64 - - - - - - - - - - Kills - Fonts/DroidSans.ttf,64 - - - - - - - - - - - - - - - KD - Fonts/DroidSans.ttf,64 - - - - - - + @@ -14056,17 +14041,49 @@ - + - ID + KD Fonts/DroidSans.ttf,64 - + + + + + + + + + + Kills + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Deaths + Fonts/DroidSans.ttf,64 + + + + + + @@ -14074,20 +14091,6 @@ - - - - Models/Core/UnitCube.mesh - - false - - - - - - - - @@ -14104,86 +14107,93 @@ - - - - - - - - - - + - - - + - + - + - - Models/Core/UnitQuad.mesh - - Textures/Core/White.png - true - - false - - - - + + + - - - - - - Models/Core/UnitQuad.mesh - - Textures/Core/White.png - true - - - - - - - - - - - - Blue team win! - Fonts/DroidSans.ttf,64 - false - - - - - - - - - - - - Red team win! - Fonts/DroidSans.ttf,64 - - - - - - - + + + + + + + + + + + + Models/Core/UnitQuad.mesh + + Textures/Core/White.png + true + + false + + + + + + + + + + + Models/Core/UnitQuad.mesh + + Textures/Core/White.png + true + + + + + + + + + + + + Blue team win! + Fonts/DroidSans.ttf,64 + false + + + + + + + + + + + + Red team win! + Fonts/DroidSans.ttf,64 + + + + + + + + + + + @@ -14201,7 +14211,7 @@ - + @@ -14432,7 +14442,7 @@ - 4 + 1 Fonts/DroidSans.ttf,64 diff --git a/resources/Schema/Entities/ScoreBoard_Main.xml b/resources/Schema/Entities/ScoreBoard_Main.xml index 04bf74c9..38db3e4b 100644 --- a/resources/Schema/Entities/ScoreBoard_Main.xml +++ b/resources/Schema/Entities/ScoreBoard_Main.xml @@ -18,7 +18,126 @@ - + + + + + + + + + + Models/Core/UnitCube.mesh + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + ID + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Name + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + KD + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Kills + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Deaths + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + + @@ -56,7 +175,126 @@ - + + + + + + + + + + Models/Core/UnitCube.mesh + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + ID + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Name + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + KD + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Kills + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + Deaths + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + + @@ -70,6 +308,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Models/Core/UnitQuad.mesh + + Textures/Core/White.png + true + + false + + + + + + + + + + + Models/Core/UnitQuad.mesh + + Textures/Core/White.png + true + + + + + + + + + + + + Blue team win! + Fonts/DroidSans.ttf,64 + false + + + + + + + + + + + + Red team win! + Fonts/DroidSans.ttf,64 + + + + + + + + + + + + + + + + diff --git a/resources/Setup/Inno Setup Script.iss b/resources/Setup/Inno Setup Script.iss new file mode 100755 index 00000000..bc894f6f --- /dev/null +++ b/resources/Setup/Inno Setup Script.iss @@ -0,0 +1,76 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Axyz" +#define MyAppVersion "1.0" +#define MyAppURL "https://github.com/teamfisk/TacticalZ" +#define MyAppExeName "TacticalZ.exe" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{38D77EB2-6B56-4B4F-BAAE-43F9E6E1A191} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DisableProgramGroupPage=yes +OutputBaseFilename=Axyz Setup +SetupIconFile=..\Axyz.ico +Compression=lzma2 +SolidCompression=yes +; "ArchitecturesAllowed=x64" specifies that Setup cannot run on +; anything but x64. +ArchitecturesAllowed=x64 +; "ArchitecturesInstallIn64BitMode=x64" requests that the install be +; done in "64-bit mode" on x64, meaning it should use the native +; 64-bit Program Files directory and the 64-bit view of the registry. +ArchitecturesInstallIn64BitMode=x64 +OutputDir=. +DisableWelcomePage=false +;WizardSmallImageFile= +WizardImageFile=Setup Banner.bmp + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "..\..\bin\Audio\*"; DestDir: "{app}\Audio\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\Fonts\*"; DestDir: "{app}\Fonts\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\Licenses\*"; DestDir: "{app}\Licenses\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\Models\*"; DestDir: "{app}\Models\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\Schema\*"; DestDir: "{app}\Schema\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\Shaders\*"; DestDir: "{app}\Shaders\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\Textures\*"; DestDir: "{app}\Textures\"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\..\bin\assimp.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\DefaultConfig.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\DefaultInput.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\glew32.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\glfw3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\imgui.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Input.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\TacticalZ.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\xerces-c_3_1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\zlib.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\deps\redist\VC_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall + +[Icons] +Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[INI] +Filename: "{app}\Config.ini"; Section: "Networking"; Key: "Name"; String: "{%USERNAME}"; Flags: createkeyifdoesntexist + +[Run] +Filename: "{tmp}\VC_redist.x64.exe"; Parameters: "/norestart /passive"; StatusMsg: "Installing Microsoft Visual C++ 2015 x64 Redistributable...."; + +[ThirdParty] +UseRelativePaths=True \ No newline at end of file diff --git a/resources/Setup/Setup Banner.bmp b/resources/Setup/Setup Banner.bmp new file mode 100755 index 00000000..69384103 Binary files /dev/null and b/resources/Setup/Setup Banner.bmp differ diff --git a/resources/TacticalZ.rc b/resources/TacticalZ.rc new file mode 100755 index 00000000..640a9490 Binary files /dev/null and b/resources/TacticalZ.rc differ diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt index d8ba8599..9dc67a78 100644 --- a/src/Game/CMakeLists.txt +++ b/src/Game/CMakeLists.txt @@ -55,6 +55,7 @@ target_link_libraries(Game add_executable(TacticalZ main.cpp + ${CMAKE_SOURCE_DIR}/resources/TacticalZ.rc ) target_link_libraries(TacticalZ Game