yinjimmy
|
532be9fb20
|
Fix compile error on windows
|
2015-01-13 19:22:11 +08:00 |
yinjimmy
|
cf331c3abd
|
update lua-template-default
|
2015-01-12 23:42:37 +08:00 |
yinjimmy
|
e700d47dbd
|
Fix compile error on Windows
|
2015-01-12 20:55:36 +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 |
yinjimmy
|
e309dd69b1
|
add missing files
|
2015-01-09 11:33:24 +08:00 |
yinjimmy
|
d2a3a6a8c0
|
merge lua-template-default with lua-template-runtime
|
2015-01-09 04:08:41 +08:00 |
yinjimmy
|
650b398419
|
move files
|
2015-01-08 21:12:44 +08:00 |
yinjimmy
|
82f37fcf72
|
add libsimulator
|
2015-01-08 14:10:28 +08:00 |
yinjimmy
|
dee536def2
|
support win32
|
2015-01-08 13:36:59 +08:00 |
yinjimmy
|
f1f4e5f3c2
|
support android
|
2015-01-07 22:19:46 +08:00 |
yinjimmy
|
4fee8a5926
|
support iOS
|
2015-01-07 22:18:27 +08:00 |
yinjimmy
|
9122e15f2c
|
move simulator
|
2015-01-07 17:50:15 +08:00 |