From 5a0de04eb739606a49ba828634c051c0e7552291 Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Sat, 13 Jun 2015 14:43:12 +0300 Subject: Resolved a merge conflict. --- demos/2d/motion/engine.cfg | 3 --- 1 file changed, 3 deletions(-) (limited to 'demos') 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 -- cgit v1.2.3 From 852bf95c0c531ec1b0821dbfdb1c6f4744b8324d Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Sat, 13 Jun 2015 14:47:22 +0300 Subject: Delete .fscache from fog_of_war demo, closes #2079. --- demos/2d/fog_of_war/.fscache | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 demos/2d/fog_of_war/.fscache (limited to 'demos') 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:: -- cgit v1.2.3 From e9bbb97acccc08ae03fde41e4cc6d2dc6722021a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 22 Jun 2015 00:03:19 -0300 Subject: Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene --- demos/2d/space_shooter/level_tiles.scn | Bin 2148 -> 2168 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'demos') diff --git a/demos/2d/space_shooter/level_tiles.scn b/demos/2d/space_shooter/level_tiles.scn index 3fb91d8cb3..4d1feea70f 100644 Binary files a/demos/2d/space_shooter/level_tiles.scn and b/demos/2d/space_shooter/level_tiles.scn differ -- cgit v1.2.3 From 48f1d02da4795ba9d485fe5fe2bea907be2fc467 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 24 Jun 2015 13:29:23 -0300 Subject: added ability to define signals in script closes #2175 --- demos/2d/space_shooter/shot.gd | 1 + demos/2d/space_shooter/shot.scn | Bin 3990 -> 4079 bytes 2 files changed, 1 insertion(+) (limited to 'demos') 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 index 64c8c25ebe..86a20ffa47 100644 Binary files a/demos/2d/space_shooter/shot.scn and b/demos/2d/space_shooter/shot.scn differ -- cgit v1.2.3