Merge pull request #365 from SuperV1234/2.1.3

Open Hexagon v2.1.3

9 files changed, 70 insertions, 9 deletions

diff --git a/_RELEASE/config.json b/_RELEASE/config.json
index 0825cbbb..c1050dbf 100644
--- a/_RELEASE/config.json
+++ b/_RELEASE/config.json
@@ -59,7 +59,7 @@
 	"save_last_login_username" : true,

 	"save_local_best_replay_to_file" : true,

 	"server_control_port" : 50506,

-	"server_ip" : "139.162.199.162",

+	"server_ip" : "127.0.0.1",

 	"server_level_whitelist" : 

 	[

 		"ohvrvanilla_vittorio_romeo_cube_1_apeirogon_m_0.35",

@@ -125,7 +125,25 @@
 		"ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_0.5",

 		"ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_1",

 		"ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_1.5",

-		"ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_2"

+		"ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_2",

+		"vanitylevels_Vipre_Vanity_10006_haunted_m_1",

+		"vanitylevels_Vipre_Vanity_10006_haunted_m_1.001",

+		"vanitylevels_Vipre_Vanity_10006_mantra_m_1",

+		"vanitylevels_Vipre_Vanity_10006_menace_m_1",

+		"vanitylevels_Vipre_Vanity_10006_menace_m_1.001",

+		"vanitylevels_Vipre_Vanity_10006_narcotics_m_1",

+		"vanitylevels_Vipre_Vanity_10006_narcotics_m_1.001",

+		"vanitylevels_Vipre_Vanity_10006_rocketscience_m_1",

+		"vanitylevels_Vipre_Vanity_10006_rocketscience_m_1.001",

+		"vanitylevels_Vipre_Vanity_10006_singlepulseremixv2remix_m_1",

+		"vanitylevels_Vipre_Vanity_10006_squarepractice_m_1",

+		"vanitylevels_Vipre_Vanity_10006_squarepractice_m_1.003",

+		"vanitylevels_Vipre_Vanity_10006_squarepractice_m_1.005",

+		"vanitylevels_Vipre_Vanity_10006_technology_m_1",

+		"vanitylevels_Vipre_Vanity_10006_technology_m_1.001",

+		"vanitylevels_Vipre_Vanity_10006_troglodyte_m_1",

+		"vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.001",

+		"vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.002"

 	],

 	"server_local" : true,

 	"server_port" : 50505,

diff --git a/art/steamart_new/eventcover.png b/art/steamart_new/eventcover.png
new file mode 100644
index 00000000..bfe6e3d8
--- /dev/null
+++ b/art/steamart_new/eventcover.png
diff --git a/art/steamart_new/eventcover.psd b/art/steamart_new/eventcover.psd
new file mode 100644
index 00000000..d4b9d470
--- /dev/null
+++ b/art/steamart_new/eventcover.psd
diff --git a/art/steamart_new/twitter.psd b/art/steamart_new/twitter.psd
new file mode 100644
index 00000000..80c53e5a
--- /dev/null
+++ b/art/steamart_new/twitter.psd
diff --git a/art/steamart_new/twitter_pfp.png b/art/steamart_new/twitter_pfp.png
new file mode 100644
index 00000000..db4828f6
--- /dev/null
+++ b/art/steamart_new/twitter_pfp.png
diff --git a/buildrel/r.sh b/buildrel/r.sh
index a1984d49..051c9753 100644
--- a/buildrel/r.sh
+++ b/buildrel/r.sh
@@ -1,3 +1,3 @@
 #!/bin/bash

-(cp ./SSVOpenHexagon.exe ../_RELEASE ; cd ../_RELEASE && ./SSVOpenHexagon.exe "$@")

+(cp ./SSVOpenHexagon-Console.exe ../_RELEASE ; cd ../_RELEASE && ./SSVOpenHexagon-Console.exe "$@")

 

diff --git a/include/SSVOpenHexagon/Global/Version.hpp b/include/SSVOpenHexagon/Global/Version.hpp
index 4080a03e..508e7b6f 100644
--- a/include/SSVOpenHexagon/Global/Version.hpp
+++ b/include/SSVOpenHexagon/Global/Version.hpp
@@ -43,7 +43,7 @@ struct GameVersion
     }
 };
 
-inline constexpr GameVersion GAME_VERSION{2, 1, 2};
-inline constexpr auto& GAME_VERSION_STR = "2.1.2";
+inline constexpr GameVersion GAME_VERSION{2, 1, 3};
+inline constexpr auto& GAME_VERSION_STR = "2.1.3";
 
 } // namespace hg
diff --git a/release_checklist.md b/release_checklist.md
index 81706024..58a14737 100644
--- a/release_checklist.md
+++ b/release_checklist.md
@@ -6,13 +6,31 @@
 
 2. Start the `endeavouros64` VirtualBox virtual machine
 
