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

9748 Commits

Author SHA1 Message Date
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
René Klačan 9e4c5bbca3 Merge pull request #3 from cocos2d/develop 
pull request from main repo
 2013-06-03 04:07:43 -07:00
samuele3hu 37b508ad6d issue #2103 modify some compile setup 2013-06-03 18:25:37 +08:00
samuele3hu 23eec2f1ce issue #2103 modify some compile setup 2013-06-03 18:14:06 +08:00
samuele3hu 9352b60653 issue #2103 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 #2103 modify some compile setup 2013-06-03 16:56:45 +08:00
James Chen b8a4c08312 Merge pull request #2719 from dumganhar/develop 
Enabling c++ 11 support for iOS. cocos2dx/proj.ios/cocos2dx.xcodeproj also needs to be updated.
 2013-06-03 01:39:26 -07:00
James Chen 5386dfcbfd Enabling c++ 11 support for iOS. cocos2dx/proj.ios/cocos2dx.xcodeproj also needs to be updated. 2013-06-03 16:34:41 +08:00
samuele3hu db7a2a1290 issue #2103 modify some compile setup and delete some deprecated lua function 2013-06-03 16:07:06 +08:00
James Chen e02d9ef350 Merge pull request #2718 from CocosRobot/updategeneratedsubmodule_1370245785 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-03 00:52:44 -07:00
CocosRobot 8912ff963d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-03 07:49:49 +00:00
James Chen 6fa1bea97b Merge pull request #2717 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 bf9ae3e413 Merge pull request #2716 from dumganhar/iss2244-getEye-develop 
fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
 2013-06-03 00:34:36 -07:00
James Chen 86af06c909 fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:32:07 +08:00
James Chen 7c7c5681fe Merge pull request #2715 from dumganhar/manual-bind-cccamera-master 
fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
 2013-06-03 00:30:45 -07:00
James Chen 7cf2f88c3b fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:22:28 +08:00
samuele3hu 7101bc4377 issue #2103 remove simple cocosbuilder sample 2013-06-03 14:59:04 +08:00
minggo 97607425b8 Merge pull request #2712 from minggo/enable-cplusplus-11 
issue #2242:use -std=gnu++0x for linux and native client project
 2013-06-02 23:15:13 -07:00
minggo 5c1a408797 issue #2242:use -std=gnu++0x for linux and native client project 2013-06-03 13:50:19 +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 #2103 add cocosbuilder lua bind and add a simple sample 2013-06-03 13:47:12 +08:00
James Chen 67cb56b025 Merge pull request #2680 from natural-law/develop 
Refactor the framework of plugin
 2013-06-02 21:03:50 -07:00
James Chen b8916b3a5d Merge pull request #2679 from natural-law/master 
Refactor the framework of plugin
 2013-06-02 20:57:22 -07:00
James Chen fc816fde84 Merge pull request #2711 from dumganhar/xmlhttprequest-fix-develop 
fixed #2243: XMLHttpRequest don't support non-ascii characters.
 2013-06-02 20:43:45 -07:00
James Chen a57439776d Merge pull request #2710 from dumganhar/xmlhttpreqeust-fix-master 
fixed #2243: XMLHttpRequest don't support non-ascii characters.
 2013-06-02 20:43:41 -07:00
James Chen 66e6630f37 fixed #2243: XMLHttpRequest don't support non-ascii characters. 2013-06-03 11:40:31 +08:00
James Chen bb4d52a75c fixed #2243: XMLHttpRequest don't support non-ascii characters. 2013-06-03 11:39:18 +08:00
minggo ec0ba3f369 Merge pull request #2709 from minggo/enable-cplusplus-11 
Enable cplusplus 11
 2013-06-02 20:05:50 -07:00
minggo 0a64e7a041 enable c++11 for linux and natvie client projects 2013-06-03 11:02:54 +08:00
minggo 4f484cbcbf enable c++11 for android projects 2013-06-03 11:02:41 +08:00
minggo 236286829b enable c++11 2013-06-03 11:02:35 +08:00
minggo 2cdb48bc22 enable c++11 for iOS projects 2013-06-03 10:57:06 +08:00
James Chen cf3b79cbec Merge pull request #2696 from dumganhar/websocket 
fixed #1647: Adding WebSocket support for Cpp and JSB [develop]
 2013-06-02 19:38:51 -07:00
James Chen ea45f6f143 Merge pull request #2707 from dumganhar/websocket-master 
fixed #1647: Adding WebSocket support for Cpp and JSB. [master]
 2013-06-02 19:38:23 -07:00
James Chen 2fdeab46b1 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:12:55 +08:00
James Chen 0ca86db0ff fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 10:12:55 +08:00
James Chen d0680258c6 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:03:38 +08:00
James Chen f2f0f031c7 fixed #1647: 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
flamingo 6f0f53cf84 Update Android.mk 2013-06-02 20:42:48 +04:00
flamingo 6d7e4f5229 Update Makefile 
For nacl (spine runtime)
 2013-06-02 20:19:12 +04:00
flamingo f6495a64fb Update Android.mk 2013-06-02 20:18:27 +04:00
flaming0 b87a89eaa4 Update spine runtime 2013-06-02 19:59:13 +04:00
flaming0 5f1a4a4be7 Update for spine runtime 2013-06-02 18:26:46 +04:00
Rene Klacan c4d231aef4 comments fixed 2013-06-02 13:37:13 +02:00
Rene Klacan 0489ba51fd deleted defines in proj.linux's Makefile 2013-06-02 13:18:06 +02: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