9 Commits

Author	SHA1	Message	Date
Vincent Yang	e4a8aeee45	Fixed #12962 : Scene can't have std::vector member.	2015-07-24 11:16:45 +08:00
Bin Zhang	bb77101f0b	Solve the error when building simulator for android.	2015-06-30 16:45:13 +08:00
Bin Zhang	9b45a9ee6f	Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator.	2015-06-30 16:14:25 +08:00
yinjimmy	5cfa5ad8b8	add simulator	2015-05-14 14:11:40 +08:00
SunLightJuly	03f99b38d0	removed proj.android of simulator	2015-03-10 02:21:32 +08:00
yinjimmy	0978a88b7f	Merge branch 'v3' into combine ... Conflicts: templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj	2015-01-12 17:54:58 +08:00
yinjimmy	d2a3a6a8c0	merge lua-template-default with lua-template-runtime	2015-01-09 04:08:41 +08:00
yinjimmy	f1f4e5f3c2	support android	2015-01-07 22:19:46 +08:00
yinjimmy	9122e15f2c	move simulator	2015-01-07 17:50:15 +08:00