Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools/simulator/libsimulator/lib/runtime
History
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
..
ConfigParser.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
ConfigParser.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
ConnectWaitLayer.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
ConnectWaitLayer.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
ConsoleCommand.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
ConsoleCommand.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
FileServer.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
FileServer.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
Landscape_png.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
PlayDisable_png.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
PlayEnable_png.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
Portrait_png.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
Protos.pb.cc move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
Protos.pb.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
ResData.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
Runtime.cpp Merge branch 'v3' into combine 2015-01-12 17:54:58 +08:00
Runtime.h Add setEventTrackingEnable for event tracking 2015-01-12 15:18:30 +08:00
RuntimeCCSImpl.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
RuntimeCCSImpl.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
RuntimeLuaImpl.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
RuntimeLuaImpl.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
RuntimeProtocol.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
RuntimeProtocol.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
Shine_png.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
VisibleRect.cpp move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
VisibleRect.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
lua_debugger.c move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
lua_debugger.h move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00