Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with 0.9.18
authorkoda
Thu, 01 Nov 2012 01:35:59 +0100
changeset 7913 2faebb6f7df9
parent 7907 3b44ecf91928 (current diff)
parent 7912 41f496023f98 (diff)
child 7915 293e6704b956
merge with 0.9.18
share/hedgewars/Data/Graphics/Missions/portal@2x.png file | annotate | diff | comparison | revisions 
--- a/.hgtags	Wed Oct 31 15:54:55 2012 -0400
+++ b/.hgtags	Thu Nov 01 01:35:59 2012 +0100
@@ -50,3 +50,4 @@
 0000000000000000000000000000000000000000 0-9.17-release
 4670f003f91b3246665ca0de95fa056d2d2f3f54 0.9.17-release
 ce2b24995ab2efc088accecd7f7b116bb946fff7 hedgeroid-alpha
+2f203395bacab0d5594d3d303b5d87b2f152df50 0.9.18-release
--- a/QTfrontend/ui/widget/chatwidget.cpp	Wed Oct 31 15:54:55 2012 -0400
+++ b/QTfrontend/ui/widget/chatwidget.cpp	Thu Nov 01 01:35:59 2012 +0100
@@ -532,9 +532,9 @@
     QString hlRegExp("^(.* )?%1[^-a-z0-9_]*( .*)?$");
     QRegExp whitespace("\\s");
 
-    m_highlights.append(QRegExp(hlRegExp.arg(m_userNick)));
+    m_highlights.append(QRegExp(hlRegExp.arg(m_userNick.toLower())));
 
-    QFile file(cfgdir->absolutePath() + "/" + m_userNick + "_highlight.txt");
+    QFile file(cfgdir->absolutePath() + "/" + m_userNick.toLower() + "_highlight.txt");
 
     if (file.exists() && (file.open(QIODevice::ReadOnly | QIODevice::Text)))
     {
@@ -554,7 +554,7 @@
             file.close();
     }
 
-    QFile file2(cfgdir->absolutePath() + "/" + m_userNick + "_hlregexp.txt");
+    QFile file2(cfgdir->absolutePath() + "/" + m_userNick.toLower() + "_hlregexp.txt");
 
     if (file2.exists() && (file2.open(QIODevice::ReadOnly | QIODevice::Text)))
     {
Binary file share/hedgewars/Data/Graphics/Missions/Training/portal@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/portal@2x.png has changed
--- a/share/hedgewars/Data/Locale/it.txt	Wed Oct 31 15:54:55 2012 -0400
+++ b/share/hedgewars/Data/Locale/it.txt	Thu Nov 01 01:35:59 2012 +0100
@@ -442,7 +442,7 @@
 ; the misspelled "Beethoven" is intentional (-> to beat)
 03:43=La mortale sonata di Beathoven!
 03:44=Il meglio prima del 1923
-03:45=Arma Scientifica (beta)
+03:45=Arma Scientifica
 03:46=Arma da Fuoco (quello vero!)
 03:47=Arma da Lancio
 03:48=E' tempo di martellate!
@@ -451,9 +451,9 @@
 03:51=Terreno al 100%
 03:52=NON USATO
 03:53=TARDIS Modello 40
-03:54=Kit di costruzione
+03:54=(Arma in sviluppo)
 03:55=Utilità di costruzione
-03:56=Arma da congelamento di massa
+03:56=(Arma in sviluppo)
 03:57=Ecco il grande chef!
 
 ; Weapon Descriptions (use | as line breaks)
--- a/share/hedgewars/Data/Maps/CMakeLists.txt	Wed Oct 31 15:54:55 2012 -0400
+++ b/share/hedgewars/Data/Maps/CMakeLists.txt	Thu Nov 01 01:35:59 2012 +0100
@@ -30,6 +30,7 @@
 	Octorama
 	PirateFlag
 	Plane
+	portal
 	Ropes
 	Ruler
 	Sheep
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Maps/portal/CMakeLists.txt	Thu Nov 01 01:35:59 2012 +0100
@@ -0,0 +1,6 @@
+install(FILES
+	map.png
+	mask.png
+	map.cfg
+	preview.png
+	DESTINATION ${SHAREPATH}Data/Maps/portal)
sheepy-clone