Commit Graph

9232 Commits

Author SHA1 Message Date
minggo c21812b270 Merge pull request from ricardoquesada/timeval_64bit_fix
cc_timeval works on 64bit machines, like OS X
2013-06-03 22:47:45 -07:00
James Chen b3e00a2105 Merge pull request from CocosRobot/updategeneratedsubmodule_1370323397
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-03 22:25:33 -07:00
James Chen 22053d4b85 Merge pull request from dumganhar/master
fixed : A logical error in CCDrawNode::drawPolygon.
2013-06-03 22:24:37 -07:00
CocosRobot be08d6c81d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 05:23:21 +00:00
James Chen 0820013740 Update AUTHORS [ci skip] 2013-06-04 13:22:16 +08:00
xyhl515 69ccb9b724 A problem of CCDrawNode::drawPolygon outline 2013-06-04 13:22:06 +08:00
James Chen c9b51b5ea1 Merge pull request from dumganhar/iss2247-proxy-function-master
fixed : Using functions instead of macros to speeding up building for JSB project.
2013-06-03 22:05:25 -07:00
James Chen 6cc3ba9a5d fixed : Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes]. 2013-06-04 13:02:02 +08:00
James Chen 64dec0df56 fixed : Using functions instead of macros to speeding up building for JSB project. 2013-06-04 13:01:50 +08:00
Ricardo Quesada 7e7e943699 compiles on linux and other machines without C99 support 2013-06-03 20:45:06 -07:00
minggo 4790a46a66 Merge pull request from natural-law/master
Update the JS binding code for plugin
2013-06-03 20:02:32 -07:00
minggo 74b86021e6 Merge pull request from benjamesward/master
Fixed linebreaks on Mac OSX
2013-06-03 19:40:34 -07:00
minggo f9de0d2fbe Merge pull request from samuele3hu/bind_cocosbuilder
add cocosbuilder lua_binding
2013-06-03 19:33:19 -07:00
zhangbin b044486608 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-04 10:13:29 +08:00
zhangbin d83c9b58a5 Merge branch 'ForReflection'
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
2013-06-04 10:12:41 +08:00
zhangbin 1eb8217edb fixed : Update the JS binding code for plugin. 2013-06-04 10:06:16 +08:00
Ricardo Quesada c6d00a3ccb cc_timeval works on 64bit machines, like OS X 2013-06-03 17:31:59 -07:00
minggo 45a191c4f0 Merge pull request from rodrigogolive/linux_fixes
Removing unused variable
2013-06-03 07:44:16 -07:00
Rodrigo Goncalves de Oliveira 78967b7c8e Removing unused variable
These variables are just used on CCAssert comparisons, and result on a
compilation error on Linux (-Werror=unused-variable).

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
2013-06-03 09:17:03 -04:00
samuele3hu 37b508ad6d issue modify some compile setup 2013-06-03 18:25:37 +08:00
samuele3hu 23eec2f1ce issue modify some compile setup 2013-06-03 18:14:06 +08:00
samuele3hu 9352b60653 issue modify some compile setup and del some resource file 2013-06-03 17:40:31 +08:00
samuele3hu 0d33d909c9 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder 2013-06-03 17:15:57 +08:00
samuele3hu bf1cd2e909 issue modify some compile setup 2013-06-03 16:56:45 +08:00
samuele3hu db7a2a1290 issue modify some compile setup and delete some deprecated lua function 2013-06-03 16:07:06 +08:00
James Chen 6fa1bea97b Merge pull request from CocosRobot/updategeneratedsubmodule_1370244950
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-03 00:39:14 -07:00
CocosRobot bfbbb7bbfd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-03 07:35:56 +00:00
James Chen 7c7c5681fe Merge pull request from dumganhar/manual-bind-cccamera-master
fixed : cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
2013-06-03 00:30:45 -07:00
James Chen 7cf2f88c3b fixed : cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:22:28 +08:00
samuele3hu 7101bc4377 issue remove simple cocosbuilder sample 2013-06-03 14:59:04 +08:00
samuele3hu af0737ce87 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder 2013-06-03 13:48:12 +08:00
samuele3hu afa6b81ba7 issue add cocosbuilder lua bind and add a simple sample 2013-06-03 13:47:12 +08:00
James Chen b8916b3a5d Merge pull request from natural-law/master
Refactor the framework of plugin
2013-06-02 20:57:22 -07:00
James Chen a57439776d Merge pull request from dumganhar/xmlhttpreqeust-fix-master
fixed : XMLHttpRequest don't support non-ascii characters.
2013-06-02 20:43:41 -07:00
James Chen 66e6630f37 fixed : XMLHttpRequest don't support non-ascii characters. 2013-06-03 11:40:31 +08:00
James Chen ea45f6f143 Merge pull request from dumganhar/websocket-master
fixed : Adding WebSocket support for Cpp and JSB. [master]
2013-06-02 19:38:23 -07:00
James Chen d0680258c6 fixed : [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:03:38 +08:00
James Chen f2f0f031c7 fixed : Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 09:55:43 +08:00
James Chen c29e434ead Updating JS-Test. 2013-06-02 18:57:01 +08:00
James Chen 4b8f76c903 WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-02 18:56:49 +08:00
James Chen 85d2ccbf65 issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive. 2013-06-02 18:56:39 +08:00
James Chen 68d0ebfec5 fixed : Updating JS-test. 2013-06-02 18:56:30 +08:00
James Chen 2218d70826 fixed : Adding missing files. 2013-06-02 18:56:17 +08:00
James Chen cedb427a6e fixed : Adding WebSocket support for Cpp and JSB.
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-02 18:55:57 +08:00
James Chen 5ac2f4f597 Merge pull request from dumganhar/master
Moving JS bytecode generated tool (jsbcc) from 'tools/jsbcc' to 'cocos2d-console'.
2013-06-01 19:56:22 -07:00
James Chen 1b455e452e Adding submodule of cocos2d-console to 'tools' folder. 2013-06-02 10:51:19 +08:00
James Chen 8b9e198372 Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console. 2013-06-02 10:46:27 +08:00
James Chen 9bf4ac2a8d Merge pull request from dumganhar/master
Spidermonkey for Android/x86
2013-06-01 08:32:14 -07:00
folecr fa8b2005c3 Spidermonkey for Android/x86 2013-06-01 23:28:37 +08:00
James Chen 4106954dc1 Merge pull request from dumganhar/master
Merge some changes of tizen from develop branch.
2013-06-01 08:23:15 -07:00