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

21449 Commits

Author SHA1 Message Date
yangxiao 2a6dfaf91b Merge branch 'newcode' into v3 2014-06-20 22:55:27 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00
yangxiao 1581396810 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-20 18:54:34 +08:00
yangxiao 3096979b1f rename createSubAnimate3D to create 2014-06-20 18:54:09 +08:00
XiaoYang 2371e8e6ae Merge pull request #38 from lvlonggame/v3 
binary loader
 2014-06-20 18:46:52 +08:00
boyu0 2fa266e917 closed #5541: change PhysicsActionTest for rotate action. 2014-06-20 18:42:36 +08:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +08:00
yangxiao c5e562106f Animate3D support spawn 2014-06-20 17:55:25 +08:00
minggo d99c30a0cc Merge pull request #7155 from natural-law/v3 
Optimize the win32 projects configuration.
 2014-06-20 17:35:32 +08:00
lvlong 478ea8949a Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	tools/cocos2d-console
 2014-06-20 16:14:46 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
 2014-06-20 16:02:22 +08:00
lvlong e4bbfad773 1. binary loader is OK. 
2. add some comment.
 2014-06-20 15:30:08 +08:00
andyque 9b945683b5 fix contentSize not set properly problem 2014-06-20 14:55:42 +08:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
chuanweizhang2013 80e9c7d9b8 add head 2014-06-20 13:43:09 +08:00
yangxiao f633c6a8c2 create sub Animate3D 2014-06-20 12:01:54 +08:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +08:00
chuanweizhang2013 a45056dbd7 add protobuf 2014-06-20 11:32:22 +08:00
yinkaile aac4ded898 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 11:24:12 +08:00
yinkaile 510bc23b16 1.fixed action may shake a little 
2.fixed frame event will emit even they do not in current play section
 2014-06-20 11:23:26 +08:00
andyque 4ca184b58a issue #5161, deprecated getSize 2014-06-20 11:18:53 +08:00
samuele3hu 5351055d5d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-20 11:12:09 +08:00
samuele3hu d9848a62d2 Update controller.lua for CocosIDE’s need 2014-06-20 11:09:26 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
andyque 585ccf2c71 issue #5161, replace all _size to _contentSize 2014-06-20 10:40:16 +08:00
minggo d7e7a73fec Merge pull request #7154 from Mazyod/fix-cc-log-info 
CCLOGINFO compilation fix
 2014-06-20 10:01:31 +08:00
Mazyad Alabduljaleel c7ec43202a restore COCOS_DEBUG macro 2014-06-19 21:00:56 +04:00
Mazyad Alabduljaleel 433dc140cd CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
minggo f1ea2e9332 [ci skip] 2014-06-19 22:13:27 +08:00
minggo 9f0a566b8a Merge pull request #6945 from John-He-928/mingw-build 
Fix MinGW build
 2014-06-19 22:08:28 +08:00
minggo 079e612ef2 [ci skip] 2014-06-19 22:07:25 +08:00
lite3 77210d60ae fix: can not create networkThread at second create HttpClient. 2014-06-19 22:07:24 +08:00
minggo 44e8df0ec6 [ci skip] 2014-06-19 22:05:52 +08:00
minggo e374bd67c7 Merge pull request #6946 from hanjukim/skip-utf8-bom 
Skip UTF8 BOM if it exists and bug fix for unterminated string
 2014-06-19 22:02:38 +08:00
minggo 7d05249490 Merge pull request #7153 from CocosRobot/update_cocosfiles_1403186228 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-19 21:57:57 +08:00
CocosRobot ffb96092fd [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-19 13:57:10 +00:00
minggo 4fa86ae6ce Merge pull request #7151 from CocosRobot/update_lua_bindings_1403185113 
[AUTO]: updating luabinding automatically
 2014-06-19 21:42:33 +08:00
CocosRobot 62e2580e48 [AUTO]: updating luabinding automatically 2014-06-19 13:40:08 +00:00
minggo 36e5b579fc Merge pull request #7149 from CocosRobot/update_lua_bindings_1403184170 
[AUTO]: updating luabinding automatically
 2014-06-19 21:25:58 +08:00
minggo a8328f1254 Merge pull request #7148 from CocosRobot/update_cocosfiles_1403184246 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-19 21:25:45 +08:00
CocosRobot a3bee308f6 [AUTO]: updating luabinding automatically 2014-06-19 13:24:36 +00:00
CocosRobot 54b2a15886 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-19 13:24:14 +00:00
minggo af88cf053b Merge pull request #7022 from samuele3hu/v3_fix 
Add bytecode and encrypted files test cases for Lua
 2014-06-19 21:20:05 +08:00
minggo c28c050c79 Merge pull request #7147 from CocosRobot/update_lua_bindings_1403182654 
[AUTO]: updating luabinding automatically
 2014-06-19 21:05:34 +08:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3 
add TimelineAction
 2014-06-19 21:05:15 +08:00
CocosRobot d97401cdb1 [AUTO]: updating luabinding automatically 2014-06-19 13:00:05 +00:00
minggo 190d6d4859 Merge pull request #7136 from CocosRobot/update_lua_bindings_1403162482 
[AUTO]: updating luabinding automatically
 2014-06-19 20:56:10 +08:00