summaryrefslogtreecommitdiff
path: root/demos/misc/instancing
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-04-14 22:16:13 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-04-14 22:16:13 -0300
commit162d2ebe4f1a6da2da62ad45c4cbfb161157d31d (patch)
tree571a54b06152ae79cadd5a266f3fdeee8f58c3cd /demos/misc/instancing
parent606b9d960af6ca4517503328b870214b96ff21d3 (diff)
-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
Diffstat (limited to 'demos/misc/instancing')
-rw-r--r--demos/misc/instancing/ball.scnbin0 -> 1563 bytes
-rw-r--r--demos/misc/instancing/bowling_ball.pngbin0 -> 4637 bytes
-rw-r--r--demos/misc/instancing/container.pngbin0 -> 15504 bytes
-rw-r--r--demos/misc/instancing/container.scnbin0 -> 2312 bytes
-rw-r--r--demos/misc/instancing/engine.cfg8
5 files changed, 8 insertions, 0 deletions
diff --git a/demos/misc/instancing/ball.scn b/demos/misc/instancing/ball.scn
new file mode 100644
index 0000000000..81c222a306
--- /dev/null
+++ b/demos/misc/instancing/ball.scn
Binary files differ
diff --git a/demos/misc/instancing/bowling_ball.png b/demos/misc/instancing/bowling_ball.png
new file mode 100644
index 0000000000..9443cda882
--- /dev/null
+++ b/demos/misc/instancing/bowling_ball.png
Binary files differ
diff --git a/demos/misc/instancing/container.png b/demos/misc/instancing/container.png
new file mode 100644
index 0000000000..8e1363ae4c
--- /dev/null
+++ b/demos/misc/instancing/container.png
Binary files differ
diff --git a/demos/misc/instancing/container.scn b/demos/misc/instancing/container.scn
new file mode 100644
index 0000000000..9a365ac494
--- /dev/null
+++ b/demos/misc/instancing/container.scn
Binary files 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