Commit Graph

15 Commits

Author SHA1 Message Date
yinjimmy b1e40a98b0 fix simulator compile error 2015-06-03 22:58:25 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
WenhaiLin 158181d4eb Console:Fixed crash 2015-05-21 18:14:21 +08:00
WenhaiLin 80367e978d Console:Fixed crash 2015-05-19 18:33:06 +08:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
yinjimmy 1e32322350 revert runtime files 2015-04-17 18:26:47 +08:00
yinjimmy 587ee21e4b revert lua runtime 2015-04-02 18:27:53 +08:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
yusheng.lu 7fde1d0e0d When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works. 2015-01-19 18:10:30 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
yinjimmy 43c4f563d8 enable debug for iOS / Android platform 2015-01-12 22:59:46 +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 53cc07a2f6 Add setEventTrackingEnable for event tracking 2015-01-12 15:18:30 +08:00
yinjimmy dea3cf9863 move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00