diff options
53 files changed, 200 insertions, 6 deletions
diff --git a/demos/2d/hexamap/.fscache b/demos/2d/hexamap/.fscache new file mode 100644 index 0000000000..60aa69b645 --- /dev/null +++ b/demos/2d/hexamap/.fscache @@ -0,0 +1,33 @@ +::res://::1412302385 +WWT-01.png::ImageTexture::1412126473:: +WWT-02.png::ImageTexture::1412126474:: +WWT-03.png::ImageTexture::1412126474:: +WWT-04.png::ImageTexture::1412126474:: +WWT-05.png::ImageTexture::1412126474:: +WWT-06.png::ImageTexture::1412126474:: +WWT-07.png::ImageTexture::1412126474:: +WWT-08.png::ImageTexture::1412126474:: +WWT-09.png::ImageTexture::1412126474:: +WWT-10.png::ImageTexture::1412126474:: +WWT-11.png::ImageTexture::1412126475:: +WWT-12.png::ImageTexture::1412126475:: +WWT-13.png::ImageTexture::1412126475:: +WWT-14.png::ImageTexture::1412126475:: +WWT-15.png::ImageTexture::1412126475:: +WWT-16.png::ImageTexture::1412126475:: +WWT-17.png::ImageTexture::1412126475:: +WWT-18.png::ImageTexture::1412126475:: +WWT-19.png::ImageTexture::1412126476:: +WWT-20.png::ImageTexture::1412126476:: +WWT-21.png::ImageTexture::1412126476:: +WWT-22.png::ImageTexture::1412126476:: +WWT-23.png::ImageTexture::1412126476:: +WWT-24.png::ImageTexture::1412126476:: +WWT-25.png::ImageTexture::1412126476:: +WWT-26.png::ImageTexture::1412126476:: +map.scn::PackedScene::1412127344:: +tiles.scn::PackedScene::1412126994:: +tileset.res::TileSet::1412127001:: +troll.gd::GDScript::1412302377:: +troll.png::ImageTexture::1412302385:: +troll.scn::PackedScene::1412302380:: diff --git a/demos/2d/hexamap/WWT-01.png b/demos/2d/hexamap/WWT-01.png Binary files differnew file mode 100644 index 0000000000..79d75fa4c9 --- /dev/null +++ b/demos/2d/hexamap/WWT-01.png diff --git a/demos/2d/hexamap/WWT-02.png b/demos/2d/hexamap/WWT-02.png Binary files differnew file mode 100644 index 0000000000..7dcd1c8cca --- /dev/null +++ b/demos/2d/hexamap/WWT-02.png diff --git a/demos/2d/hexamap/WWT-03.png b/demos/2d/hexamap/WWT-03.png Binary files differnew file mode 100644 index 0000000000..1e76c9a24d --- /dev/null +++ b/demos/2d/hexamap/WWT-03.png diff --git a/demos/2d/hexamap/WWT-04.png b/demos/2d/hexamap/WWT-04.png Binary files differnew file mode 100644 index 0000000000..84a3b90e71 --- /dev/null +++ b/demos/2d/hexamap/WWT-04.png diff --git a/demos/2d/hexamap/WWT-05.png b/demos/2d/hexamap/WWT-05.png Binary files differnew file mode 100644 index 0000000000..850747dc8d --- /dev/null +++ b/demos/2d/hexamap/WWT-05.png diff --git a/demos/2d/hexamap/WWT-06.png b/demos/2d/hexamap/WWT-06.png Binary files differnew file mode 100644 index 0000000000..52479e2d26 --- /dev/null +++ b/demos/2d/hexamap/WWT-06.png diff --git a/demos/2d/hexamap/WWT-07.png b/demos/2d/hexamap/WWT-07.png Binary files differnew file mode 100644 index 0000000000..87aa8a4102 --- /dev/null +++ b/demos/2d/hexamap/WWT-07.png diff --git a/demos/2d/hexamap/WWT-08.png b/demos/2d/hexamap/WWT-08.png Binary files differnew file mode 100644 index 0000000000..0234cccd56 --- /dev/null +++ b/demos/2d/hexamap/WWT-08.png diff --git a/demos/2d/hexamap/WWT-09.png b/demos/2d/hexamap/WWT-09.png Binary files differnew file mode 100644 index 0000000000..5467eb58c3 --- /dev/null +++ b/demos/2d/hexamap/WWT-09.png diff --git a/demos/2d/hexamap/WWT-10.png b/demos/2d/hexamap/WWT-10.png Binary files differnew file mode 100644 index 0000000000..bb0b5ae1ff --- /dev/null +++ b/demos/2d/hexamap/WWT-10.png diff --git a/demos/2d/hexamap/WWT-11.png b/demos/2d/hexamap/WWT-11.png Binary files differnew file mode 100644 index 0000000000..926ad251b4 --- /dev/null +++ b/demos/2d/hexamap/WWT-11.png diff --git a/demos/2d/hexamap/WWT-12.png b/demos/2d/hexamap/WWT-12.png Binary files differnew file mode 100644 index 0000000000..e6c7d33894 --- /dev/null +++ b/demos/2d/hexamap/WWT-12.png diff --git a/demos/2d/hexamap/WWT-13.png b/demos/2d/hexamap/WWT-13.png Binary files differnew file mode 100644 index 0000000000..f14e42af6e --- /dev/null +++ b/demos/2d/hexamap/WWT-13.png diff --git a/demos/2d/hexamap/WWT-14.png b/demos/2d/hexamap/WWT-14.png Binary files differnew file mode 100644 index 0000000000..826ed49d18 --- /dev/null +++ b/demos/2d/hexamap/WWT-14.png diff --git a/demos/2d/hexamap/WWT-15.png b/demos/2d/hexamap/WWT-15.png Binary files differnew file mode 100644 index 0000000000..c62de67c8e --- /dev/null +++ b/demos/2d/hexamap/WWT-15.png diff --git a/demos/2d/hexamap/WWT-16.png b/demos/2d/hexamap/WWT-16.png Binary files differnew file mode 100644 index 0000000000..2e8c289d97 --- /dev/null +++ b/demos/2d/hexamap/WWT-16.png diff --git a/demos/2d/hexamap/WWT-17.png b/demos/2d/hexamap/WWT-17.png Binary files differnew file mode 100644 index 0000000000..f8c59a4dbe --- /dev/null +++ b/demos/2d/hexamap/WWT-17.png diff --git a/demos/2d/hexamap/WWT-18.png b/demos/2d/hexamap/WWT-18.png Binary files differnew file mode 100644 index 0000000000..05269c843c --- /dev/null +++ b/demos/2d/hexamap/WWT-18.png diff --git a/demos/2d/hexamap/WWT-19.png b/demos/2d/hexamap/WWT-19.png Binary files differnew file mode 100644 index 0000000000..7313ff8871 --- /dev/null +++ b/demos/2d/hexamap/WWT-19.png diff --git a/demos/2d/hexamap/WWT-20.png b/demos/2d/hexamap/WWT-20.png Binary files differnew file mode 100644 index 0000000000..2ec6fe94e2 --- /dev/null +++ b/demos/2d/hexamap/WWT-20.png diff --git a/demos/2d/hexamap/WWT-21.png b/demos/2d/hexamap/WWT-21.png Binary files differnew file mode 100644 index 0000000000..e7a51fa687 --- /dev/null +++ b/demos/2d/hexamap/WWT-21.png diff --git a/demos/2d/hexamap/WWT-22.png b/demos/2d/hexamap/WWT-22.png Binary files differnew file mode 100644 index 0000000000..0e4d7729ed --- /dev/null +++ b/demos/2d/hexamap/WWT-22.png diff --git a/demos/2d/hexamap/WWT-23.png b/demos/2d/hexamap/WWT-23.png Binary files differnew file mode 100644 index 0000000000..ab1cc895e4 --- /dev/null +++ b/demos/2d/hexamap/WWT-23.png diff --git a/demos/2d/hexamap/WWT-24.png b/demos/2d/hexamap/WWT-24.png Binary files differnew file mode 100644 index 0000000000..b0a05671cf --- /dev/null +++ b/demos/2d/hexamap/WWT-24.png diff --git a/demos/2d/hexamap/WWT-25.png b/demos/2d/hexamap/WWT-25.png Binary files differnew file mode 100644 index 0000000000..3d90080259 --- /dev/null +++ b/demos/2d/hexamap/WWT-25.png diff --git a/demos/2d/hexamap/WWT-26.png b/demos/2d/hexamap/WWT-26.png Binary files differnew file mode 100644 index 0000000000..a3baca90a0 --- /dev/null +++ b/demos/2d/hexamap/WWT-26.png diff --git a/demos/2d/hexamap/engine.cfg b/demos/2d/hexamap/engine.cfg new file mode 100644 index 0000000000..4567af7a16 --- /dev/null +++ b/demos/2d/hexamap/engine.cfg @@ -0,0 +1,12 @@ +[application] + +name="Hexagonal Game" +main_scene="res://map.scn" +icon="res://icon.png" + +[input] + +move_up=[key(Up)] +move_left=[key(Left)] +move_right=[key(Right)] +move_bottom=[key(Down)] diff --git a/demos/2d/hexamap/icon.png b/demos/2d/hexamap/icon.png Binary files differnew file mode 100644 index 0000000000..0fcef95111 --- /dev/null +++ b/demos/2d/hexamap/icon.png diff --git a/demos/2d/hexamap/map.scn b/demos/2d/hexamap/map.scn Binary files differnew file mode 100644 index 0000000000..5798aab850 --- /dev/null +++ b/demos/2d/hexamap/map.scn diff --git a/demos/2d/hexamap/tiles.scn b/demos/2d/hexamap/tiles.scn Binary files differnew file mode 100644 index 0000000000..265aedac2b --- /dev/null +++ b/demos/2d/hexamap/tiles.scn diff --git a/demos/2d/hexamap/tileset.res b/demos/2d/hexamap/tileset.res Binary files differnew file mode 100644 index 0000000000..05d89316a2 --- /dev/null +++ b/demos/2d/hexamap/tileset.res diff --git a/demos/2d/hexamap/troll.gd b/demos/2d/hexamap/troll.gd new file mode 100644 index 0000000000..d118d3a2ba --- /dev/null +++ b/demos/2d/hexamap/troll.gd @@ -0,0 +1,43 @@ + +extends KinematicBody2D + +# This is a simple collision demo showing how +# the kinematic cotroller works. +# move() will allow to move the node, and will +# always move it to a non-colliding spot, +# as long as it starts from a non-colliding spot too. + + +#pixels / second +const MOTION_SPEED=160 + +func _fixed_process(delta): + + var motion = Vector2() + + if (Input.is_action_pressed("move_up")): + motion+=Vector2(0,-1) + if (Input.is_action_pressed("move_bottom")): + motion+=Vector2(0,1) + if (Input.is_action_pressed("move_left")): + motion+=Vector2(-1,0) + if (Input.is_action_pressed("move_right")): + motion+=Vector2(1,0) + + motion = motion.normalized() * MOTION_SPEED * delta + motion = move(motion) + + #make character slide nicely through the world + var slide_attempts = 4 + while(is_colliding() and slide_attempts>0): + motion = get_collision_normal().slide(motion) + motion=move(motion) + slide_attempts-=1 + + +func _ready(): + # Initalization here + set_fixed_process(true) + pass + + diff --git a/demos/2d/hexamap/troll.png b/demos/2d/hexamap/troll.png Binary files differnew file mode 100644 index 0000000000..69f195d034 --- /dev/null +++ b/demos/2d/hexamap/troll.png diff --git a/demos/2d/hexamap/troll.scn b/demos/2d/hexamap/troll.scn Binary files differnew file mode 100644 index 0000000000..f5d87c3631 --- /dev/null +++ b/demos/2d/hexamap/troll.scn diff --git a/demos/2d/isometric/bastiles.res b/demos/2d/isometric/bastiles.res Binary files differnew file mode 100644 index 0000000000..2161c88f1e --- /dev/null +++ b/demos/2d/isometric/bastiles.res diff --git a/demos/2d/isometric/dungeon.scn b/demos/2d/isometric/dungeon.scn Binary files differnew file mode 100644 index 0000000000..76532a44aa --- /dev/null +++ b/demos/2d/isometric/dungeon.scn diff --git a/demos/2d/isometric/engine.cfg b/demos/2d/isometric/engine.cfg new file mode 100644 index 0000000000..48f39826f9 --- /dev/null +++ b/demos/2d/isometric/engine.cfg @@ -0,0 +1,21 @@ +[application] + +name="Isometric Game" +main_scene="res://dungeon.scn" +icon="res://icon.png" + +[image_loader] + +filter=false +gen_mipmaps=false + +[input] + +move_up=[key(Up)] +move_left=[key(Left)] +move_right=[key(Right)] +move_bottom=[key(Down)] + +[rasterizer] + +use_pixel_snap=true diff --git a/demos/2d/isometric/icon.png b/demos/2d/isometric/icon.png Binary files differnew file mode 100644 index 0000000000..c8fb5dcb42 --- /dev/null +++ b/demos/2d/isometric/icon.png diff --git a/demos/2d/isometric/isotiles.png b/demos/2d/isometric/isotiles.png Binary files differnew file mode 100644 index 0000000000..aa5a800f8f --- /dev/null +++ b/demos/2d/isometric/isotiles.png diff --git a/demos/2d/isometric/tileset.scn b/demos/2d/isometric/tileset.scn Binary files differnew file mode 100644 index 0000000000..edb0bc0276 --- /dev/null +++ b/demos/2d/isometric/tileset.scn diff --git a/demos/2d/isometric/troll.gd b/demos/2d/isometric/troll.gd new file mode 100644 index 0000000000..d118d3a2ba --- /dev/null +++ b/demos/2d/isometric/troll.gd @@ -0,0 +1,43 @@ + +extends KinematicBody2D + +# This is a simple collision demo showing how +# the kinematic cotroller works. +# move() will allow to move the node, and will +# always move it to a non-colliding spot, +# as long as it starts from a non-colliding spot too. + + +#pixels / second +const MOTION_SPEED=160 + +func _fixed_process(delta): + + var motion = Vector2() + + if (Input.is_action_pressed("move_up")): + motion+=Vector2(0,-1) + if (Input.is_action_pressed("move_bottom")): + motion+=Vector2(0,1) + if (Input.is_action_pressed("move_left")): + motion+=Vector2(-1,0) + if (Input.is_action_pressed("move_right")): + motion+=Vector2(1,0) + + motion = motion.normalized() * MOTION_SPEED * delta + motion = move(motion) + + #make character slide nicely through the world + var slide_attempts = 4 + while(is_colliding() and slide_attempts>0): + motion = get_collision_normal().slide(motion) + motion=move(motion) + slide_attempts-=1 + + +func _ready(): + # Initalization here + set_fixed_process(true) + pass + + diff --git a/demos/2d/isometric/troll.png b/demos/2d/isometric/troll.png Binary files differnew file mode 100644 index 0000000000..69f195d034 --- /dev/null +++ b/demos/2d/isometric/troll.png diff --git a/demos/2d/isometric/troll.scn b/demos/2d/isometric/troll.scn Binary files differnew file mode 100644 index 0000000000..f5d87c3631 --- /dev/null +++ b/demos/2d/isometric/troll.scn diff --git a/demos/3d/platformer/texture.tex b/demos/3d/platformer/texture.tex Binary files differindex 24c4607ab1..d9181b7ffa 100644 --- a/demos/3d/platformer/texture.tex +++ b/demos/3d/platformer/texture.tex diff --git a/demos/3d/truck_town/car_select.gd b/demos/3d/truck_town/car_select.gd new file mode 100644 index 0000000000..00b4d853b8 --- /dev/null +++ b/demos/3d/truck_town/car_select.gd @@ -0,0 +1,42 @@ + +extends Control + +# member variables here, example: +# var a=2 +# var b="textvar" + +func _ready(): + # Initalization here + pass + +var town=null + + +func _back(): + + town.queue_free() + show() + + +func _load_scene(car): + + var tt = load(car).instance() + tt.set_name("car") + town = load("res://truck_scene.scn").instance() + town.get_node("instance_pos").add_child(tt) + town.get_node("back").connect("pressed",self,"_back") + get_parent().add_child(town) + hide() + +func _on_van_1_pressed(): + + _load_scene("res://car_base.scn") + + +func _on_van_2_pressed(): + + _load_scene("res://trailer_truck.scn") + + +func _on_van_3_pressed(): + _load_scene("res://crane.scn") diff --git a/demos/3d/truck_town/car_select.scn b/demos/3d/truck_town/car_select.scn Binary files differnew file mode 100644 index 0000000000..024adf1423 --- /dev/null +++ b/demos/3d/truck_town/car_select.scn diff --git a/demos/3d/truck_town/choose_tow.png b/demos/3d/truck_town/choose_tow.png Binary files differnew file mode 100644 index 0000000000..8f92833450 --- /dev/null +++ b/demos/3d/truck_town/choose_tow.png diff --git a/demos/3d/truck_town/choose_trailer.png b/demos/3d/truck_town/choose_trailer.png Binary files differnew file mode 100644 index 0000000000..ead3330296 --- /dev/null +++ b/demos/3d/truck_town/choose_trailer.png diff --git a/demos/3d/truck_town/choose_van.png b/demos/3d/truck_town/choose_van.png Binary files differnew file mode 100644 index 0000000000..1ecdd54372 --- /dev/null +++ b/demos/3d/truck_town/choose_van.png diff --git a/demos/3d/truck_town/engine.cfg b/demos/3d/truck_town/engine.cfg index 8703a251d1..f47c0de4fa 100644 --- a/demos/3d/truck_town/engine.cfg +++ b/demos/3d/truck_town/engine.cfg @@ -1,6 +1,11 @@ [application] -main_scene="res://truck_scene.scn" +main_scene="res://car_select.scn" + +[display] + +width=1280 +height=720 [rasterizer] diff --git a/demos/3d/truck_town/truck_scene.scn b/demos/3d/truck_town/truck_scene.scn Binary files differindex 8db74a2f7f..a02ce259c1 100644 --- a/demos/3d/truck_town/truck_scene.scn +++ b/demos/3d/truck_town/truck_scene.scn diff --git a/demos/misc/autoload/global.gd b/demos/misc/autoload/global.gd index dca661a31a..d9fa308a2f 100644 --- a/demos/misc/autoload/global.gd +++ b/demos/misc/autoload/global.gd @@ -9,11 +9,6 @@ func goto_scene(scene): var s = ResourceLoader.load(scene) #queue erasing old (don't use free because that scene is calling this method) current_scene.queue_free() - # Remove the scene before loading the previous one. - # The node is removed when deleted anyway, but this will fix issues that - # might arise if both have a root node with the same name, - # as adding both together will cause the second to be renamed. (not usually a problem, but you might be wanting to look for the node later and not find it) - get_scene().get_root().remove(current_scene) #instance the new scene current_scene = s.instance() #add it to the active scene, as child of root |
