Skip to content

Commit

Permalink
final fixes version 0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
urs-of-the-backwoods committed Mar 25, 2016
1 parent ebdeef9 commit ddc4fa6
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 3 deletions.
70 changes: 70 additions & 0 deletions 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 = "*"

4 changes: 2 additions & 2 deletions dodo.py
Expand Up @@ -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
Expand Down Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion library/HGamer3D/Data/Geometry2D.hs
Expand Up @@ -10,7 +10,7 @@
file: HGamer3D/Data/Geometry2D.hs
-}

{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FlexibleInstances, DatatypeContexts #-}

-- | Type definitions for 2D geometry
module HGamer3D.Data.Geometry2D
Expand Down

0 comments on commit ddc4fa6

Please sign in to comment.