diff --git a/Makefile b/Makefile index c284807..1476e3d 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ ios: mv conf.lua conf.default.lua mv conf.mobile.lua conf.lua - zip -r dist/supersphere2-ios.love assets vendor *.lua + zip -r dist/supersphere2-ios.love mechanics assets vendor *.lua mv conf.lua conf.mobile.lua mv conf.default.lua conf.lua diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json index b8d0931..42de131 100644 --- a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json +++ b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json @@ -1,13 +1,15 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-61.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-60@2x-1.png", "scale" : "3x" }, { @@ -43,13 +45,13 @@ { "size" : "57x57", "idiom" : "iphone", - "filename" : "Icon-57.png", + "filename" : "Icon-60@2x-2.png", "scale" : "1x" }, { "size" : "57x57", "idiom" : "iphone", - "filename" : "Icon-57@2x.png", + "filename" : "Icon-60@2x-3.png", "scale" : "2x" }, { @@ -137,12 +139,13 @@ { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "hmm.png", + "filename" : "Icon-83.5@2x-1.png", "scale" : "2x" }, { - "idiom" : "ios-marketing", "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "iTunesArtwork.png", "scale" : "1x" } ], diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-57.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-57.png deleted file mode 100644 index 007dc19..0000000 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-57.png and /dev/null differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-57@2x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-57@2x.png deleted file mode 100644 index 474ed31..0000000 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-57@2x.png and /dev/null differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-1.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-1.png new file mode 100644 index 0000000..3c0a24a Binary files /dev/null and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-1.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-2.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-2.png new file mode 100644 index 0000000..3c0a24a Binary files /dev/null and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-2.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-3.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-3.png new file mode 100644 index 0000000..3c0a24a Binary files /dev/null and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x-3.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x.png index 3cebd42..3c0a24a 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@2x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@3x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@3x.png index 82ef423..4fe772d 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@3x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-60@3x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-61.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-61.png new file mode 100644 index 0000000..13ec667 Binary files /dev/null and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-61.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72.png index f38150c..29e49da 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72@2x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72@2x.png index 9f7e937..311cf27 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72@2x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-72@2x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76.png index f16c525..b93c781 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76@2x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76@2x.png index 4c0c5d7..8f68200 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76@2x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-76@2x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-83.5@2x-1.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-83.5@2x-1.png new file mode 100644 index 0000000..9e66d5c Binary files /dev/null and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-83.5@2x-1.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40.png index 2db5ac2..160fc7d 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x-1.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x-1.png index 840b9c0..9300249 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x-1.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x-1.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x.png index 840b9c0..9300249 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@2x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@3x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@3x.png index 3cebd42..3c0a24a 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@3x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-40@3x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50.png index 8f9bd6e..8b748eb 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50@2x.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50@2x.png index 60344de..11883ff 100644 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50@2x.png and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Icon-Small-50@2x.png differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/hmm.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/hmm.png deleted file mode 100644 index 87ac747..0000000 Binary files a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/hmm.png and /dev/null differ diff --git a/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/iTunesArtwork.png b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/iTunesArtwork.png new file mode 100644 index 0000000..b6a5e8c Binary files /dev/null and b/dist/ios/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/iTunesArtwork.png differ diff --git a/dist/ios/platform/xcode/Super Sphere II.xcodeproj/project.xcworkspace/xcuserdata/kennethreitz.xcuserdatad/UserInterfaceState.xcuserstate b/dist/ios/platform/xcode/Super Sphere II.xcodeproj/project.xcworkspace/xcuserdata/kennethreitz.xcuserdatad/UserInterfaceState.xcuserstate index 30b98dd..6f7b30b 100644 Binary files a/dist/ios/platform/xcode/Super Sphere II.xcodeproj/project.xcworkspace/xcuserdata/kennethreitz.xcuserdatad/UserInterfaceState.xcuserstate and b/dist/ios/platform/xcode/Super Sphere II.xcodeproj/project.xcworkspace/xcuserdata/kennethreitz.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/dist/ios/platform/xcode/supersphere2-ios.love b/dist/ios/platform/xcode/supersphere2-ios.love deleted file mode 100644 index 2ad2318..0000000 Binary files a/dist/ios/platform/xcode/supersphere2-ios.love and /dev/null differ diff --git a/mechanics/game.lua b/mechanics/game.lua index 59d67ff..8b335ff 100644 --- a/mechanics/game.lua +++ b/mechanics/game.lua @@ -3,10 +3,10 @@ Signal = require('vendor/hump.signal') Class = require('vendor/middleclass') lue = require('vendor/lue') -Breath = require('mechanics/Breath') -Obstacle = require('mechanics/Obstacle') -Jump = require('mechanics/Jump') -Guy = require('mechanics/Guy') +Breath = require('mechanics/breath') +Obstacle = require('mechanics/obstacle') +Jump = require('mechanics/jump') +Guy = require('mechanics/guy') BreathTimer = Timer.new() GameTimer = Timer.new() diff --git a/mechanics/obstacle.lua b/mechanics/obstacle.lua index 042240e..1d9c88a 100644 --- a/mechanics/obstacle.lua +++ b/mechanics/obstacle.lua @@ -1,4 +1,4 @@ -Breath = require('mechanics/Breath') +Breath = require('mechanics/breath') local POISON_RATE = 80