Add new resolution and fixes for iPhone 6

bni · Jan 17, 2015 · 0a0b65d · 0a0b65d
1 parent 2fc19f7
commit 0a0b65d
Show file tree

Hide file tree

Showing 211 changed files with 18 additions and 14 deletions.
diff --git a/gfx/1096x746/announcer0.png b/gfx/1096x746/announcer0.png
diff --git a/gfx/1096x746/announcer1.png b/gfx/1096x746/announcer1.png
diff --git a/gfx/1096x746/announcer2.png b/gfx/1096x746/announcer2.png
diff --git a/gfx/1096x746/announcer3.png b/gfx/1096x746/announcer3.png
diff --git a/gfx/1096x746/bar0.png b/gfx/1096x746/bar0.png
diff --git a/gfx/1096x746/bar1.png b/gfx/1096x746/bar1.png
diff --git a/gfx/1096x746/bar10.png b/gfx/1096x746/bar10.png
diff --git a/gfx/1096x746/bar11.png b/gfx/1096x746/bar11.png
diff --git a/gfx/1096x746/bar12.png b/gfx/1096x746/bar12.png
diff --git a/gfx/1096x746/bar13.png b/gfx/1096x746/bar13.png
diff --git a/gfx/1096x746/bar14.png b/gfx/1096x746/bar14.png
diff --git a/gfx/1096x746/bar15.png b/gfx/1096x746/bar15.png
diff --git a/gfx/1096x746/bar2.png b/gfx/1096x746/bar2.png
diff --git a/gfx/1096x746/bar3.png b/gfx/1096x746/bar3.png
diff --git a/gfx/1096x746/bar4.png b/gfx/1096x746/bar4.png
diff --git a/gfx/1096x746/bar5.png b/gfx/1096x746/bar5.png
diff --git a/gfx/1096x746/bar6.png b/gfx/1096x746/bar6.png
diff --git a/gfx/1096x746/bar7.png b/gfx/1096x746/bar7.png
diff --git a/gfx/1096x746/bar8.png b/gfx/1096x746/bar8.png
diff --git a/gfx/1096x746/bar9.png b/gfx/1096x746/bar9.png
diff --git a/gfx/1096x746/clock0.png b/gfx/1096x746/clock0.png
diff --git a/gfx/1096x746/clock1.png b/gfx/1096x746/clock1.png
diff --git a/gfx/1096x746/clock2.png b/gfx/1096x746/clock2.png
diff --git a/gfx/1096x746/clock3.png b/gfx/1096x746/clock3.png
diff --git a/gfx/1096x746/clock4.png b/gfx/1096x746/clock4.png
diff --git a/gfx/1096x746/clock5.png b/gfx/1096x746/clock5.png
diff --git a/gfx/1096x746/clock6.png b/gfx/1096x746/clock6.png
diff --git a/gfx/1096x746/clock7.png b/gfx/1096x746/clock7.png
diff --git a/gfx/1096x746/clock8.png b/gfx/1096x746/clock8.png
diff --git a/gfx/1096x746/clock9.png b/gfx/1096x746/clock9.png
diff --git a/gfx/1096x746/counter0.png b/gfx/1096x746/counter0.png
diff --git a/gfx/1096x746/counter1.png b/gfx/1096x746/counter1.png
diff --git a/gfx/1096x746/counter2.png b/gfx/1096x746/counter2.png
diff --git a/gfx/1096x746/counter3.png b/gfx/1096x746/counter3.png
diff --git a/gfx/1096x746/counter4.png b/gfx/1096x746/counter4.png
diff --git a/gfx/1096x746/crosstile0.png b/gfx/1096x746/crosstile0.png
diff --git a/gfx/1096x746/crosstile1.png b/gfx/1096x746/crosstile1.png
diff --git a/gfx/1096x746/crosstile2.png b/gfx/1096x746/crosstile2.png
diff --git a/gfx/1096x746/crosstile3.png b/gfx/1096x746/crosstile3.png
diff --git a/gfx/1096x746/crosstile4.png b/gfx/1096x746/crosstile4.png
diff --git a/gfx/1096x746/director0.png b/gfx/1096x746/director0.png
diff --git a/gfx/1096x746/director1.png b/gfx/1096x746/director1.png
diff --git a/gfx/1096x746/director2.png b/gfx/1096x746/director2.png
diff --git a/gfx/1096x746/director3.png b/gfx/1096x746/director3.png
diff --git a/gfx/1096x746/emptytile0.png b/gfx/1096x746/emptytile0.png
diff --git a/gfx/1096x746/emptytile1.png b/gfx/1096x746/emptytile1.png
diff --git a/gfx/1096x746/emptytile2.png b/gfx/1096x746/emptytile2.png
diff --git a/gfx/1096x746/emptytile3.png b/gfx/1096x746/emptytile3.png
diff --git a/gfx/1096x746/emptytile4.png b/gfx/1096x746/emptytile4.png
diff --git a/gfx/1096x746/emptytile5.png b/gfx/1096x746/emptytile5.png
diff --git a/gfx/1096x746/emptytile6.png b/gfx/1096x746/emptytile6.png
diff --git a/gfx/1096x746/explosion0.png b/gfx/1096x746/explosion0.png
diff --git a/gfx/1096x746/explosion1.png b/gfx/1096x746/explosion1.png
diff --git a/gfx/1096x746/explosion2.png b/gfx/1096x746/explosion2.png
diff --git a/gfx/1096x746/explosion3.png b/gfx/1096x746/explosion3.png
diff --git a/gfx/1096x746/horiztile0.png b/gfx/1096x746/horiztile0.png
diff --git a/gfx/1096x746/horiztile1.png b/gfx/1096x746/horiztile1.png
diff --git a/gfx/1096x746/horiztile2.png b/gfx/1096x746/horiztile2.png
diff --git a/gfx/1096x746/horiztile3.png b/gfx/1096x746/horiztile3.png
diff --git a/gfx/1096x746/horiztile4.png b/gfx/1096x746/horiztile4.png
diff --git a/gfx/1096x746/horiztile5.png b/gfx/1096x746/horiztile5.png
diff --git a/gfx/1096x746/inspector0.png b/gfx/1096x746/inspector0.png
diff --git a/gfx/1096x746/inspector1.png b/gfx/1096x746/inspector1.png
diff --git a/gfx/1096x746/inspector2.png b/gfx/1096x746/inspector2.png
diff --git a/gfx/1096x746/inspector3.png b/gfx/1096x746/inspector3.png
diff --git a/gfx/1096x746/marble0.png b/gfx/1096x746/marble0.png
diff --git a/gfx/1096x746/marble1.png b/gfx/1096x746/marble1.png
diff --git a/gfx/1096x746/marble10.png b/gfx/1096x746/marble10.png
diff --git a/gfx/1096x746/marble11.png b/gfx/1096x746/marble11.png
diff --git a/gfx/1096x746/marble12.png b/gfx/1096x746/marble12.png
diff --git a/gfx/1096x746/marble13.png b/gfx/1096x746/marble13.png
diff --git a/gfx/1096x746/marble14.png b/gfx/1096x746/marble14.png
diff --git a/gfx/1096x746/marble15.png b/gfx/1096x746/marble15.png
diff --git a/gfx/1096x746/marble16.png b/gfx/1096x746/marble16.png
diff --git a/gfx/1096x746/marble17.png b/gfx/1096x746/marble17.png
diff --git a/gfx/1096x746/marble18.png b/gfx/1096x746/marble18.png
diff --git a/gfx/1096x746/marble19.png b/gfx/1096x746/marble19.png
diff --git a/gfx/1096x746/marble2.png b/gfx/1096x746/marble2.png
diff --git a/gfx/1096x746/marble20.png b/gfx/1096x746/marble20.png
diff --git a/gfx/1096x746/marble21.png b/gfx/1096x746/marble21.png
diff --git a/gfx/1096x746/marble22.png b/gfx/1096x746/marble22.png
diff --git a/gfx/1096x746/marble23.png b/gfx/1096x746/marble23.png
diff --git a/gfx/1096x746/marble24.png b/gfx/1096x746/marble24.png
diff --git a/gfx/1096x746/marble25.png b/gfx/1096x746/marble25.png
diff --git a/gfx/1096x746/marble26.png b/gfx/1096x746/marble26.png
diff --git a/gfx/1096x746/marble27.png b/gfx/1096x746/marble27.png
diff --git a/gfx/1096x746/marble28.png b/gfx/1096x746/marble28.png
diff --git a/gfx/1096x746/marble29.png b/gfx/1096x746/marble29.png
diff --git a/gfx/1096x746/marble3.png b/gfx/1096x746/marble3.png
diff --git a/gfx/1096x746/marble30.png b/gfx/1096x746/marble30.png
diff --git a/gfx/1096x746/marble31.png b/gfx/1096x746/marble31.png
diff --git a/gfx/1096x746/marble32.png b/gfx/1096x746/marble32.png
diff --git a/gfx/1096x746/marble33.png b/gfx/1096x746/marble33.png
diff --git a/gfx/1096x746/marble34.png b/gfx/1096x746/marble34.png
diff --git a/gfx/1096x746/marble35.png b/gfx/1096x746/marble35.png
diff --git a/gfx/1096x746/marble36.png b/gfx/1096x746/marble36.png
diff --git a/gfx/1096x746/marble37.png b/gfx/1096x746/marble37.png
diff --git a/gfx/1096x746/marble38.png b/gfx/1096x746/marble38.png
diff --git a/gfx/1096x746/marble39.png b/gfx/1096x746/marble39.png
diff --git a/gfx/1096x746/marble4.png b/gfx/1096x746/marble4.png
diff --git a/gfx/1096x746/marble40.png b/gfx/1096x746/marble40.png
diff --git a/gfx/1096x746/marble41.png b/gfx/1096x746/marble41.png
diff --git a/gfx/1096x746/marble42.png b/gfx/1096x746/marble42.png
diff --git a/gfx/1096x746/marble43.png b/gfx/1096x746/marble43.png
diff --git a/gfx/1096x746/marble44.png b/gfx/1096x746/marble44.png
diff --git a/gfx/1096x746/marble45.png b/gfx/1096x746/marble45.png
diff --git a/gfx/1096x746/marble46.png b/gfx/1096x746/marble46.png
diff --git a/gfx/1096x746/marble47.png b/gfx/1096x746/marble47.png
diff --git a/gfx/1096x746/marble5.png b/gfx/1096x746/marble5.png
diff --git a/gfx/1096x746/marble6.png b/gfx/1096x746/marble6.png
diff --git a/gfx/1096x746/marble7.png b/gfx/1096x746/marble7.png
diff --git a/gfx/1096x746/marble8.png b/gfx/1096x746/marble8.png
diff --git a/gfx/1096x746/marble9.png b/gfx/1096x746/marble9.png
diff --git a/gfx/1096x746/matcher0.png b/gfx/1096x746/matcher0.png
diff --git a/gfx/1096x746/modtile0.png b/gfx/1096x746/modtile0.png
diff --git a/gfx/1096x746/modtile1.png b/gfx/1096x746/modtile1.png
diff --git a/gfx/1096x746/modtile10.png b/gfx/1096x746/modtile10.png
diff --git a/gfx/1096x746/modtile11.png b/gfx/1096x746/modtile11.png
diff --git a/gfx/1096x746/modtile12.png b/gfx/1096x746/modtile12.png
diff --git a/gfx/1096x746/modtile13.png b/gfx/1096x746/modtile13.png
diff --git a/gfx/1096x746/modtile14.png b/gfx/1096x746/modtile14.png
diff --git a/gfx/1096x746/modtile2.png b/gfx/1096x746/modtile2.png
diff --git a/gfx/1096x746/modtile3.png b/gfx/1096x746/modtile3.png
diff --git a/gfx/1096x746/modtile4.png b/gfx/1096x746/modtile4.png
diff --git a/gfx/1096x746/modtile5.png b/gfx/1096x746/modtile5.png
diff --git a/gfx/1096x746/modtile6.png b/gfx/1096x746/modtile6.png
diff --git a/gfx/1096x746/modtile7.png b/gfx/1096x746/modtile7.png
diff --git a/gfx/1096x746/modtile8.png b/gfx/1096x746/modtile8.png
diff --git a/gfx/1096x746/modtile9.png b/gfx/1096x746/modtile9.png
diff --git a/gfx/1096x746/rotatile0.png b/gfx/1096x746/rotatile0.png
diff --git a/gfx/1096x746/rotatile1.png b/gfx/1096x746/rotatile1.png
diff --git a/gfx/1096x746/rotatile10.png b/gfx/1096x746/rotatile10.png
diff --git a/gfx/1096x746/rotatile11.png b/gfx/1096x746/rotatile11.png
diff --git a/gfx/1096x746/rotatile12.png b/gfx/1096x746/rotatile12.png
diff --git a/gfx/1096x746/rotatile13.png b/gfx/1096x746/rotatile13.png
diff --git a/gfx/1096x746/rotatile14.png b/gfx/1096x746/rotatile14.png
diff --git a/gfx/1096x746/rotatile15.png b/gfx/1096x746/rotatile15.png
diff --git a/gfx/1096x746/rotatile16.png b/gfx/1096x746/rotatile16.png
diff --git a/gfx/1096x746/rotatile17.png b/gfx/1096x746/rotatile17.png
diff --git a/gfx/1096x746/rotatile18.png b/gfx/1096x746/rotatile18.png
diff --git a/gfx/1096x746/rotatile19.png b/gfx/1096x746/rotatile19.png
diff --git a/gfx/1096x746/rotatile2.png b/gfx/1096x746/rotatile2.png
diff --git a/gfx/1096x746/rotatile20.png b/gfx/1096x746/rotatile20.png
diff --git a/gfx/1096x746/rotatile21.png b/gfx/1096x746/rotatile21.png
diff --git a/gfx/1096x746/rotatile22.png b/gfx/1096x746/rotatile22.png
diff --git a/gfx/1096x746/rotatile23.png b/gfx/1096x746/rotatile23.png
diff --git a/gfx/1096x746/rotatile24.png b/gfx/1096x746/rotatile24.png
diff --git a/gfx/1096x746/rotatile25.png b/gfx/1096x746/rotatile25.png
diff --git a/gfx/1096x746/rotatile26.png b/gfx/1096x746/rotatile26.png
diff --git a/gfx/1096x746/rotatile27.png b/gfx/1096x746/rotatile27.png
diff --git a/gfx/1096x746/rotatile28.png b/gfx/1096x746/rotatile28.png
diff --git a/gfx/1096x746/rotatile29.png b/gfx/1096x746/rotatile29.png
diff --git a/gfx/1096x746/rotatile3.png b/gfx/1096x746/rotatile3.png
diff --git a/gfx/1096x746/rotatile4.png b/gfx/1096x746/rotatile4.png
diff --git a/gfx/1096x746/rotatile5.png b/gfx/1096x746/rotatile5.png
diff --git a/gfx/1096x746/rotatile6.png b/gfx/1096x746/rotatile6.png
diff --git a/gfx/1096x746/rotatile7.png b/gfx/1096x746/rotatile7.png
diff --git a/gfx/1096x746/rotatile8.png b/gfx/1096x746/rotatile8.png
diff --git a/gfx/1096x746/rotatile9.png b/gfx/1096x746/rotatile9.png
diff --git a/gfx/1096x746/rotator0.png b/gfx/1096x746/rotator0.png
diff --git a/gfx/1096x746/rotator1.png b/gfx/1096x746/rotator1.png
diff --git a/gfx/1096x746/rotator10.png b/gfx/1096x746/rotator10.png
diff --git a/gfx/1096x746/rotator11.png b/gfx/1096x746/rotator11.png
diff --git a/gfx/1096x746/rotator12.png b/gfx/1096x746/rotator12.png
diff --git a/gfx/1096x746/rotator13.png b/gfx/1096x746/rotator13.png
diff --git a/gfx/1096x746/rotator14.png b/gfx/1096x746/rotator14.png
diff --git a/gfx/1096x746/rotator15.png b/gfx/1096x746/rotator15.png
diff --git a/gfx/1096x746/rotator16.png b/gfx/1096x746/rotator16.png
diff --git a/gfx/1096x746/rotator17.png b/gfx/1096x746/rotator17.png
diff --git a/gfx/1096x746/rotator18.png b/gfx/1096x746/rotator18.png
diff --git a/gfx/1096x746/rotator19.png b/gfx/1096x746/rotator19.png
diff --git a/gfx/1096x746/rotator2.png b/gfx/1096x746/rotator2.png
diff --git a/gfx/1096x746/rotator20.png b/gfx/1096x746/rotator20.png
diff --git a/gfx/1096x746/rotator21.png b/gfx/1096x746/rotator21.png
diff --git a/gfx/1096x746/rotator22.png b/gfx/1096x746/rotator22.png
diff --git a/gfx/1096x746/rotator23.png b/gfx/1096x746/rotator23.png
diff --git a/gfx/1096x746/rotator24.png b/gfx/1096x746/rotator24.png
diff --git a/gfx/1096x746/rotator25.png b/gfx/1096x746/rotator25.png
diff --git a/gfx/1096x746/rotator26.png b/gfx/1096x746/rotator26.png
diff --git a/gfx/1096x746/rotator27.png b/gfx/1096x746/rotator27.png
diff --git a/gfx/1096x746/rotator28.png b/gfx/1096x746/rotator28.png
diff --git a/gfx/1096x746/rotator29.png b/gfx/1096x746/rotator29.png
diff --git a/gfx/1096x746/rotator3.png b/gfx/1096x746/rotator3.png
diff --git a/gfx/1096x746/rotator30.png b/gfx/1096x746/rotator30.png
diff --git a/gfx/1096x746/rotator31.png b/gfx/1096x746/rotator31.png
diff --git a/gfx/1096x746/rotator4.png b/gfx/1096x746/rotator4.png
diff --git a/gfx/1096x746/rotator5.png b/gfx/1096x746/rotator5.png
diff --git a/gfx/1096x746/rotator6.png b/gfx/1096x746/rotator6.png
diff --git a/gfx/1096x746/rotator7.png b/gfx/1096x746/rotator7.png
diff --git a/gfx/1096x746/rotator8.png b/gfx/1096x746/rotator8.png
diff --git a/gfx/1096x746/rotator9.png b/gfx/1096x746/rotator9.png
diff --git a/gfx/1096x746/sequencer0.png b/gfx/1096x746/sequencer0.png
diff --git a/gfx/1096x746/teleporter0.png b/gfx/1096x746/teleporter0.png
diff --git a/gfx/1096x746/teleporter1.png b/gfx/1096x746/teleporter1.png
diff --git a/gfx/1096x746/teleporter2.png b/gfx/1096x746/teleporter2.png
diff --git a/gfx/1096x746/timer0.png b/gfx/1096x746/timer0.png
diff --git a/gfx/1096x746/timer1.png b/gfx/1096x746/timer1.png
diff --git a/gfx/1096x746/transformer0.png b/gfx/1096x746/transformer0.png
diff --git a/gfx/1096x746/transformer1.png b/gfx/1096x746/transformer1.png
diff --git a/gfx/1096x746/transformer2.png b/gfx/1096x746/transformer2.png
diff --git a/gfx/1096x746/transformer3.png b/gfx/1096x746/transformer3.png
diff --git a/gfx/1096x746/verttile0.png b/gfx/1096x746/verttile0.png
diff --git a/gfx/1096x746/verttile1.png b/gfx/1096x746/verttile1.png
diff --git a/gfx/1096x746/verttile2.png b/gfx/1096x746/verttile2.png
diff --git a/gfx/1096x746/verttile3.png b/gfx/1096x746/verttile3.png
diff --git a/gfx/1096x746/verttile4.png b/gfx/1096x746/verttile4.png
diff --git a/gfx/1096x746/verttile5.png b/gfx/1096x746/verttile5.png
diff --git a/index.html b/index.html
@@ -24,6 +24,7 @@
 	<script src="js/704x479.js"></script>
 	<script src="js/936x637.js"></script>
 	<script src="js/1024x697.js"></script>
