From fd090ce83b36ea0e40d540c885bda8fd597c9305 Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:22:47 +0800 Subject: [PATCH 1/8] 1.3(1) --- src/ServerInfo.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ServerInfo.hs b/src/ServerInfo.hs index 91b222c..b71ca80 100644 --- a/src/ServerInfo.hs +++ b/src/ServerInfo.hs @@ -295,6 +295,7 @@ protocolToPath :: Config -> Int -> Maybe FilePath protocolToPath c proto = case proto of 69 -> Just (tremulousPath c) 70 -> Just (tremulousGppPath c) + 71 -> Just (tremulous13path c) 86 -> Just (unvanquishedPath c) _ -> Nothing From 731023b26bdb0fe87baf88cf3e35dedf6f376f90 Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:24:19 +0800 Subject: [PATCH 2/8] 1.3(2) --- src/Config.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Config.hs b/src/Config.hs index 78f844b..f20479c 100644 --- a/src/Config.hs +++ b/src/Config.hs @@ -61,6 +61,7 @@ defaultConfig :: Config defaultConfig = Config { masterServers = [ ("master.tremulous.net", 30710, 69) , ("master.tremulous.net", 30700, 70) + , ("master.tremulous.net", 30700, 71) , ("unvanquished.net", 27950, 86) ] , clanlistURL = "http://ddos-tremulous.eu/cw/api/2/clanlist" From a90305295b2a2e63cc3fe392686f3f901ec9dd94 Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:26:02 +0800 Subject: [PATCH 3/8] 1.3(3) --- src/TremFormatting.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/TremFormatting.hs b/src/TremFormatting.hs index 6ad9b2e..0774c17 100644 --- a/src/TremFormatting.hs +++ b/src/TremFormatting.hs @@ -50,11 +50,13 @@ protoToAbbr, protoToFull :: IsString s => Int -> s protoToAbbr x = case x of 69 -> "1.1" 70 -> "gpp" + 71 -> "1.3" 86 -> "unv" _ -> "?" protoToFull x = case x of 69 -> "Tremulous 1.1" 70 -> "Tremulous GPP" + 71 -> "Tremulous 1.3" 86 -> "Unvanquished" - _ -> "" \ No newline at end of file + _ -> "" From ab39c346385564579a0b45a8be3424a21588b463 Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:29:30 +0800 Subject: [PATCH 4/8] 1.3(4) --- packages/pacman/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pacman/PKGBUILD b/packages/pacman/PKGBUILD index 00f2b9e..6d1015e 100644 --- a/packages/pacman/PKGBUILD +++ b/packages/pacman/PKGBUILD @@ -18,6 +18,7 @@ depends=('gmp' 'gtk2' 'hicolor-icon-theme') optdepends=('tremulous: Launch Tremulous 1.1 games' 'tremulous-gpp: Launch Tremulous GPP games' + 'tremulous-1.3: Launch Tremulous 1.3 games' 'unvanquished: Launch Unvanquished games') From 9439578e957f934e7cf450305c1f4984d3555ad2 Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:38:48 +0800 Subject: [PATCH 5/8] 1.3(5) I'm salty about the name of the exec for 1.1 support because it doesn't even work on windows lmao GPP for most part can be ignored since there is only one server running GPP only protocol at the moment however the user can always connect with their GPP client, if they have it installer, or else tey can link the GPP protocol to the 1.3 client (assuming they are not on windows) --- src/Config.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Config.hs b/src/Config.hs index f20479c..2720cab 100644 --- a/src/Config.hs +++ b/src/Config.hs @@ -39,6 +39,7 @@ data Config = Config , clanlistURL :: !String , tremulousPath , tremulousGppPath + , tremulous13Path , unvanquishedPath :: !String , refreshMode :: !RefreshMode , autoClan @@ -69,10 +70,12 @@ defaultConfig = Config #if defined(mingw32_HOST_OS) || defined(__MINGW32__) , tremulousPath = "C:\\Program Files\\Tremulous\\tremulous.exe" , tremulousGppPath = "C:\\Program Files\\Tremulous\\tremulous-gpp.exe" + , tremulous13Path = "C:\\Program Files\\Tremulous\\tremulous.exe" , unvanquishedPath = "C:\\Program Files (x86)\\Unvanquished\\daemon.exe" #else , tremulousPath = "tremulous" , tremulousGppPath = "tremulous-gpp" + , tremulous13Path = "tremulous" , unvanquishedPath = "unvanquished" #endif From eba020ffc8009e35df1dee0d6711f09c72535379 Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:46:44 +0800 Subject: [PATCH 6/8] Update description of something mysterious --- apelsin.cabal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apelsin.cabal b/apelsin.cabal index 7cb3491..f95bd6d 100644 --- a/apelsin.cabal +++ b/apelsin.cabal @@ -9,7 +9,8 @@ Category: Network Synopsis: Server and community browser for the game Tremulous Description: A gtk2hs server and clan browser for the open source game Tremulous - . Both Tremulous 1.1 and GPP are supported. + . Both Tremulous 1.1, GPP and 1.3 (protocol 71) + are supported. Unvanquished is included as an extra (Protocol 86 Features filtering, player search, a list of online clan members, a clan list and basic perferences. From b0b40658265224af5c78aa454188f0db34e042aa Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Thu, 19 Oct 2017 23:50:41 +0800 Subject: [PATCH 7/8] 1.3(7) I have no idea what the fuck i am doing here, correct me if yo uneed to. I don't know what te underscores are for sinec i don't know haskell or whatever its called --- src/Preferences.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Preferences.hs b/src/Preferences.hs index 11e6990..3ea4d7b 100644 --- a/src/Preferences.hs +++ b/src/Preferences.hs @@ -43,7 +43,8 @@ newPreferences Bundle{..} = do path_table <- paddedTableNew tremulousPath <- pathInsertTable parent path_table 0 "_Tremulous 1.1:" tremulousGppPath <- pathInsertTable parent path_table 1 "Tremulous _GPP:" - unvanquishedPath <- pathInsertTable parent path_table 2 "_Unvanquished:" + tremulous13Path <- pathInsertTable parent path_table 2 "Tremulous _1.3:" + unvanquishedPath <- pathInsertTable parent path_table 3 "_Unvanquished:" paths <- framed "Path or command" path_table -- Startup @@ -116,6 +117,7 @@ newPreferences Bundle{..} = do set showEmpty [ toggleButtonActive := C.showEmpty c] set tremulousPath [ entryText := C.tremulousPath c ] set tremulousGppPath [ entryText := C.tremulousGppPath c] + set tremulous13Path [ entryText := C.tremulous13Path c] set unvanquishedPath [ entryText := C.unvanquishedPath c] set autoClan [ toggleButtonActive := C.autoClan c] set restoreGeometry [ toggleButtonActive := C.restoreGeometry c] From 6029d813a45d823275f16f8525a23a73eaac37df Mon Sep 17 00:00:00 2001 From: ZdrytchX de Frisquilious ViruS Date: Fri, 20 Oct 2017 02:54:23 +0800 Subject: [PATCH 8/8] Close bracket --- apelsin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apelsin.cabal b/apelsin.cabal index f95bd6d..c7f8028 100644 --- a/apelsin.cabal +++ b/apelsin.cabal @@ -10,7 +10,7 @@ Synopsis: Server and community browser for the game Tremulous Description: A gtk2hs server and clan browser for the open source game Tremulous . Both Tremulous 1.1, GPP and 1.3 (protocol 71) - are supported. Unvanquished is included as an extra (Protocol 86 + are supported. Unvanquished is included as an extra (Protocol 86) Features filtering, player search, a list of online clan members, a clan list and basic perferences.