Merge branch 'bones_was_here/chkupd' into 'master'

Update how xonotic.org services are accessed

See merge request xonotic/xonotic-data.pk3dir!995

diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh
index d5664d9d6a50d71c7216ebbdaf606ca74b8fc326..4e52b83e0951f7d76ddd001c0216da8e770675e3 100644 (file)
--- a/qcsrc/common/playerstats.qh
+++ b/qcsrc/common/playerstats.qh
@@ -98,7 +98,7 @@ const float PS_B_STATUS_WAITING = 0;
 const float PS_B_STATUS_RECEIVED = 1;
 const float PS_B_STATUS_UPDATING = 2;
 .float playerstats_basicstatus;
-string autocvar_g_playerstats_playerbasic_uri = "http://stats.xonotic.org";
+string autocvar_g_playerstats_playerbasic_uri = "https://stats.xonotic.org";
 
 void PlayerStats_PlayerBasic(entity joiningplayer, float newrequest);
 void PlayerStats_PlayerBasic_CheckUpdate(entity joiningplayer);
@@ -112,7 +112,7 @@ const float PS_D_STATUS_IDLE = -1;
 const float PS_D_STATUS_WAITING = 0;
 const float PS_D_STATUS_RECEIVED = 1;
 float PlayerStats_PlayerDetail_Status = PS_D_STATUS_IDLE;
-string autocvar_g_playerstats_playerdetail_uri = "http://stats.xonotic.org/player/me";
+string autocvar_g_playerstats_playerdetail_uri = "https://stats.xonotic.org/player/me";
 float autocvar_g_playerstats_playerdetail_autoupdatetime = 1800; // automatically update every 30 minutes anyway
 void PlayerStats_PlayerDetail();
 void PlayerStats_PlayerDetail_CheckUpdate();

diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qh b/qcsrc/menu/xonotic/dialog_termsofservice.qh
index 9231f3063d11bea1ecd133447b650cb6f464a869..037450f0a2e1f6c88466ea89aac3eeef7fd0285f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_termsofservice.qh
+++ b/qcsrc/menu/xonotic/dialog_termsofservice.qh
@@ -1,7 +1,7 @@
 #pragma once
 
 int autocvar__termsofservice_accepted;
-const string termsofservice_url = "http://update.xonotic.org/tos.txt";
+const string termsofservice_url = "https://update.xonotic.org/tos.txt";
 
 #include "rootdialog.qh"
 CLASS(XonoticToSDialog, XonoticRootDialog)

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 63eb27abf7b4ffba689280b1f4c83f4faa8357f5..691404ac117d183c95162716a60c886d405017cc 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -475,15 +475,8 @@ void updateCheck()
        if(!_Nex_ExtResponseSystem_Queried)
        {
                _Nex_ExtResponseSystem_Queried = 1;
-               float startcnt;
-               string uri;
-
-               cvar_set("cl_startcount", ftos(startcnt = cvar("cl_startcount") + 1));
-
-               // for privacy, munge the start count a little
-               startcnt = floor((floor(startcnt / 10) + random()) * 10);
-               uri = sprintf("http://update.xonotic.org/checkupdate.txt?version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt);
-               uri_get(uri, URI_GET_UPDATENOTIFICATION);
+               cvar_set("cl_startcount", ftos(cvar("cl_startcount") + 1));
+               uri_get("https://update.xonotic.org/checkupdate.txt", URI_GET_UPDATENOTIFICATION);
        }
 
        if(_Nex_ExtResponseSystem_PacksStep > 0)

diff --git a/quake.rc b/quake.rc
index 9330d6a677f403ffaf89660b2775e633dd434abe..42e48ca67868c81fbcc0f88374119b488351dcd4 100644 (file)
--- a/quake.rc
+++ b/quake.rc
@@ -10,6 +10,6 @@ stuffcmds
 //startdemos demos/demo1 demos/demo2 demos/demo3
 //startdemos
 //play announcer/male/welcome.ogg
-crypto_keygen 0 http://ca.xonotic.org/?ca=0&key=
+crypto_keygen 0 https://ca.xonotic.org/?ca=0&key=
 
 exec post-config.cfg

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 0be38b30360e850b6eea517b65ea13520558e978..041ac633c9ef23b93dc314cd5f0637852b5cca5c 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -549,8 +549,8 @@ set g_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 // player statistics
 set g_playerstats_gamereport_uri "https://stats.xonotic.org/stats/submit" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory."
 set g_playerstats_gamereport_ladder ""
-set g_playerstats_playerbasic_uri "http://stats.xonotic.org"
-set g_playerstats_playerdetail_uri "http://stats.xonotic.org/player/me"
+set g_playerstats_playerbasic_uri "https://stats.xonotic.org"
+set g_playerstats_playerdetail_uri "https://stats.xonotic.org/player/me"
 set g_playerstats_playerdetail_autoupdatetime 1800 // automatically update every 30 minutes anyway
 
 // autoscreenshots