Fix #3842 by always using https links (#3854)

Don't rename if config-0.10 already exists

CHANGELOG.md

@@ -5,7 +5,7 @@ It should be kept in mind that some versions have a less complete changelog than
 
 For similar reasons, and because some features are vastly more complex than others, attributions of main changes should not be taken as a shorcut for overall contribution.
 
-## SuperTuxKart 0.10.0 (19. April 2019)
+## SuperTuxKart 1.0 (20. April 2019)
 ### Networking
 * Networking support for normal race, time trial, free for all, capture the flag and soccer by Benau and hiker :
     * Access to a global server list, possibility to also create a LAN server

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
 
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "git")
+set(PROJECT_VERSION "1.0")
 add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" )
 
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))

data/CREDITS

@@ -251,6 +251,19 @@ Software used
 = Donations =
 
 Donations
+- Trevor Hass, Thomas Belvin, Simona-A.-Petronela Crefelean
+- Schmidt Christian, Roberto Giuliani, Robert A Swearingen
+- Rene Genz, René Schubert, Pazurik Laszlo Adam, Oskar Vigren
+- M J Angove, Florian Lehebel, David E Scourfield, Michael Laube
+- Merlin Juusola, Matthias Wiege, Matthew Toppenberg, Martin Rejman
+- Mark Gannon, Lukas Palme, Lennart Mellqvist, Joshua Dye, Jan Havran
+- Jacqueline Brown, Igor Murzich, Guido Stehr, Gisela Ehresmann
+- Evaldas Granickas, Elisabeth Lambert, Edith Muijsers, DC Jaeger
+
+
+Donations
+- Damian Fajfer, Chase Williamson, Carsten Timm, Baptiste Dagneaux
+- Alexander Olkhovsky, Aleix Casamitjana, Adrián Chaves Fernández
 - Georgi Stoychev, Nuno Ferreira, Steven Anderson, Charalabos Frouzakis
 - Richard Qian, William Nakamura, Maree Glynn, David Carlier
 - Alistair Findlay, James Tobin, Ursula Belting, Stephan van den Akker

data/SuperTuxKart-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>git</string>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>SPTK</string>
 	<key>CFBundleVersion</key>
-	<string>git</string>
+	<string>1.0</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>

data/replay/challenge_cocoa_temple_expert.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: suzanne Suzanne
 kart_color: 0.000000
 kart_list_end

data/replay/challenge_cocoa_temple_intermediate.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: suzanne Suzanne
 kart_color: 0.000000
 kart_list_end

data/replay/challenge_cocoa_temple_novice.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: suzanne Suzanne
 kart_color: 0.000000
 kart_list_end

data/replay/challenge_cocoa_temple_supertux.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: suzanne Suzanne
 kart_color: 0.000000
 kart_list_end

data/replay/standard_egghunt_expert_minigolf.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: tux ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_expert_candela_city.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: sara_the_wizard ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_expert_cornfield_crossing.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: xue ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_expert_ravenbridge_mansion.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: beastie ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_expert_stk_enterprise.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: gavroche ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_expert_volcano_island.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: beastie ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_expert_zengarden.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: gnu ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_intermediate_gran_paradisio_island.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: sara_the_racer ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_intermediate_hacienda.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: emule ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_intermediate_lighthouse.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: amanda ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_intermediate_minigolf.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: adiumy ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_intermediate_snow_peak.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: tux ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_novice_cocoa_temple.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: suzanne ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_novice_mines.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: hexley ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_novice_olivermath.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: kiki ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_novice_sandtrack.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: pidgin ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_reverse_supertux_cocoa_temple.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: suzanne ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_reverse_supertux_mines.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: hexley ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_reverse_supertux_olivermath.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: kiki ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_reverse_supertux_sandtrack.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: pidgin ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_supertux_abyss.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: puffy ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_supertux_black_forest.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: konqi ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_supertux_fortmagma.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: nolok ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_supertux_scotland.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: wilber ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_supertux_snowmountain.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: tux ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

data/replay/standard_supertux_xr591.replay

@@ -1,5 +1,5 @@
 version: 4
-stk_version: 0.10.0
+stk_version: 1.0
 kart: gavroche ☆★STK★☆
 kart_color: 0.000000
 kart_list_end

src/addons/news_manager.cpp

@@ -35,7 +35,8 @@
 
 using namespace Online;
 
-NewsManager *NewsManager::m_news_manager=NULL;
+NewsManager *NewsManager::m_news_manager = nullptr;
+std::string NewsManager::m_news_filename = "online_news.xml";
 
 // ----------------------------------------------------------------------------
 NewsManager::NewsManager() : m_news(std::vector<NewsMessage>())
@@ -45,7 +46,7 @@ NewsManager::NewsManager() : m_news(std::vector<NewsMessage>())
     m_force_refresh = false;
 
     // Clean .part file which may be left behind
-    std::string news_part = file_manager->getAddonsFile("news.xml.part");
+    std::string news_part = file_manager->getAddonsFile(m_news_filename + ".part");
     if (file_manager->fileExists(news_part))
         file_manager->removeFile(news_part);
 
