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

24595 Commits

Author SHA1 Message Date
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
lite3 1846482527 skip GUIReader::registerTypeAndCallBack for lua bindings 2014-08-30 00:46:38 +08:00
minggo 640bee2adb Merge pull request #7914 from CocosRobot/update_lua_bindings_1409308555 
[AUTO]: updating luabinding automatically
 2014-08-29 22:30:15 +08:00
lite3 3872ee9b59 add CustomGUIReader for lua 2014-08-29 18:50:21 +08:00
CocosRobot cdc41711f6 [AUTO]: updating luabinding automatically 2014-08-29 10:38:25 +00:00
minggo 7cec9573ed Merge pull request #7905 from minggo/optimize-compiling 
remove unneeded includes
 2014-08-29 18:28:00 +08:00
yangxiao a039d6b0fc animate3d transition 2014-08-29 18:25:42 +08:00
songchengjiang 9f715e4e00 Added Sprite3D Model 2014-08-29 18:18:19 +08:00
cocoscodeide dd09c784d1 Merge pull request #65 from cocos2d/v3 
update  v3
 2014-08-29 18:12:30 +08:00
cocoscodeide 49b23e60af Merge pull request #66 from chuanweizhang2013/v3luaruntime 
update v3
 2014-08-29 18:12:12 +08:00
songchengjiang 8d971054f2 Android -p 10 2014-08-29 18:02:17 +08:00
songchengjiang 0d75998027 pressure test 2014-08-29 17:58:20 +08:00
songchengjiang 4aa4287d28 test on Android 2014-08-29 17:29:15 +08:00
chuanweizhang2013 25a7f21056 make debug writable path the same as release 2014-08-29 17:27:55 +08:00
songchengjiang 34070677ad Added testing Model Number 2014-08-29 17:11:18 +08:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
minggo 05c767be3b [ci skip] 2014-08-29 16:51:40 +08:00
minggo afaea360fd Merge pull request #7908 from dabingnn/v3_fix_bugs 
V3 fix bugs
 2014-08-29 16:45:52 +08:00
minggo 29a4296a87 Merge pull request #7912 from CocosRobot/update_lua_bindings_1409299844 
[AUTO]: updating luabinding automatically
 2014-08-29 16:45:32 +08:00
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
lite3 4a374a1a2a Merge branch 'v3' into customguireader 2014-08-29 16:36:42 +08:00
chuanweizhang2013 303b391657 fixed writablePath 2014-08-29 16:21:34 +08:00
CocosRobot 3b3747d518 [AUTO]: updating luabinding automatically 2014-08-29 08:12:40 +00:00
minggo c6f513bbdb Merge pull request #7911 from samuele3hu/v3_tip 
Update bindings-generator submodule
 2014-08-29 16:07:24 +08:00
Huabing.Xu 8e51377f2d fix primitive draw error 2014-08-29 16:00:04 +08:00
minggo 1dcdbca4e0 revert lua-bindings 2014-08-29 15:54:20 +08:00
minggo e4920ffdea fix conflict 2014-08-29 15:45:21 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
minggo e39e3bb836 Merge pull request #7909 from CocosRobot/update_cocosfiles_1409291025 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-29 15:27:35 +08:00
samuele3hu 6e6e7e1619 Remove careless modification 2014-08-29 15:22:51 +08:00
samuele3hu d7e9bf1fd2 Update bindings-generator submodule 2014-08-29 15:14:30 +08:00
chuanweizhang2013 0d8c9eeb19 add link resource support 2014-08-29 15:05:55 +08:00
samuele3hu 28de8459e4 Update bindings-generator submodule 2014-08-29 14:02:12 +08:00
samuele3hu b17ce5c1d0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_tip 2014-08-29 13:57:19 +08:00
samuele3hu 1b804345dc Update bindings-generator submodule 2014-08-29 13:56:37 +08:00
CocosRobot d0ac64b2e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-29 05:43:47 +00:00
minggo ffd81d8b0f [ci skip] 2014-08-29 13:43:42 +08:00
minggo 58dd2f4a69 Merge pull request #7882 from andyque/addWebView 
add WebView
 2014-08-29 13:42:14 +08:00
songchengjiang 71d722854c added mesh command 2014-08-29 12:08:28 +08:00
lvlong 496aad2fe7 remove 0.3 branch logic 2014-08-29 11:59:30 +08:00
lvlong cbe61a4b73 modify log 2014-08-29 11:56:33 +08:00
andyque 4c046336da fix linux 2014-08-29 11:53:39 +08:00
andyque cf0baef7c0 add web view javascript support 2014-08-29 11:50:08 +08:00
andyque 043acb2fd4 rename webview to UIWebView 2014-08-29 11:28:28 +08:00
lvlong 15c945d89b Merge branch 'newcode' into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
 2014-08-29 11:04:15 +08:00
songchengjiang 43eb725c27 resolve conflict 2014-08-29 11:02:34 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-29 10:58:04 +08:00
lvlong 5a1e0601a7 Code Standards 2014-08-29 10:43:26 +08:00
songchengjiang 96e6595e95 Added getInverseViewMatrix 2014-08-29 10:42:02 +08:00