-3. Check the repository's branch on the virtual machine
+3. Go into `SSVOpenHexagon` directory
 
-4. Run `SSVOpenHexagon/vbox/build_and_upload_server.sh`
+4. Check the repository's branch on the virtual machine
+
+5. Run `./vbox/build_and_upload_server.sh`
 
 5. Verify that the server is working with `ssh vittorioromeo@139.162.199.162`, `sudo journalctl -u openhexagon-server -f`
 
-## Client
+## Linux Client
+
+1. `git push` from main development machine, check the branch
+
+2. Start the `endeavouros64` VirtualBox virtual machine
+
+3. Go into `SSVOpenHexagon` directory
+
+4. Check the repository's branch on the virtual machine
+
+5. `cd buildlx && ./make_release_client_vbox.sh && cd .. && ./prepare_release_linux.sh`
+
+6. `cd _PREPARED_RELEASE_LINUX_TEST && ./run_ssvopenhexagon_linux.sh`
+
+7. The Linux client build will automatically be copied to the main development machine's drive
+
+## Windows Client
 
 1. Run `SSVOpenHexagon/buildrel/make_release_client_win10_msys.sh`
 
diff --git a/src/SSVOpenHexagon/Global/Config.cpp b/src/SSVOpenHexagon/Global/Config.cpp
index 11ee4577..f7a1821f 100644
--- a/src/SSVOpenHexagon/Global/Config.cpp
+++ b/src/SSVOpenHexagon/Global/Config.cpp
@@ -26,6 +26,7 @@
 defaultServerLevelWhitelist()
 {
     static const std::vector<std::string> result{
+        // Vittorio Romeo - Cube
         "ohvrvanilla_vittorio_romeo_cube_1_apeirogon_m_0.35",
         "ohvrvanilla_vittorio_romeo_cube_1_apeirogon_m_1",
         "ohvrvanilla_vittorio_romeo_cube_1_apeirogon_m_1.6",
@@ -56,9 +57,13 @@ defaultServerLevelWhitelist()
         "ohvrvanilla_vittorio_romeo_cube_1_seconddimension_m_1",
         "ohvrvanilla_vittorio_romeo_cube_1_seconddimension_m_1.8",
         "ohvrvanilla_vittorio_romeo_cube_1_seconddimension_m_2.2",
+
+        // Vittorio Romeo - Orthoplex
         "ohvrvanilla_vittorio_romeo_orthoplex_1_bipolarity_m_0.5",
         "ohvrvanilla_vittorio_romeo_orthoplex_1_bipolarity_m_1",
         "ohvrvanilla_vittorio_romeo_orthoplex_1_bipolarity_m_1.8",
+
+        // Vittorio Romeo - Hypercube
         "ohvrvanilla_vittorio_romeo_hypercube_1_acceleradiant_m_0.85",
         "ohvrvanilla_vittorio_romeo_hypercube_1_acceleradiant_m_1",
         "ohvrvanilla_vittorio_romeo_hypercube_1_acceleradiant_m_1.8",
@@ -89,7 +94,27 @@ defaultServerLevelWhitelist()
         "ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_0.5",
         "ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_1",
         "ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_1.5",
-        "ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_2" //
+        "ohvrvanilla_vittorio_romeo_hypercube_1_slither_m_2",
+
+        // Vipre - Vanity [Steam Workshop]
+        "vanitylevels_Vipre_Vanity_10006_haunted_m_1",
+        "vanitylevels_Vipre_Vanity_10006_haunted_m_1.001",
+        "vanitylevels_Vipre_Vanity_10006_mantra_m_1",
+        "vanitylevels_Vipre_Vanity_10006_menace_m_1",
+        "vanitylevels_Vipre_Vanity_10006_menace_m_1.001",
+        "vanitylevels_Vipre_Vanity_10006_narcotics_m_1",
+        "vanitylevels_Vipre_Vanity_10006_narcotics_m_1.001",
+        "vanitylevels_Vipre_Vanity_10006_rocketscience_m_1",
+        "vanitylevels_Vipre_Vanity_10006_rocketscience_m_1.001",
+        "vanitylevels_Vipre_Vanity_10006_singlepulseremixv2remix_m_1",
+        "vanitylevels_Vipre_Vanity_10006_squarepractice_m_1",
+        "vanitylevels_Vipre_Vanity_10006_squarepractice_m_1.003",
+        "vanitylevels_Vipre_Vanity_10006_squarepractice_m_1.005",
+        "vanitylevels_Vipre_Vanity_10006_technology_m_1",
+        "vanitylevels_Vipre_Vanity_10006_technology_m_1.001",
+        "vanitylevels_Vipre_Vanity_10006_troglodyte_m_1",
+        "vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.001",
+        "vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.002" //
     };
 
     return result;