diff options
| author | Juan Linietsky <red@kyoko> | 2015-05-11 15:49:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <red@kyoko> | 2015-05-11 15:49:41 -0300 |
| commit | 4b8745ad63409cf14b02735981ee35d2f794421c (patch) | |
| tree | 607dcfbb77430e8ed7eef25de6b7bec9c4032aec /demos/2d/isometric_light | |
| parent | dda60296d81edaabfdb56f47a2c949b5dad283fb (diff) | |
| parent | b777bf5ff5c3891daa0f93987ca12d0d7d053c2b (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'demos/2d/isometric_light')
| -rw-r--r-- | demos/2d/isometric_light/cubio.scn | bin | 7003 -> 7006 bytes | |||
| -rw-r--r-- | demos/2d/isometric_light/engine.cfg | 1 | ||||
| -rw-r--r-- | demos/2d/isometric_light/map.scn | bin | 8634 -> 8661 bytes | |||
| -rw-r--r-- | demos/2d/isometric_light/tileset.res | bin | 2781 -> 2779 bytes |
4 files changed, 1 insertions, 0 deletions
diff --git a/demos/2d/isometric_light/cubio.scn b/demos/2d/isometric_light/cubio.scn Binary files differindex c52b7dfd4b..fc931b0c8d 100644 --- a/demos/2d/isometric_light/cubio.scn +++ b/demos/2d/isometric_light/cubio.scn diff --git a/demos/2d/isometric_light/engine.cfg b/demos/2d/isometric_light/engine.cfg index 0d9e432d5d..08393f1724 100644 --- a/demos/2d/isometric_light/engine.cfg +++ b/demos/2d/isometric_light/engine.cfg @@ -1,5 +1,6 @@ [application] +name="Isometric 2D + Lighting" main_scene="res://map.scn" [input] diff --git a/demos/2d/isometric_light/map.scn b/demos/2d/isometric_light/map.scn Binary files differindex c1d11f8e4c..89002f991f 100644 --- a/demos/2d/isometric_light/map.scn +++ b/demos/2d/isometric_light/map.scn diff --git a/demos/2d/isometric_light/tileset.res b/demos/2d/isometric_light/tileset.res Binary files differindex dab6f36f57..f64a4e32bd 100644 --- a/demos/2d/isometric_light/tileset.res +++ b/demos/2d/isometric_light/tileset.res |