diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-22 23:56:38 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-22 23:56:38 -0300 |
| commit | db43b9bcf0bf4ccc4867198528fbe9b6f0d18ea6 (patch) | |
| tree | c316269eaa56bba723a00363c1095686d70a23f7 | |
| parent | 68443a649de93790190e02c59b17f973d3e42e7d (diff) | |
| parent | 852bf95c0c531ec1b0821dbfdb1c6f4744b8324d (diff) | |
Merge pull request #2080 from bojidar-bg/patch-1
Fix to #2079
| -rw-r--r-- | demos/2d/fog_of_war/.fscache | 11 | ||||
| -rw-r--r-- | demos/2d/motion/engine.cfg | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/demos/2d/fog_of_war/.fscache b/demos/2d/fog_of_war/.fscache deleted file mode 100644 index ba5e3995f3..0000000000 --- a/demos/2d/fog_of_war/.fscache +++ /dev/null @@ -1,11 +0,0 @@ -::res://::1422910453 -floor.png::ImageTexture::1422910453:: -fog.gd::GDScript::1422910025:: -fog.png::ImageTexture::1422908128:: -fog.scn::PackedScene::1422909435:: -fog.xml::TileSet::1422909324:: -icon.png::ImageTexture::1422811193:: -tile_edit.scn::PackedScene::1422909313:: -troll.gd::GDScript::1422909940:: -troll.png::ImageTexture::1418669358:: -troll.scn::PackedScene::1418669358:: diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg index 29c4d0da20..261111904c 100644 --- a/demos/2d/motion/engine.cfg +++ b/demos/2d/motion/engine.cfg @@ -3,12 +3,9 @@ name="Motion Test" main_scene="res://motion.scn" -<<<<<<< HEAD -======= [display] width=800 height=600 stretch_mode="2d" stretch_aspect="keep" ->>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254 |