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

23240 Commits

Author SHA1 Message Date
minggo b8447baf73 Merge pull request #7893 from slackmoehrle/glview_fix 
Glview fix
 2014-08-28 10:10:17 +08:00
minggo 5f20d17bc0 Merge pull request #7896 from ricardoquesada/std_nothrow 
Adds `std::nothrow` to the `new` statements
 2014-08-28 10:06:55 +08:00
Ricardo Quesada 781b0bc478 properties revert back to 10 2014-08-27 16:35:13 -07:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Ricardo Quesada d265cd488a Merge pull request #7894 from ricardoquesada/render_texture_fix 
Adds ClippingNode bug test case
 2014-08-27 10:55:30 -07:00
Ricardo Quesada dbdd2b3e13 Adds ClippingNode bug test case 2014-08-27 10:54:15 -07:00
Slack-Moehrle 1b5413d8b4 comment out [glview release]; and [eaglview release]; 2014-08-27 10:42:27 -07:00
Slack-Moehrle d4d2b8c83e comment out [glview release]; and [eaglview release]; 2014-08-27 10:26:09 -07:00
minggo 491c32b705 Merge pull request #7890 from minggo/compiling-optimize 
Compiling optimize
 2014-08-27 15:39:08 +08:00
minggo 17ab047b7d fix compiling error on windows 2014-08-27 15:13:41 +08:00
minggo 708fa8f114 [ci skip] 2014-08-27 14:09:06 +08:00
minggo dc5c42a1c9 Merge pull request #7889 from minggo/update-release-note 
[ci skip]update release note
 2014-08-27 14:07:55 +08:00
minggo 78c78d315c update release note 2014-08-27 14:06:54 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
minggo 2efd7eef6c Merge pull request #7888 from CocosRobot/update_cocosfiles_1409118024 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-27 13:45:02 +08:00
CocosRobot f1914f3fa1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-27 05:40:25 +00:00
minggo d0ca9a4da5 remove unneeded include header files 2014-08-27 13:39:50 +08:00
minggo ac029c3d0d Merge pull request #7887 from super626/v3 
2d cull only for default camera
 2014-08-27 13:39:13 +08:00
yangxiao 26f7345693 2d cull only for default camera 2014-08-27 12:09:23 +08:00
minggo 0d5b792dce Merge pull request #7885 from samuele3hu/v3_test 
Module integration on the win32 platform and remove some useless projects
 2014-08-27 12:04:06 +08:00
samuele3hu 7a9a16d6aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-08-27 11:11:21 +08:00
samuele3hu 106cb2e110 Update external config.json 2014-08-27 11:07:41 +08:00
samuele3hu 471820568f Update android.mk of cocos and lua-templates 2014-08-27 10:28:04 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu a5a706aa05 Remove the useless win32 project 2014-08-27 10:20:15 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
minggo 31f406bbdd Merge pull request #7884 from minggo/cocos2dxrendererjava-onpause-fix 
invoke nativeOnPause after onSurfaceCreated is invoked
 2014-08-27 10:17:42 +08:00
minggo d290076917 invoke nativeOnPause after onSurfaceCreated is invoked 2014-08-27 10:13:03 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
minggo 3d4f22ca74 add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
minggo c935a39090 Merge pull request #7879 from dabingnn/v3_fixLabelStatus 
fix LabelStatus string error when labelStatus is recreated
 2014-08-26 14:51:08 +08:00
minggo ec9980b0b0 Merge pull request #7878 from super626/v3 
Remove animation3D warning
 2014-08-26 14:50:50 +08:00
yangxiao 7ff75fb397 remove warning 2014-08-26 14:19:08 +08:00
minggo e09d705280 Merge pull request #7875 from super626/v3 
name of Reskin Model modified to english
 2014-08-26 13:36:33 +08:00
yangxiao 28376ff6aa reset 2014-08-25 21:50:34 +08:00
yangxiao cff5b65314 Merge branch 'newcode' into v3 2014-08-25 21:20:49 +08:00
yangxiao dd93439c4b replace model 2014-08-25 19:25:51 +08:00
Huabing.Xu ef472d6250 fix LabelStatus string error when labelStatus is recreated 2014-08-25 17:19:45 +08:00
minggo dad69ae62a Merge pull request #7874 from CocosRobot/update_cocosfiles_1408949829 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-25 14:58:13 +08:00
CocosRobot 8d88109db7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 06:57:10 +00:00
minggo 37aeb5b114 Merge pull request #7872 from samuele3hu/v3_3_new_module 
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
 2014-08-25 14:55:46 +08:00
samuele3hu 07cf4d3526 Fix the win32 and android compile error 2014-08-25 14:10:13 +08:00
minggo f3b552fb29 Merge pull request #7871 from CocosRobot/update_cocosfiles_1408936770 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-25 13:35:49 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
yangxiao 8bfd56c080 use normal walk 2014-08-25 11:31:38 +08:00
yangxiao c7f7623320 reserve animation size 2014-08-25 11:30:34 +08:00
CocosRobot b165137f40 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 03:19:31 +00:00
minggo ba4825a5fa Merge pull request #7869 from huangshiwu/v3_glviewattrs 
OpenGL context attributions setting revise -modify lua template
 2014-08-25 11:18:15 +08:00
minggo 7ece79e7d3 Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963 
[AUTO]: updating luabinding automatically
 2014-08-25 11:01:27 +08:00