Merge branch 'release/2.0.2'

v97ug · Apr 3, 2017 · 6c96211 · 6c96211
2 parents 875dcf3 + a2c72ed
commit 6c96211
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 281 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,11 @@ Haskell, free-gameで、4目並べを作りました。
 2. 展開したフォルダの中の、 connect-four-exeをダブルクリックすると、ゲームが始まります。
 
 
-## スクリーンショット
+# スクリーンショット
 
 ![screenshot](screenshot.png)
 
-![screenshot2](screenshot2.png)
+![screenshot2](screenshot2.png)
+
+# 使用した素材
+[JKゴシックM](http://font.cutegirl.jp/jk-font-medium.html#more-460)
diff --git a/app/Main.hs b/app/Main.hs
@@ -59,5 +59,5 @@ main = do
   runGame Windowed (Box (V2 0 0) (V2 800 800)) $ do
     setTitle "くろーばーならべ"
     clearColor white
-    font <- loadFont "asset/font/jk-go-m-1/JKG-M_3.ttf"
+    font <- loadFont "asset/font/JKG-M_3.ttf"
     update font gen Opening
diff --git a/asset/font/jk-go-m-1/JKG-M_3.ttf → asset/font/JKG-M_3.ttf b/asset/font/jk-go-m-1/JKG-M_3.ttf → asset/font/JKG-M_3.ttf
diff --git a/asset/font/NekokaburiFont/FontReadme.html b/asset/font/NekokaburiFont/FontReadme.html
diff --git a/asset/font/NekokaburiFont/nekokaburi.otf b/asset/font/NekokaburiFont/nekokaburi.otf
diff --git a/asset/font/VL-PGothic-Regular.ttf b/asset/font/VL-PGothic-Regular.ttf
diff --git a/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/LICENSE_E b/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/LICENSE_E
diff --git a/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/LICENSE_J b/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/LICENSE_J
diff --git a/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/README_E b/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/README_E
diff --git a/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/README_J b/asset/font/jk-go-m-1/mplus-TESTFLIGHT-059/README_J
diff --git a/asset/font/jk-go-m-1/readme.txt b/asset/font/jk-go-m-1/readme.txt
diff --git a/release/connect-four.zip b/release/connect-four.zip
diff --git a/release/release.sh b/release/release.sh
@@ -2,5 +2,7 @@
 
 cp ../.stack-work/dist/x86_64-linux/Cabal-1.24.0.0/build/connect-four-exe/connect-four-exe .
 cp -r ../asset/ .
-zip -r connect-four.zip asset/ connect-four-exe
-rm -r asset/ connect-four-exe
+cp ../README.md .
+readonly FILES="asset/ connect-four-exe README.md"
+zip -r connect-four.zip $FILES
+rm -r $FILES