summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Romeo <vittorio.romeo@outlook.com>2022-01-08 14:29:47 +0100
committerVittorio Romeo <vittorio.romeo@outlook.com>2022-01-08 14:29:47 +0100
commit6c851c07289838c7e222bd80ce08a0ce75fd65b6 (patch)
treeeb8f79ccc238038349afa880bc10a11e4a9c80b4
parent32484802abb462d07f434b9f79335532a7c651f9 (diff)
New ranked levels: Dragon Mayhem, Sky Fasion, Ti84, Super Plausible Level
-rw-r--r--_RELEASE/config.json35
-rw-r--r--src/SSVOpenHexagon/Global/Config.cpp22
2 files changed, 30 insertions, 27 deletions
diff --git a/_RELEASE/config.json b/_RELEASE/config.json
index 20403c13..aaf9ef24 100644
--- a/_RELEASE/config.json
+++ b/_RELEASE/config.json
@@ -45,7 +45,6 @@
"no_rotation" : false,
"no_sound" : false,
"official" : true,
- "online" : true,
"pixel_multiplier" : 1,
"play_swap_ready_sound" : true,
"player_focus_speed" : 4.6250,
@@ -58,7 +57,6 @@
"pulse_enabled" : true,
"rotate_to_start" : false,
"save_last_login_username" : true,
- "save_local_best_replay_to_file" : true,
"server_control_port" : 50506,
"server_ip" : "139.162.199.162",
"server_level_whitelist" :
@@ -146,10 +144,8 @@
"vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.001",
"vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.002"
],
- "server_local" : true,
"server_port" : 50505,
- "server_verbose" : true,
- "show_fps" : true,
+ "show_fps" : false,
"show_key_icons" : false,
"show_level_info" : false,
"show_login_at_startup" : false,
@@ -191,31 +187,19 @@
],
"t_lua_console" :
[
- [ "kF1" ],
- [ "" ],
- [ "" ],
- [ "" ]
+ [ "kF1" ]
],
"t_next" :
[
- [ "kPageDown" ],
- [ "" ],
- [ "" ],
- [ "" ]
+ [ "kPageDown" ]
],
"t_pause" :
[
- [ "kF2" ],
- [ "" ],
- [ "" ],
- [ "" ]
+ [ "kF2" ]
],
"t_previous" :
[
- [ "kPageUp" ],
- [ "" ],
- [ "" ],
- [ "" ]
+ [ "kPageUp" ]
],
"t_replay" :
[
@@ -227,8 +211,8 @@
"t_restart" :
[
[ "kSpace" ],
+ [ "kEnter" ],
[ "bMiddle" ],
- [ "" ],
[ "" ]
],
"t_rotate_ccw" :
@@ -275,11 +259,10 @@
],
"text_padding" : 8.0,
"text_scaling" : 1.0,
- "timer_static" : true,
"timescale" : 1.0,
"vsync" : false,
"windowed_auto_resolution" : false,
- "windowed_height" : 720,
- "windowed_width" : 1280,
- "zoom_factor" : 1.066666722297668
+ "windowed_height" : 763,
+ "windowed_width" : 1206,
+ "zoom_factor" : 1.006553053855896
}
diff --git a/src/SSVOpenHexagon/Global/Config.cpp b/src/SSVOpenHexagon/Global/Config.cpp
index 7c0bcff4..1b5ddc90 100644
--- a/src/SSVOpenHexagon/Global/Config.cpp
+++ b/src/SSVOpenHexagon/Global/Config.cpp
@@ -114,7 +114,27 @@ defaultServerLevelWhitelist()
"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" //
+ "vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.002",
+
+ // clang-format off
+ // Morxemplum - Rotationality Remastered [Steam Workshop]
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_dragonMayhem_m_1",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_dragonMayhem_m_2",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_dragonMayhem_m_3",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_dragonMayhem_m_5",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_dragonMayhem_m_6.66",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_skyFasion_m_1",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_skyFasion_m_2",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_skyFasion_m_3",
+ "rotationality_SkyMidnight_Rotationality_(Remastered)_2_skyFasion_m_5",
+ // clang-format on
+
+ // Syyrion - Travel [Steam Workshop]
+ "1D2B-E31E-EC19_Syyrion_Travel_13103_ti84_m_0.8",
+ "1D2B-E31E-EC19_Syyrion_Travel_13103_ti84_m_1",
+ "1D2B-E31E-EC19_Syyrion_Travel_13103_ti84_m_1.2",
+ "1D2B-E31E-EC19_Syyrion_Travel_13103_ti84_m_1.4",
+ "1D2B-E31E-EC19_Syyrion_Travel_13103_spl_m_1" //
};
return result;