diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
| commit | e0e54ea7d456c0fabd8f3f9b2667a69ff520f852 (patch) | |
| tree | 9ce4e0b6db40ac2ab07b8582e57282fe63130165 /demos | |
| parent | f61eb5fd8e13642c82364f8ee66a0f6c791a4511 (diff) | |
| parent | a67486a39ee629acac068a6d014015944cf83bb3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/2d/fog_of_war/.fscache | 11 | ||||
| -rw-r--r-- | demos/2d/motion/engine.cfg | 3 | ||||
| -rw-r--r-- | demos/2d/space_shooter/level_tiles.scn | bin | 2148 -> 2168 bytes | |||
| -rw-r--r-- | demos/2d/space_shooter/shot.gd | 1 | ||||
| -rw-r--r-- | demos/2d/space_shooter/shot.scn | bin | 3990 -> 4079 bytes |
5 files changed, 1 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 diff --git a/demos/2d/space_shooter/level_tiles.scn b/demos/2d/space_shooter/level_tiles.scn Binary files differindex 3fb91d8cb3..4d1feea70f 100644 --- a/demos/2d/space_shooter/level_tiles.scn +++ b/demos/2d/space_shooter/level_tiles.scn diff --git a/demos/2d/space_shooter/shot.gd b/demos/2d/space_shooter/shot.gd index 813587d670..28b67bd26d 100644 --- a/demos/2d/space_shooter/shot.gd +++ b/demos/2d/space_shooter/shot.gd @@ -45,3 +45,4 @@ func _on_shot_body_enter( body ): #hit the tilemap _hit_something() pass # replace with function body + diff --git a/demos/2d/space_shooter/shot.scn b/demos/2d/space_shooter/shot.scn Binary files differindex 64c8c25ebe..86a20ffa47 100644 --- a/demos/2d/space_shooter/shot.scn +++ b/demos/2d/space_shooter/shot.scn |