diff --git a/component/MediaPack1 b/component/MediaPack1 new file mode 100644 index 0000000..08b2a6f --- /dev/null +++ b/component/MediaPack1 @@ -0,0 +1,70 @@ +# arriccio.toml file for HGamer3D - Media Pack 1 + +Id = "http://www.hgamer3d.org/component/MediaPack1" +Purpose = "HGamer3D The First Media Pack" +Description = """ + This is the first media pack for HGamer3D, also used in the examples. +""" + +License = "Creative Commons" +FullLicenseText = """ +Texture files in folder "Data/Textures" +--------------------------------------- + +pattern_*_.tga files - free texture packs from Nobiax at deviantart - http://nobiax.deviantart.com +license: CC0 1.0 Universal (CC0 1.0), public domain dedication + +Pattern 01 - http://www.deviantart.com/art/Free-3D-Textures-Pack-01-153806426 +Pattern 03 - http://www.deviantart.com/art/Free-3D-Textures-Pack-01-153806426 +Pattern 04 - http://www.deviantart.com/art/Free-3D-Textures-Pack-01-153806426 + +Pattern 13 - http://www.deviantart.com/art/Free-3D-textures-pack-03-156623646 +Pattern 14 - http://www.deviantart.com/art/Free-3D-textures-pack-03-156623646 +Pattern 15 - http://www.deviantart.com/art/Free-3D-textures-pack-03-156623646 + +Pattern 29 - http://www.deviantart.com/art/Free-3D-textures-pack-05-186206685 +Pattern 30 - http://www.deviantart.com/art/Free-3D-textures-pack-05-186206685 + +Pattern 42 - http://www.deviantart.com/art/Free-3D-textures-pack-08-199719161 +Pattern 43 - http://www.deviantart.com/art/Free-3D-textures-pack-08-199719161 +Pattern 44 - http://www.deviantart.com/art/Free-3D-textures-pack-08-199719161 +Pattern 45 - http://www.deviantart.com/art/Free-3D-textures-pack-08-199719161 +Pattern 46 - http://www.deviantart.com/art/Free-3D-textures-pack-08-199719161 + +Pattern 100 - http://www.deviantart.com/art/Free-3D-textures-pack-19-265366793 +Pattern 102 - http://www.deviantart.com/art/Free-3D-textures-pack-19-265366793 + +Pattern 124 - http://www.deviantart.com/art/Free-3D-textures-pack-25-289115039 +Pattern 125 - http://www.deviantart.com/art/Free-3D-textures-pack-25-289115039 +Pattern 126 - http://www.deviantart.com/art/Free-3D-textures-pack-25-289115039 +Pattern 127 - http://www.deviantart.com/art/Free-3D-textures-pack-25-289115039 + +Pattern 270 - http://nobiax.deviantart.com/art/Free-textures-pack-54-428924249 +Pattern 271 - http://nobiax.deviantart.com/art/Free-textures-pack-54-428924249 +Pattern 272 - http://nobiax.deviantart.com/art/Free-textures-pack-54-428924249 +Pattern 273 - http://nobiax.deviantart.com/art/Free-textures-pack-54-428924249 + +Sound files in folder "Data/Sounds" +----------------------------------- + +RMN Music Pack: +RMN Music Pack: http://rpgmaker.net/musicpack/ +Artists: Jasprelao, Jeremiah "McTricky" George, Jude, Gamesfreak13563, Tarranon, Cornflake, Xcalnarok, Lana42, Kunsel, Subaru, NathanGDay, Snowy Fox, ReclaimedGlory, Apoc, hyde9318 and 800 M.P.H. +license Creative Commons - Attribution-NonCommercial-3.0 (http://creativecommons.org/licenses/by-nc/3.0) + +Inventory Sound Effects: +http://opengameart.org/content/inventory-sound-effects +license: http://creativecommons.org/licenses/by/3.0/ +""" + +signingkey = "https://www.github.com/urs-of-the-backwoods.keys" + +# wildcard architecture, os +# data can be used for all architectures +[[Impls]] + location = "http://www.hgamer3d.org/downloads/media-pack1-{version}.tar.gz" + signingkey = "https://www.github.com/urs-of-the-backwoods.keys" + version = "{version}" + architecture = "*" + os = "*" + diff --git a/dodo.py b/dodo.py index 6e99450..5614fa6 100644 --- a/dodo.py +++ b/dodo.py @@ -17,7 +17,7 @@ version_media = "1.5.0" version_engine = "1.5.0" version_media_pack1 = "1.0.0" -version_hgamer3d = "0.7.0" +version_hgamer3d = "0.7.1" version_intonaco = "0.1.0" # where is Urho3D located @@ -144,7 +144,7 @@ def task_engine(): 'name' : 'build-dir', 'actions' : [ (make_dir, [targetdir]), - 'cp -r ../Urho3D-Build/lib/libUrho3D.so ' + targetdir, + 'cp -r ../Urho3D-Build/lib/libUrho3D.so* ' + targetdir, ], 'uptodate' : [run_once], 'targets' : ['build-engine'] diff --git a/library/HGamer3D/Data/Geometry2D.hs b/library/HGamer3D/Data/Geometry2D.hs index ed5e4fc..8a84007 100644 --- a/library/HGamer3D/Data/Geometry2D.hs +++ b/library/HGamer3D/Data/Geometry2D.hs @@ -10,7 +10,7 @@ file: HGamer3D/Data/Geometry2D.hs -} -{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE FlexibleInstances, DatatypeContexts #-} -- | Type definitions for 2D geometry module HGamer3D.Data.Geometry2D