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.
smaller update (color and modes)
authorkoda
Mon, 08 Nov 2010 23:58:22 +0100
changeset 4213 3875481fcc86
parent 4211 7dcbd236ca59
child 4216 184181604092
smaller update (color and modes)
project_files/HedgewarsMobile/Classes/CommodityFunctions.m file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist file | annotate | diff | comparison | revisions 
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Mon Nov 08 23:58:22 2010 +0100
@@ -139,8 +139,8 @@
     
     NSMutableArray *basicArray  = [[NSMutableArray alloc] initWithObjects:
                                    [NSNumber numberWithInt:100],      //initialhealth
+                                   [NSNumber numberWithInt:45],       //turntime
                                    [NSNumber numberWithInt:100],      //damagemodifier
-                                   [NSNumber numberWithInt:45],       //turntime
                                    [NSNumber numberWithInt:15],       //suddendeathtimeout
                                    [NSNumber numberWithInt:47],       //waterrise
                                    [NSNumber numberWithInt:5],        //healthdecrease
@@ -272,14 +272,14 @@
 }
 
 NSArray inline *getAvailableColors (void) {
-    return [NSArray arrayWithObjects:[NSNumber numberWithUnsignedInt:0x4376e9],     // bluette
+    return [NSArray arrayWithObjects:[NSNumber numberWithUnsignedInt:0x3376E9],     // bluette
                                      [NSNumber numberWithUnsignedInt:0x3e9321],     // greeeen
                                      [NSNumber numberWithUnsignedInt:0xa23dbb],     // violett
                                      [NSNumber numberWithUnsignedInt:0xff9329],     // oranngy
                                      [NSNumber numberWithUnsignedInt:0xdd0000],     // reddish
                                      [NSNumber numberWithUnsignedInt:0x737373],     // graaaay
-                                     [NSNumber numberWithUnsignedInt:0xbba23d],     // gold$$$
-                                     [NSNumber numberWithUnsignedInt:0x3da2bb],     // cyannnn  
+                                     [NSNumber numberWithUnsignedInt:0x00FFFF],     // cyannnn  
+                                     [NSNumber numberWithUnsignedInt:0xFF8888],     // peachyj
                                      nil];
 }
 
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Mon Nov 08 23:58:22 2010 +0100
@@ -31,8 +31,6 @@
 #define checkValueString(detailString,labelSting,sliderRef); \
     if ([labelSting isEqualToString:@"Turn Time"] && (NSInteger) sliderRef.value == 100) \
         detailString = @"∞"; \
-    else if ([labelSting isEqualToString:@"Sudden Death Timeout"] && (NSInteger) sliderRef.value == 100) \
-        detailString = NSLocalizedString(@"Nvr",@"Short for 'Never'"); \
     else if ([labelSting isEqualToString:@"Water Rise Amount"] && (NSInteger) sliderRef.value == 100) \
         detailString = NSLocalizedString(@"Nvr",@"Short for 'Never'"); \
     else if ([labelSting isEqualToString:@"Crate Drop Turns"] && (NSInteger) sliderRef.value == 0) \
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Mon Nov 08 23:58:22 2010 +0100
@@ -1482,7 +1482,7 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		1D6058900D05DD3D006BFB54 /* Test Lua */ = {
+		1D6058900D05DD3D006BFB54 /* Hedgewars */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hedgewars" */;
 			buildPhases = (
@@ -1573,7 +1573,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				1D6058900D05DD3D006BFB54 /* Test Lua */,
+				1D6058900D05DD3D006BFB54 /* Hedgewars */,
 				928301160F10CAFC00CC5A3C /* fpc */,
 				6179928B114AE0C800BA94A9 /* UpdateDataFolder */,
 			);
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
 	<key>basic</key>
 	<array>
 		<integer>100</integer>
+		<integer>30</integer>
 		<integer>100</integer>
-		<integer>30</integer>
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
 	<key>basic</key>
 	<array>
 		<integer>100</integer>
+		<integer>45</integer>
 		<integer>100</integer>
-		<integer>45</integer>
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
 	<key>basic</key>
 	<array>
 		<integer>50</integer>
+		<integer>30</integer>
 		<integer>150</integer>
-		<integer>30</integer>
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -5,9 +5,9 @@
 	<key>basic</key>
 	<array>
 		<integer>100</integer>
+		<integer>15</integer>
 		<integer>100</integer>
 		<integer>15</integer>
-		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
 		<integer>0</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
 	<key>basic</key>
 	<array>
 		<integer>100</integer>
+		<integer>300</integer>
 		<integer>100</integer>
-		<integer>300</integer>
 		<integer>50</integer>
 		<integer>47</integer>
 		<integer>5</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
 	<key>basic</key>
 	<array>
 		<integer>100</integer>
+		<integer>30</integer>
 		<integer>100</integer>
-		<integer>30</integer>
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist	Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist	Mon Nov 08 23:58:22 2010 +0100
@@ -20,6 +20,22 @@
 	</dict>
 	<dict>
 		<key>checkOverMax</key>
+		<true/>
+		<key>command</key>
+		<string>e$turntime</string>
+		<key>default</key>
+		<integer>45</integer>
+		<key>image</key>
+		<string>Time</string>
+		<key>max</key>
+		<integer>100</integer>
+		<key>min</key>
+		<integer>1</integer>
+		<key>title</key>
+		<string>Turn Time</string>
+	</dict>
+	<dict>
+		<key>checkOverMax</key>
 		<false/>
 		<key>command</key>
 		<string>e$damagepct</string>
@@ -38,29 +54,13 @@
 		<key>checkOverMax</key>
 		<true/>
 		<key>command</key>
-		<string>e$turntime</string>
-		<key>default</key>
-		<integer>45</integer>
-		<key>image</key>
-		<string>Time</string>
-		<key>max</key>
-		<integer>100</integer>
-		<key>min</key>
-		<integer>1</integer>
-		<key>title</key>
-		<string>Turn Time</string>
-	</dict>
-	<dict>
-		<key>checkOverMax</key>
-		<true/>
-		<key>command</key>
 		<string>e$sd_turns</string>
 		<key>default</key>
 		<integer>15</integer>
 		<key>image</key>
 		<string>SuddenDeath</string>
 		<key>max</key>
-		<integer>100</integer>
+		<integer>50</integer>
 		<key>min</key>
 		<integer>0</integer>
 		<key>title</key>
hedgewars