Mercurial Mercurial > hedgewars / 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.
disable campaign button, structure and change sudden death music to hell.ogg
authorHenek
Thu, 11 Aug 2011 00:18:10 +0200
changeset 5543 5e597b725316
parent 5541 ec3685a583a5
child 5545 980d44fe2d4c
child 5548 73f2fec65257
disable campaign button, structure and change sudden death music to hell.ogg
QTfrontend/hwconsts.h file | annotate | diff | comparison | revisions
QTfrontend/pagesingleplayer.cpp file | annotate | diff | comparison | revisions
QTfrontend/selectWeapon.cpp file | annotate | diff | comparison | revisions
hedgewars/uVariables.pas file | annotate | diff | comparison | revisions
misc/theme_editor.html file | annotate | diff | comparison | revisions 
--- a/QTfrontend/hwconsts.h	Wed Aug 10 17:22:17 2011 -0400
+++ b/QTfrontend/hwconsts.h	Thu Aug 11 00:18:10 2011 +0200
@@ -58,41 +58,40 @@
 extern bool isDevBuild;
 #endif
 
-#define AMMOLINE_DEFAULT_QT     "939192942219912103223511100120100000021111010101111991"
-#define AMMOLINE_DEFAULT_PROB   "040504054160065554655446477657666666615551010111541111"
+#define AMMOLINE_DEFAULT_QT     "939192942219912103223511100120100000021111010101111101"
+#define AMMOLINE_DEFAULT_PROB   "040504054160065554655446477657666666615551010111541101"
 #define AMMOLINE_DEFAULT_DELAY  "000000000000020550000004000700400000000022000000060000"
-#define AMMOLINE_DEFAULT_CRATE  "131111031211111112311411111111111111121111110111111111"
+#define AMMOLINE_DEFAULT_CRATE  "131111031211111112311411111111111111121111110111111101"
 
-//TODO: Remove Piano's unlimited uses!
-#define AMMOLINE_CRAZY_QT       "999999999999999999299999999999999929999999990999999229"
-#define AMMOLINE_CRAZY_PROB     "111111011111111111111111111111111111111111110111111111"
+#define AMMOLINE_CRAZY_QT       "999999999999999999299999999999999929999999990999999209"
+#define AMMOLINE_CRAZY_PROB     "111111011111111111111111111111111111111111110111111101"
 #define AMMOLINE_CRAZY_DELAY    "000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_CRAZY_CRATE    "131111031211111112311411111111111111121111010111111111"
+#define AMMOLINE_CRAZY_CRATE    "131111031211111112311411111111111111121111010111111101"
 
 #define AMMOLINE_PROMODE_QT     "909000900000000000000900000000000000000000000000000000"
 #define AMMOLINE_PROMODE_PROB   "000000000000000000000000000000000000000000000000000000"
 #define AMMOLINE_PROMODE_DELAY  "000000000000020550000004000700400000000020000000000000"
-#define AMMOLINE_PROMODE_CRATE  "111111111111111111111111111111111111111110010111111111"
+#define AMMOLINE_PROMODE_CRATE  "111111111111111111111111111111111111111110010111111101"
 
 #define AMMOLINE_SHOPPA_QT      "000000990000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPA_PROB    "444441004424440221011212122242200000000200040001001111"
+#define AMMOLINE_SHOPPA_PROB    "444441004424440221011212122242200000000200040001001101"
 #define AMMOLINE_SHOPPA_DELAY   "000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPA_CRATE   "111111111111111111111111111111111111111110110111111111"
+#define AMMOLINE_SHOPPA_CRATE   "111111111111111111111111111111111111111110110111111101"
 
 #define AMMOLINE_CLEAN_QT       "101000900001000001100000000000000000000000000000100000"
-#define AMMOLINE_CLEAN_PROB     "040504054160065554655446477657666666615551010111541111"
+#define AMMOLINE_CLEAN_PROB     "040504054160065554655446477657666666615551010111541101"
 #define AMMOLINE_CLEAN_DELAY    "000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_CLEAN_CRATE    "131111031211111112311411111111111111121111110111111111"
