Fusion

--HG--
branch : compatibility-develop

.hgtags

@@ -16,3 +16,4 @@ d4060f217f4f834cc62a33f2f1ccdf3c28298066 ryzom-patch-3.1.0-hotfix
 043aaeb3d8a2a54177581b57bda87a9deaad510e ryzom-patch-3.1.0-april_patch
 4036ecf59e83960f03acebc2089eb2ff5eeaed0a ryzom-patch-3.2.0
 18403bb9485da3d9742c6f007a16d5619ebfb196 ryzom-patch-3.2.1
+822ff8f8917ad66e09e2c21c983282f6f693b9f6 ryzom-patch-3.3.0

code/CMakeLists.txt

@@ -60,8 +60,8 @@ SET(YEAR "2004-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 
 SET(RYZOM_VERSION_MAJOR 3)
-SET(RYZOM_VERSION_MINOR 2)
-SET(RYZOM_VERSION_PATCH 1)
+SET(RYZOM_VERSION_MINOR 3)
+SET(RYZOM_VERSION_PATCH 0)
 
 #-----------------------------------------------------------------------------
 # Redirect output files

code/ryzom/client/client_default.cfg

@@ -559,12 +559,12 @@ ScenarioLanguages = {"fr","de","en","other_lang"};
 // Map each language to a forum help page
 HelpPages =
 {
-	"fr=http://forums.ryzom.com/forum/showthread.php?t=29130",
-	"en=http://forums.ryzom.com/forum/showthread.php?t=29129",
-	"wk=http://forums.ryzom.com/forum/showthread.php?t=29129",
-	"de=http://forums.ryzom.com/forum/showthread.php?t=29131",
-	"es=http://forums.ryzom.com/forum/showthread.php?t=29129",
-	"ru=http://forums.ryzom.com/forum/showthread.php?t=29129"
+	"fr=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=fr",
+	"en=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=en",
+	"wk=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1",
+	"de=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=de",
+	"es=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=es",
+	"ru=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=ru"
 };
 
 WebIgMainDomain      = "app.ryzom.com";