diff options
| author | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
| commit | 584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch) | |
| tree | c601222ba20cacc80fba7ff43b5de425db13519c /demos/2d | |
| parent | 81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff) | |
| parent | 2b64f73b0459190d20b2f6de39275ee7979317c4 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'demos/2d')
| -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/game_state.gd | 2 | ||||
| -rw-r--r-- | demos/2d/space_shooter/level_tiles.scn | bin | 2148 -> 2168 bytes | |||
| -rw-r--r-- | demos/2d/space_shooter/rail.gd | 1 | ||||
| -rw-r--r-- | demos/2d/space_shooter/shot.gd | 1 | ||||
| -rw-r--r-- | demos/2d/space_shooter/shot.scn | bin | 3990 -> 4079 bytes |
7 files changed, 2 insertions, 16 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/game_state.gd b/demos/2d/space_shooter/game_state.gd index 26ef086f14..f66d0fa8fa 100644 --- a/demos/2d/space_shooter/game_state.gd +++ b/demos/2d/space_shooter/game_state.gd @@ -8,12 +8,12 @@ var max_points = 0 func _ready(): var f = File.new() #load high score + if (f.open("user://highscore",File.READ)==OK): max_points=f.get_var() - func game_over(): if (points>max_points): max_points=points 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/rail.gd b/demos/2d/space_shooter/rail.gd index 803a09fe84..22ebd02670 100644 --- a/demos/2d/space_shooter/rail.gd +++ b/demos/2d/space_shooter/rail.gd @@ -14,7 +14,6 @@ var offset=0 func _process(delta): - offset+=delta*SPEED set_pos(Vector2(offset,0)) 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 |