Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,200 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

351 Commits

Author SHA1 Message Date
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +08:00
Bin Zhang 94e2e1cb00 Modify the configuration for android studio support in console. 2015-05-21 18:27:30 +08:00
Jimmy Yin 8c4cd7ea42 Modify default console and upload port for lua runtime 2015-04-21 23:07:19 +08:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
SunLightJuly 18914a764e removed template of runtime 2015-03-10 01:00:23 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
yinjimmy bd3c250a6d add proj.linux support 2015-01-14 14:44:48 +08:00
yinjimmy 54443a7a9b add missing runtime/config.json 2015-01-13 18:41:05 +08:00
yinjimmy c3a536bcf0 add lua-template-runtime 2015-01-13 18:28:33 +08:00
yinjimmy d1205ceeea remove lua-template-runtime folder 2015-01-12 17:55:41 +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 f98ff24e97 Support `isLandscape` field in config.json 2015-01-09 14:39:45 +08:00
yinjimmy 2f3270fa0b Fix: can not load Lua project with command `cocos run -p mac -m release` 2015-01-09 12:32:54 +08:00
dualface c041787f01 update proj.android for template 2015-01-09 04:14:31 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
dualface 7046f508da update proj.win32 for templates 2015-01-09 03:10:54 +08:00
dualface 156e9eb4f2 update templates 2015-01-06 08:31:43 +08:00
dualface efada94e18 update proj.ios_mac 2015-01-05 17:56:34 +08:00
yinjimmy d4681c1150 update google analytics tid 2015-01-05 12:15:52 +08:00
yinjimmy fb5bd01ac1 fix: compile error on win32 with release model 2014-12-31 20:00:51 +08:00
dualface df82dfc873 update config.json 2014-12-31 18:49:02 +08:00
dualface 3077e294b7 update runtime version 2014-12-31 18:39:51 +08:00
dualface b0199dfa61 fix lua_debugger.c 2014-12-31 17:46:48 +08:00
huangshiwu 7702c102a2 iOS runtime template add security.framework 2014-12-31 15:15:01 +08:00
yinjimmy 2652a67040 cleanup 2014-12-30 16:02:05 +08:00
yinjimmy d986c974d7 compatible code 2014-12-30 16:01:47 +08:00
yinjimmy 4c57a29455 fix: init config on all platform & stop runtime when exit 2014-12-30 15:59:52 +08:00
dualface 40acc98f14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates 2014-12-29 10:58:42 +08:00
dualface 0acdd4f4a3 cleanup lua-template-runtime 2014-12-29 10:55:05 +08:00
yinjimmy e75d283455 1. do not setFrameSize when resetDesignResolution 
2. read config.json when ConfigParser init
 2014-12-29 09:16:07 +08:00
dualface a4d17998d3 update lua-template-runtime 2014-12-29 05:55:56 +08:00
yinjimmy 4280ffcf58 add new lua runtime 2014-12-27 02:21:55 +08:00
Igor Mozharovsky d0c223c3e0 Rewrite using already existing director's variable 2014-12-24 19:21:32 +02:00
honghui 3c3b190be8 update runtime version 2014-12-12 15:47:12 +08:00
honghui ab162a01f4 runtime's setSearchPaths failed 2014-12-11 22:16:39 +08:00
honghui 61e13bf2a1 update runtime version to 1.6 2014-12-05 16:09:43 +08:00
honghui 118569c972 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-30 15:37:30 +08:00
honghui 047c36a270 update runtime template 2014-11-29 16:05:18 +08:00
honghui 9fefad5f35 debugging lua code in package support 2014-11-28 15:40:12 +08:00
honghui 52780dff28 fix some memory leak 2014-11-26 14:58:23 +08:00
honghui 0e73301fc4 remove "using namespace" from header files 2014-11-24 17:13:24 +08:00
honghui 84a8c75ad5 Split Runtime.cpp to individual class files 2014-11-24 11:14:35 +08:00
honghui 941c8281cd revert commit a7f8199e65 2014-11-20 21:20:54 +08:00
honghui a97386f8d7 can't build IPA using developer certificate in Mac OS X 10.10 2014-11-20 21:20:54 +08:00
honghui 8af00cdb06 runtime demo is ugly when screen orientation is portrait 2014-11-06 11:30:01 +08:00
hongliang adb221babe init arg1 as false for safety 2014-10-31 15:23:46 +08:00
hongliang 0d006ce6d1 overrided addSearchPath() by Runtime.cpp should support second argument as CCFileUtils.cpp does. 2014-10-30 17:07:37 +08:00