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

20933 Commits

Author SHA1 Message Date
chuanweizhang2013 07446af719 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-23 17:33:39 +08:00
chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/cocos-project-template.json
 2014-06-23 17:30:33 +08:00
chuanweizhang2013 82aeb5bbb5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/cocos-project-template.json
 2014-06-23 17:19:06 +08:00
chuanweizhang2013 a170342f01 modify release output 2014-06-23 16:56:23 +08:00
minggo dc96be969f [ci skip] 2014-06-23 16:45:47 +08:00
minggo 87dd434045 Merge pull request #7170 from samuele3hu/v3SequenceCreate 
Fix the error that lua binding for create function of Sequence would lead to endless loop
 2014-06-23 16:44:05 +08:00
samuele3hu 0d7c453878 Fix the error that lua binding for create function of Sequence would lead to endless loop 2014-06-23 16:38:35 +08:00
minggo c579fbf845 Merge pull request #7169 from natural-law/v3 
Solve the error in Xcode project of lua runtime template.
 2014-06-23 16:04:06 +08:00
zhangbin dd49c4ccbc Solve the error in Xcode project of lua runtime template. 2014-06-23 15:41:58 +08:00
chuanweizhang2013 e1333da7e4 add stubs head 2014-06-23 15:07:49 +08:00
chuanweizhang2013 04a683d917 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-23 15:05:07 +08:00
chuanweizhang2013 f283ec69a1 add head 2014-06-23 15:04:28 +08:00
minggo b65991bf85 Merge pull request #7162 from CocosRobot/update_cocosfiles_1403281523 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-21 00:27:24 +08:00
CocosRobot 2c04d00425 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-20 16:25:25 +00:00
minggo dbfbba87de Merge pull request #7161 from MSOpenTech/wp8-v3-fix 
Wp8 v3 fix
 2014-06-21 00:22:51 +08:00
Dale Stammen 113f20094f added building wp8 shaders instructions 2014-06-20 09:12:16 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
Dale Stammen 83c5b7bdb0 updated wp8 precompiled shaders 2014-06-20 09:07:29 -07:00
Dale Stammen aa4ffc33ac updated WP8 shader compiler tool 2014-06-20 09:06:49 -07:00
minggo d99c30a0cc Merge pull request #7155 from natural-law/v3 
Optimize the win32 projects configuration.
 2014-06-20 17:35:32 +08:00
chuanweizhang2013 80e9c7d9b8 add head 2014-06-20 13:43:09 +08:00
chuanweizhang2013 a45056dbd7 add protobuf 2014-06-20 11:32:22 +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
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
minggo cdbd3508d4 Merge pull request #7139 from zawasp/uniform_struct 
fix warning Uniform is struct, not class.
 2014-06-19 20:55:37 +08:00
minggo 87a89bfaa2 Merge pull request #7142 from minggo/v3 
revert binding-generators to correct commit
 2014-06-19 20:53:41 +08:00
minggo 2f959a3f87 [ci skip] 2014-06-19 20:48:45 +08:00
minggo 7553060ba7 Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp 
[ci skip]Add new line at the end of a file to *.[cpp|h]
 2014-06-19 20:47:17 +08:00
minggo 72465a362e Merge pull request #7145 from gin0606/addNewLineAtTheEndOfFile 
add new line at the end of a file to *.mk
 2014-06-19 20:45:57 +08:00