From 162d2ebe4f1a6da2da62ad45c4cbfb161157d31d Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 14 Apr 2014 22:16:13 -0300 Subject: -Added google play services (needed for some stuff) -Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D --- demos/misc/instancing/ball.scn | Bin 0 -> 1563 bytes demos/misc/instancing/bowling_ball.png | Bin 0 -> 4637 bytes demos/misc/instancing/container.png | Bin 0 -> 15504 bytes demos/misc/instancing/container.scn | Bin 0 -> 2312 bytes demos/misc/instancing/engine.cfg | 8 ++++++++ 5 files changed, 8 insertions(+) create mode 100644 demos/misc/instancing/ball.scn create mode 100644 demos/misc/instancing/bowling_ball.png create mode 100644 demos/misc/instancing/container.png create mode 100644 demos/misc/instancing/container.scn create mode 100644 demos/misc/instancing/engine.cfg (limited to 'demos/misc/instancing') diff --git a/demos/misc/instancing/ball.scn b/demos/misc/instancing/ball.scn new file mode 100644 index 0000000000..81c222a306 Binary files /dev/null and b/demos/misc/instancing/ball.scn differ diff --git a/demos/misc/instancing/bowling_ball.png b/demos/misc/instancing/bowling_ball.png new file mode 100644 index 0000000000..9443cda882 Binary files /dev/null and b/demos/misc/instancing/bowling_ball.png differ diff --git a/demos/misc/instancing/container.png b/demos/misc/instancing/container.png new file mode 100644 index 0000000000..8e1363ae4c Binary files /dev/null and b/demos/misc/instancing/container.png differ diff --git a/demos/misc/instancing/container.scn b/demos/misc/instancing/container.scn new file mode 100644 index 0000000000..9a365ac494 Binary files /dev/null and b/demos/misc/instancing/container.scn differ diff --git a/demos/misc/instancing/engine.cfg b/demos/misc/instancing/engine.cfg new file mode 100644 index 0000000000..52a28a3fce --- /dev/null +++ b/demos/misc/instancing/engine.cfg @@ -0,0 +1,8 @@ +[application] + +name="Scene Instancing Demo" +main_scene="res://container.scn" + +[physics_2d] + +default_gravity=300 -- cgit v1.2.3