Commit Graph

27460 Commits

Author SHA1 Message Date
Huabing.Xu 0f0e54a00b Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile
Compatibility code for executeScriptFile
2015-01-08 09:26:47 +08:00
yinjimmy 70e0874add Compatibility code for executeScriptFile 2015-01-08 09:01:39 +08:00
yinjimmy 197ab05a99 cleanup 2015-01-08 08:56:31 +08:00
Nite Luo b675a2ca61 Turn off Depth Write by default, only 3D opaque object will write to Depth buffer 2015-01-07 16:35:08 -08:00
huangshiwu be02233815 Fix XmlHttpRequestTest parsing error of response header on iOS platform 2015-01-08 00:23:27 +08:00
Jun Hiroe ca86bce60d Replace tab with spaces 2015-01-07 23:46:28 +09:00
yinjimmy f1f4e5f3c2 support android 2015-01-07 22:19:46 +08:00
yinjimmy 4fee8a5926 support iOS 2015-01-07 22:18:27 +08:00
lvlonggame 9647307823 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-01-07 21:49:08 +08:00
dualface ecd611d3eb Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-07 21:19:22 +08:00
Huabing.Xu 06d583c5ea update deps to 31 2015-01-07 18:36:59 +08:00
songmiao dfa6137ce9 modify arcball and fog shader 2015-01-07 17:58:10 +08:00
minggo ce0854847d Merge pull request #9847 from CocosRobot/update_lua_bindings_1420624123
[AUTO]: updating luabinding automatically
2015-01-07 17:52:47 +08:00
minggo e8b4c12aaf Merge pull request #9846 from natural-law/v3
Update the reference of submodule cocos2d-console.
2015-01-07 17:51:49 +08:00
CocosRobot 9253ae99bc [AUTO]: updating luabinding automatically 2015-01-07 09:50:54 +00:00
yinjimmy 9122e15f2c move simulator 2015-01-07 17:50:15 +08:00
zhangbin d80830c264 Update the reference of submodule cocos2d-console. 2015-01-07 17:48:10 +08:00
Huabing.Xu b5859114b7 Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-07 17:45:43 +08:00
dualface 8066343c69 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-07 17:39:30 +08:00
minggo a76d4e76da Merge pull request #9832 from super626/v3
Fix warning log when loading sphere.c3b
2015-01-07 17:28:07 +08:00
minggo c229ee0060 Merge pull request #9831 from CocosRobot/update_lua_bindings_1420600634
[AUTO]: updating luabinding automatically
2015-01-07 17:24:14 +08:00
minggo 4c7377480b Merge pull request #9837 from minggo/memory-leak
fix memory leak
2015-01-07 17:23:28 +08:00
andyque 0f49bb977d improve ui::Text and ui::TextField creation performance 2015-01-07 17:21:41 +08:00
Wenhai Lin 8524a5fb97 Improve performance of physics 2015-01-07 17:08:04 +08:00
htl 66dd8bb449 modify float convert to unsigned int 2015-01-07 16:03:46 +08:00
songmiao 41cd946e27 modify fog shader format and notes 2015-01-07 15:47:27 +08:00
yinjimmy 7d430742f1 Merge branch 'bugfix_executeScriptFile' into combine 2015-01-07 15:33:15 +08:00
yinjimmy cbf9741dfd Compatibility code for executeScriptFile 2015-01-07 15:23:58 +08:00
htl 3d2aa30aa7 modify trans lua value to fontdefinition error 2015-01-07 15:18:56 +08:00
minggo 1dcdd81fc4 fix memory leak 2015-01-07 15:02:27 +08:00
songmiao c522a72f66 modify fog shader for ios device 2015-01-07 14:56:34 +08:00
minggo f69f2359c8 Merge pull request #9833 from htlxyz/v3_origin
V3 origin
2015-01-07 14:47:11 +08:00
Huabing.Xu 27d4c6a0f6 Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug
DrawNode override drawPoints function to set pointSize, fix draw points ...
2015-01-07 14:46:13 +08:00
htl 194fa09f30 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-07 14:14:52 +08:00
htl e1fd472df1 modify texture format name 2015-01-07 14:11:48 +08:00
songmiao d1845f89fe add fog test and arcball camera test 2015-01-07 11:47:34 +08:00
huangshiwu f41f00fcb2 make rotated rect draw correctly 2015-01-07 11:44:16 +08:00
XiaoYang f6065586b9 Merge pull request #205 from lvlonggame/v3
fix bug
2015-01-07 11:39:12 +08:00
CocosRobot 54c75337c5 [AUTO]: updating luabinding automatically 2015-01-07 03:19:27 +00:00
minggo fbf565fd59 Merge pull request #9798 from samuele3hu/v3_4_packagesize
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-07 11:14:22 +08:00
lvlong f9b0c9bc92 fix bug. 2015-01-07 11:09:09 +08:00
minggo f60cbef0da Merge pull request #9811 from dabingnn/v3_refactorEGLConfigChooserJavaCode
move class cocos2dEGLConfigChooser to Cocos2dxActivity
2015-01-07 11:05:36 +08:00
minggo 95288b220f Merge pull request #9825 from CocosRobot/update_lua_bindings_1420597506
[AUTO]: updating luabinding automatically
2015-01-07 11:04:39 +08:00
minggo 3778bb5a9f Merge pull request #9824 from CocosRobot/update_cocosfiles_1420597394
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-07 11:04:14 +08:00
huangshiwu ac7ddad4ac DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug 2015-01-07 11:02:31 +08:00
CocosRobot f83daed2cf [AUTO]: updating luabinding automatically 2015-01-07 02:27:01 +00:00
CocosRobot 6a88a51e24 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-07 02:23:16 +00:00
minggo 4b0a35d772 Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
2015-01-07 10:21:54 +08:00
Sergey babbac4e38 comments 2015-01-06 14:45:10 +03:00
minggo 1b96b0bef8 Merge pull request #9818 from natural-law/v3
Update the reference of submodule cocos2d-console.
2015-01-06 18:17:18 +08:00