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

20911 Commits

Author SHA1 Message Date
XiaoYang 3b06c8e398 Merge pull request #42 from lvlonggame/v3 
modify bundle3D
 2014-06-25 12:49:40 +08:00
lvlong da835cb837 modify origin-pos stuff 2014-06-25 11:35:55 +08:00
lvlong 984e9079a7 modify bundle3d 2014-06-25 10:13:11 +08:00
lvlong ab910dfe19 reader test 2014-06-25 09:13:24 +08:00
yangxiao 2e4c801b2f load originpose 2014-06-24 23:33:30 +08:00
XiaoYang b9c523f66b Merge pull request #41 from lvlonggame/v3 
recommit for tony!!
 2014-06-24 14:54:53 +08:00
lvlong dc0101737c test for tony 2014-06-24 14:43:20 +08:00
lvlong 431378a41e commit for tony test 2014-06-24 14:10:03 +08:00
lvlong 2de28eea89 for tony 2014-06-24 13:40:04 +08:00
yangxiao ace56df74d batch sprite3D rendering 2014-06-24 09:27:10 +08:00
yangxiao c03ac80700 Sprite3D render batch, not finished 2014-06-23 23:58:45 +08:00
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
lvlong e48982aeaa unsigned int -> size_t 2014-06-23 11:12:08 +08:00
lvlong 0ac6b8c96d 1.delete write function from bundle reader. 
2.unsigned int -> size_t.
 2014-06-23 11:10:03 +08:00
yangxiao c92ba3f3dc Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-23 09:32:59 +08:00
XiaoYang ea3b7c6c80 Merge pull request #39 from lvlonggame/v3 
add .c3b file and modify warning
 2014-06-23 09:32:25 +08:00
lvlong 75f1ef5288 modify warning 2014-06-23 09:23:09 +08:00
yangxiao 92da41694d Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-23 09:05:03 +08:00
lvlong dfd68f128a c3b file 2014-06-23 09:03:53 +08:00
yangxiao fa231cadb5 merge v3 2014-06-20 22:57:55 +08:00
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
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
yangxiao f633c6a8c2 create sub Animate3D 2014-06-20 12:01:54 +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
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
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