@@ -60,16 +61,16 @@ NewsManager::~NewsManager()
 // ---------------------------------------------------------------------------
 /** This function initialises the data for the news manager. It starts a
  *  separate thread to execute downloadNews() - which (if necessary) downloads
- *  the news.xml file and updates the list of news messages. It also
+ *  the m_news_filename file and updates the list of news messages. It also
  *  initialises the addons manager (which can trigger another download of
- *  news.xml).
- *  \param force_refresh Re-download news.xml, even if
+ *  m_news_filename).
+ *  \param force_refresh Re-download m_news_filename, even if
  */
 void NewsManager::init(bool force_refresh)
 {
     m_force_refresh = force_refresh;
 
-    // The rest (which potentially involves downloading news.xml) is handled
+    // The rest (which potentially involves downloading m_news_filename) is handled
     // in a separate thread, so that the GUI remains responsive. It is only
     // started if internet access is enabled, else nothing is done in the
     // thread anyway (and the addons menu is disabled as a result).
@@ -93,7 +94,7 @@ void NewsManager::init(bool force_refresh)
 }   //init
 
 // ---------------------------------------------------------------------------
-/** This function submits request which will download the news.xml file
+/** This function submits request which will download the m_news_filename file
  *  if necessary. It is running in its own thread, so we can use blocking
  *  download calls without blocking the GUI.
  *  \param obj This is 'this' object, passed on during pthread creation.
@@ -104,15 +105,15 @@ void* NewsManager::downloadNews(void *obj)
     NewsManager *me = (NewsManager*)obj;
     me->clearErrorMessage();
 
-    std::string xml_file = file_manager->getAddonsFile("news.xml");
+    std::string xml_file = file_manager->getAddonsFile(m_news_filename);
     // Prevent downloading when .part file created, which is already downloaded
-    std::string xml_file_part = file_manager->getAddonsFile("news.xml.part");
+    std::string xml_file_part = file_manager->getAddonsFile(m_news_filename + ".part");
     bool news_exists = file_manager->fileExists(xml_file);
 
     // The news message must be updated if either it has never been updated,
     // or if the time of the last update was more than news_frequency ago,
     // or because a 'refresh' was explicitly requested by the user, or no
-    // news.xml file exists.
+    // m_news_filename file exists.
     bool download = ( UserConfigParams::m_news_last_updated==0  ||
                       UserConfigParams::m_news_last_updated
                           +UserConfigParams::m_news_frequency
@@ -149,8 +150,8 @@ void* NewsManager::downloadNews(void *obj)
     {
         core::stringw error_message("");
 
-        HTTPRequest *download_req = new HTTPRequest("news.xml");
-        download_req->setAddonsURL("news.xml");
+        HTTPRequest *download_req = new HTTPRequest(m_news_filename);
+        download_req->setAddonsURL(m_news_filename);
 
         // Initialise the online portion of the addons manager.
         if(UserConfigParams::logAddons())
@@ -167,10 +168,10 @@ void* NewsManager::downloadNews(void *obj)
 
             // We need a new object, since the state of the old
             // download request is now done.
-            download_req = new HTTPRequest("news.xml");
+            download_req = new HTTPRequest(m_news_filename);
 
             // make sure the new server address is actually used
-            download_req->setAddonsURL("news.xml");
+            download_req->setAddonsURL(m_news_filename);
             download_req->executeNow();
 
             if(download_req->hadDownloadError())

src/addons/news_manager.hpp

@@ -76,6 +76,9 @@ private:
         bool isImportant() const { return m_important; }
     };   // NewsMessage
 
+    /** The name of the news file on the remote server */
+    static std::string m_news_filename;
+
     mutable Synchronised< std::vector<NewsMessage> > m_news;
 
     /** Index of the current news message that is being displayed. */

src/io/file_manager.cpp

@@ -931,7 +931,17 @@ void FileManager::checkAndCreateConfigDir()
     if(m_user_config_dir.size()>0 && *m_user_config_dir.rbegin()!='/')
         m_user_config_dir += "/";
 
+    // 0.10 only because wrong config name is used
+    std::string beta_config_dir = m_user_config_dir + "0.10-beta";
     m_user_config_dir += "config-0.10/";
+
+    if (fileExists(beta_config_dir) && !fileExists(m_user_config_dir))
+    {
+        Log::info("FileManager", "Rename 0.10-beta directory to config-0.10 "
+            "to keep user story mode progress.");
+        rename(beta_config_dir.c_str(), m_user_config_dir.c_str());
+    }
+
     if(!checkAndCreateDirectoryP(m_user_config_dir))
     {
         Log::warn("FileManager", "Can not  create config dir '%s', "

tools/windows_installer/supertuxkart-64bit.nsi

@@ -31,11 +31,11 @@
 
   ; Version information
   ; TOOD get these from the source code directly
-  !define VERSION_MAJOR 0
-  !define VERSION_MINOR 10
+  !define VERSION_MAJOR 1
+  !define VERSION_MINOR 0
   !define VERSION_REVISION 0
   ; Empty means stable, could be -git, -rc1
-  !define VERSION_BUILD "-git"
+  !define VERSION_BUILD ""
   
   ;Name and file
   !define APPNAME "SuperTuxKart"

tools/windows_installer/supertuxkart.nsi

@@ -31,11 +31,11 @@
 
   ; Version information
   ; TOOD get these from the source code directly
-  !define VERSION_MAJOR 0
-  !define VERSION_MINOR 10
+  !define VERSION_MAJOR 1
+  !define VERSION_MINOR 0
   !define VERSION_REVISION 0
   ; Empty means stable, could be -git, -rc1
-  !define VERSION_BUILD "-git"
+  !define VERSION_BUILD ""
   
   ;Name and file
   !define APPNAME "SuperTuxKart"