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

95 Commits

Author SHA1 Message Date
cw 2914f60fcf fixed xiaomi show ip error 2014-04-17 16:50:11 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
chuanweizhang2013 1fadba7de1 add static to variable 2014-04-11 10:41:35 +08:00
cw 06b727d184 remove comment code and rename function 2014-04-10 18:15:07 +08:00
chuanweizhang2013 b8ed365b7f tab to 4 space 2014-04-10 15:53:42 +08:00
chuanweizhang2013 eb6ef4d067 tab to 4 space 2014-04-10 15:51:25 +08:00
chuanweizhang2013 d5940243e1 mofiy wrong indention 2014-04-10 15:37:59 +08:00
chuanweizhang2013 c6ec729bf8 modify 2014-04-10 10:35:53 +08:00
chuanweizhang2013 d4e2b72f12 add platform symbol 2014-04-09 19:17:13 +08:00
chuanweizhang2013 b077ed40e8 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-09 17:55:58 +08:00
chuanweizhang2013 e97552c2d3 add reload 2014-04-09 17:54:10 +08:00
cw d34fddb06e rename lua folder 2014-04-09 17:03:38 +08:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-04-04 18:17:54 +08:00
chuanweizhang2013 a6cd18d05d cmd to request 2014-04-02 13:47:09 +08:00
samuele3hu 0a1d23753b fix the lua template error that would lead to crash when do rotate 2014-03-31 23:11:26 +08:00
chuanweizhang2013 d74fd796eb add resouce reload 2014-03-31 16:49:12 +08:00
chuanweizhang2013 189136ccb8 fixed mistake 2014-03-31 11:39:49 +08:00
chuanweizhang2013 32402b109e add memset 2014-03-31 11:26:30 +08:00
chuanweizhang2013 93c424071e update runtime 2014-03-31 11:18:41 +08:00
cw 2649c5b971 add socket 2014-03-28 16:26:56 +08:00
chuanweizhang2013 0d65057116 update runtime 2014-03-28 16:07:29 +08:00
chuanweizhang2013 c016f80f58 fixed no json file bug 2014-03-28 15:45:10 +08:00
chuanweizhang2013 4b691cf7e9 add fileinfo support 2014-03-28 15:06:49 +08:00
chuanweizhang2013 5aa3a5d956 update socket rules 2014-03-28 11:37:17 +08:00
chuanweizhang2013 210cee9f08 update socket protocol 2014-03-26 14:48:04 +08:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
chuanweizhang2013 3c575d36d8 / 2014-03-21 15:53:02 +08:00
cw 8a40fbc159 update pc show msg 2014-03-21 11:56:21 +08:00
chuanweizhang2013 46d58775d7 update search path 2014-03-19 17:23:06 +08:00
chuanweizhang2013 a0b8200b79 forget include 2014-03-19 09:50:06 +08:00
chuanweizhang2013 7af5060896 add pc args 2014-03-18 18:24:58 +08:00
chuanweizhang2013 6b2ce283e4 fixed win32 don't exit 2014-03-17 20:46:49 +08:00
chuanweizhang2013 08a04e6408 update release writepath 2014-03-17 14:44:20 +08:00
chuanweizhang2013 b44b5ce52f add send \n 2014-03-16 17:32:08 +08:00
chuanweizhang2013 2f62cd2383 modify recv namelen array 2014-03-15 18:30:58 +08:00
chuanweizhang2013 ec6c4ddf64 modify recv namelen array 2014-03-15 18:28:42 +08:00
chuanweizhang2013 0dc85e42a7 modify module_path 2014-03-13 09:51:43 +08:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix 
Lua Runtime fix
 2014-03-12 21:48:35 +08:00
James Chen cc8738ee94 Simulator fix: After main loop, NSApplication needs to be terminated immediately. 2014-03-12 21:45:15 +08:00
minggo e1afa0ad5c Merge pull request #5735 from minggo/template-java-des 
add description for how to load .so
 2014-03-12 21:31:30 +08:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
chuanweizhang2013 fafc292d33 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage 2014-03-12 15:28:07 +08:00
chuanweizhang2013 4153667249 add runtime template 2014-03-12 11:04:56 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00