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

24470 Commits

Author SHA1 Message Date
minggo abf4fb2319 [ci skip] 2014-08-25 09:47:13 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08:00
minggo c77121b96d Merge pull request #7863 from zii/v3 
Remove a log
 2014-08-25 09:45:33 +08:00
XiaoYang 69f020aec5 Merge pull request #89 from songchengjiang/light 
Light
 2014-08-25 09:24:05 +08:00
yangxiao 2f0e666ac1 merge cocos3d 2014-08-25 09:16:30 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
zii e8a5fc9fef Update CCActionManager.cpp 2014-08-23 17:06:46 +08:00
zii 4763531085 Update CCActionManager.cpp 2014-08-23 17:03:26 +08:00
minggo a224abe7c0 Merge pull request #7861 from CocosRobot/update_cocosfiles_1408722976 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-23 15:32:53 +08:00
minggo c9c0591293 Merge pull request #7862 from dabingnn/v3_PrimitiveReleaseNots 
add primitive release nots
 2014-08-23 15:32:17 +08:00
Huabing.Xu f5aeb9e127 add primitive release nots 2014-08-23 15:10:59 +08:00
yangxiao 87af829d0f fix template 2014-08-23 09:14:38 +08:00
CocosRobot b55c174bba [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:56:17 +00:00
minggo 4dae4bd46a Merge pull request #7860 from minggo/v3 
update external version
 2014-08-22 23:53:20 +08:00
minggo e8a7ffcde1 update external version 2014-08-22 23:52:26 +08:00
minggo 2a511c21b5 Merge pull request #7859 from CocosRobot/update_cocosfiles_1408722054 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-22 23:49:40 +08:00
minggo d358a06716 [ci skip] 2014-08-22 23:47:53 +08:00
CocosRobot 91eba38eda [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:40:55 +00:00
minggo eeeb831697 Merge pull request #7857 from CocosRobot/update_cocosfiles_1408706718 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-22 23:36:58 +08:00
minggo b899b301c2 Merge pull request #7858 from CocosRobot/update_lua_bindings_1408706600 
[AUTO]: updating luabinding automatically
 2014-08-22 23:36:46 +08:00
minggo eb1da8a0f9 [ci skip] 2014-08-22 23:34:46 +08:00
CocosRobot 899e0a4182 [AUTO]: updating luabinding automatically 2014-08-22 11:25:33 +00:00
CocosRobot c2e73723f6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 11:25:19 +00:00
minggo 0701fe1dfb Merge pull request #7853 from super626/v3 
Better reskin model support
 2014-08-22 19:18:47 +08:00
minggo e01efd9126 Merge pull request #7854 from super626/releasenote 
add release note
 2014-08-22 19:18:15 +08:00
yangxiao bf7997e342 modify 2014-08-22 18:14:33 +08:00
yangxiao 02ccee67df add release note 2014-08-22 18:08:26 +08:00
huangshiwu 07af58c0c2 OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
yangxiao 1db3d14896 reset bone number to 60, put test in alphabetical order 2014-08-22 16:06:36 +08:00
samuele3hu d1b4d43a0b Remove CCModuleManager.h/cpp and adjust the related project 2014-08-22 15:10:46 +08:00
yangxiao 6ff2aa2755 change skin joint count to 40 2014-08-22 15:00:34 +08:00
yangxiao 3a0d63caa6 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-22 14:55:11 +08:00
yangxiao a102946d35 android and linux 2014-08-22 14:54:26 +08:00
XiaoYang e4737f9070 Merge pull request #112 from liuliang2004/Meshv3 
Modify project file
 2014-08-22 14:46:46 +08:00
yangxiao 39cc03173b remove unused variable 2014-08-22 14:43:48 +08:00
liuliang c7c091e4b6 Modify project file 2014-08-22 14:32:27 +08:00
yangxiao 70661b0ff4 lua bind 2014-08-22 14:25:00 +08:00
yangxiao 1938817187 reset girl name 2014-08-22 14:24:40 +08:00
yangxiao 81dbb0bca4 add comment 2014-08-22 14:02:51 +08:00
samuele3hu 70cba1f64a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	cocos/Android.mk
 2014-08-22 14:01:17 +08:00
minggo aba973b1ea Merge pull request #7834 from andyque/improveUI 
add click event listener to all Widget classes
 2014-08-22 14:00:10 +08:00
yangxiao d90572fc10 engine refactor hide concept of submesh 2014-08-22 13:52:03 +08:00
samuele3hu a3e4402c5f Adjust cpp-template-default template 2014-08-22 13:50:28 +08:00
samuele3hu 1bda276392 Update android.mk for related cpp test cases 2014-08-22 13:49:54 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
samuele3hu 523dcdb6fb Update cocos2d android.mk 2014-08-22 13:43:18 +08:00
samuele3hu ada7fa23d3 Add CC_DLL for related network files 2014-08-22 13:42:46 +08:00
minggo eef93ccd14 Merge pull request #7838 from andyque/updateReleaseNote 
update ui::Scale9Sprite release note
 2014-08-22 13:42:02 +08:00
samuele3hu 700699a37f Modify MciPlayer.cpp to support Unicode 2014-08-22 13:41:48 +08:00