+#define AMMOLINE_CLEAN_CRATE    "131111031211111112311411111111111111121111110111111101"
 
 #define AMMOLINE_MINES_QT       "000000990009000000030000000000000000000000000000000000"
 #define AMMOLINE_MINES_PROB     "000000000000000000000000000000000000000000000000000000"
 #define AMMOLINE_MINES_DELAY    "000000000000020550000004000700400000000020000000060000"
-#define AMMOLINE_MINES_CRATE    "111111111111111111111111111111111111111111110111111111"
+#define AMMOLINE_MINES_CRATE    "111111111111111111111111111111111111111111110111111101"
 
 #define AMMOLINE_PORTALS_QT     "900000900200000000210000000000000011000009000000000000"
-#define AMMOLINE_PORTALS_PROB   "040504054160065554655446477657666666615551010111541111"
+#define AMMOLINE_PORTALS_PROB   "040504054160065554655446477657666666615551010111541101"
 #define AMMOLINE_PORTALS_DELAY  "000000000000020550000004000700400000000020000000060000"
-#define AMMOLINE_PORTALS_CRATE  "131111031211111112311411111111111111121111110111111111"
+#define AMMOLINE_PORTALS_CRATE  "131111031211111112311411111111111111121111110111111101"
 
 
 #define NETGAME_DEFAULT_PORT 46631
--- a/QTfrontend/pagesingleplayer.cpp	Wed Aug 10 17:22:17 2011 -0400
+++ b/QTfrontend/pagesingleplayer.cpp	Thu Aug 11 00:18:10 2011 +0200
@@ -46,7 +46,7 @@
 
     BtnCampaignPage = addButton(":/res/Campaign.png", middleLine, 0, true);
     BtnCampaignPage->setToolTip(tr("Campaign Mode (...). IN DEVELOPMENT"));
-    //BtnCampaignPage->setVisible(false);
+    BtnCampaignPage->setVisible(false);
 
     BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 1, true);
     BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
--- a/QTfrontend/selectWeapon.cpp	Wed Aug 10 17:22:17 2011 -0400
+++ b/QTfrontend/selectWeapon.cpp	Thu Aug 11 00:18:10 2011 +0200
@@ -129,6 +129,7 @@
     int i = 0, k = 0;
     for(; i < m_numItems; ++i) {
         if (i == 6) continue;
+        if (i == 52) continue; // Disable structures for now
         if (k % 4 == 0) ++j;
         SelWeaponItem * swi = new SelWeaponItem(true, i, currentState[i].digitValue(), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
         weaponItems[i].append(swi);
--- a/hedgewars/uVariables.pas	Wed Aug 10 17:22:17 2011 -0400
+++ b/hedgewars/uVariables.pas	Thu Aug 11 00:18:10 2011 +0200
@@ -2409,7 +2409,7 @@
     SDWaterColorArray[1]:= SDWaterColorArray[0];
     SDWaterColorArray[3]:= SDWaterColorArray[2];
 
-    SDMusic:= 'main_theme.ogg';
+    SDMusic:= 'hell.ogg';
     SDTint:= $80;
 
     cDrownSpeed.QWordValue  := 257698038;       // 0.06
--- a/misc/theme_editor.html	Wed Aug 10 17:22:17 2011 -0400
+++ b/misc/theme_editor.html	Thu Aug 11 00:18:10 2011 +0200
@@ -125,7 +125,7 @@
     </head>
     <body onload="load();">
         <h1>Hedgewars Theme editor</h1>
-        <canvas id="preview" width="512" height="384"></canvas><br>
+        <canvas id="preview" width="512" height="384">Sorry, your browser does not support Canvas.</canvas><br>
         <table>
         <tr><td>Sky:</td><td>
         <input id="sky" type="file" accept="image/png" onchange="sky.src = window.URL.createObjectURL(this.files[0])"></input>
hedgewars