+	<script src="js/1096x746.js"></script>
 	<script src="js/level_full.js"></script>
 
 	<script src="js/util.js"></script>

diff --git a/js/1096x746.js b/js/1096x746.js
@@ -0,0 +1,8 @@
+(function(orbium, undefined) {
+	orbium.dimensions_1096x746 = {
+		"tile_size": 137,
+		"marble_size": 43,
+		"bar_height": 61,
+		"gfx_path": "gfx/1096x746/"
+	};
+})(typeof window == "object" ? window.orbium = window.orbium || {} : orbium);
diff --git a/js/init.js b/js/init.js
@@ -68,15 +68,10 @@
 				avail_height = screen.width;
 			}
 
-			// Special casing for iPhone to handle retina
+			// iPhone1-3: 1x, iPhone4-6: 2x, iPhone6+: 3x
 			if (orbium.Util.isUA("iPhone")) {
-				if (orbium.Util.getDevicePixelRatio() === 2) {
-					avail_width = 960;
-					avail_height = 640;
-				} else {
-					avail_width = 480;
-					avail_height = 320;
-				}
+				avail_width = avail_width * orbium.Util.getDevicePixelRatio();
+				avail_height = avail_height * orbium.Util.getDevicePixelRatio();
 			}
 
 			// Always use 1024x768 on iPad as we dont have graphics large
@@ -85,14 +80,13 @@
 				avail_width = 1024;
 				avail_height = 768;
 			}
-
-			// DEBUG
-			//alert("screen.width: " + screen.width + ", screen.height: " + screen.height);
-			//alert("avail_width: " + avail_width + ", avail_height: " + avail_height);
 		}
 
 		var dimensions = null;
-		if (avail_width >= 1024 && avail_height >= 697 &&
+		if (avail_width >= 1096 && avail_height >= 746 &&
+			orbium.dimensions_1096x746 !== undefined) {
+			dimensions = orbium.dimensions_1096x746;
+		} else if (avail_width >= 1024 && avail_height >= 697 &&
 			orbium.dimensions_1024x697 !== undefined) {
 			dimensions = orbium.dimensions_1024x697;
 		} else if (avail_width >= 936 && avail_height >= 637 &&

diff --git a/orbium.appcache b/orbium.appcache
@@ -1,8 +1,9 @@
 CACHE MANIFEST
-# 2013-02-11:v1
+# 2015-01-17:v1
 
 CACHE:
 css/style.css
+js/1096x746.js
 js/1024x697.js
 js/344x234.js
 js/424x289.js