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

9206 Commits

Author SHA1 Message Date
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 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 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 3583e5b185 Merge pull request #2706 from dumganhar/develop 
Moving JS bytecode generated tool (jsbcc) from 'tools/jsbcc' to 'cocos2d-console'.
 2013-06-01 19:57:03 -07:00
James Chen c7fd3a3483 Adding submodule of cocos2d-console to 'tools' folder. 2013-06-02 10:53:46 +08:00
James Chen 89b397f1d1 Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console. 2013-06-02 10:53:34 +08:00
James Chen 7b25d61824 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into websocket 2013-06-01 23:33:01 +08:00
James Chen f8ce155e36 Merge pull request #2686 from folecr/androidx86 
Spidermonkey for Android/x86
 2013-06-01 08:23:42 -07:00
James Chen 62f4e40e4a Updating JS-Test. 2013-06-01 19:51:59 +08:00
James Chen 8e15cdf5fd WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-01 19:51:10 +08:00
James Chen d5f45466a9 issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive. 2013-06-01 07:58:23 +08:00
James Chen ad05363265 fixed #1647: Updating JS-test. 2013-05-31 23:27:59 +08:00
James Chen 669066b954 fixed #1647: Adding missing files. 2013-05-31 23:25:01 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
minggo 57600783c4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-05-31 10:29:39 +08:00
Ricardo Quesada 3cbb6c4abb uses the cocos2d.x namespace for "cocos2d x" configuration values 2013-05-31 10:25:55 +08:00
Ricardo Quesada 3383fc5f04 CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-31 10:25:34 +08:00
folecr c7ce3d10d3 Spidermonkey for Android/x86 2013-05-30 17:18:17 -07:00
minggo 08b80bfbc9 Merge pull request #2675 from j4m3z0r/emscriptenate 
Emscripten: Fix calculation of offsets in font rendering so that we don't scribble a...
 2013-05-29 23:05:05 -07:00
minggo fdcd14594f Update AUTHORS 
[ci ignore]
 2013-05-30 15:00:17 +09:00
James Gregory 8b4f5b5853 Fix calculation of offsets in font rendering so that we don't scribble all over memory! 2013-05-29 21:25:32 -07:00
minggo 24b580adb6 Update AUTHORS 
[ci ignore]
 2013-05-30 10:42:17 +08:00
minggo 1ff88de561 Merge pull request #2666 from jotel/ccdata-in-userdefault 
Ability to save/retrieve CCData into/from CCUserDefault
 2013-05-29 19:40:23 -07:00
minggo 0487b782e7 Update AUTHORS 
[ci ignore]
 2013-05-30 10:35:30 +08:00
minggo b6ddd86ecf Merge pull request #2673 from j4m3z0r/emscriptenate 
Add destructor to CCGLBufferedNode
 2013-05-29 19:33:44 -07:00
Ricardo Quesada d61bfda440 Adds support for "CCString" types for boolean and integers 2013-05-30 10:21:49 +08:00
James Gregory 09bc00032c Add destructor for CCGLBufferedNode class to delete GL buffers. 2013-05-29 17:46:25 -07:00
Jaroslaw Lewandowski 7d4eea0646 Fixed compilation error for iOS project using Compiler Default C++ Language Dialect 2013-05-29 21:14:19 +01:00
James Chen 8456072aa0 Merge pull request #2671 from pyrasis/tizen_2.1 
Implement setIMEKeyboardState function for Tizen
 2013-05-29 07:23:47 -07:00
Lee, Jae-Hong ae78bb9b47 Modify space character check. 2013-05-29 23:14:52 +09:00
Lee, Jae-Hong ccd20af8f9 Implement setIMEKeyboardState function for Tizen. 2013-05-29 22:46:52 +09:00
James Chen 50c9515741 Merge pull request #2663 from pyrasis/tizen_2.1 
Fix Tizen CCEditBox bug.
 2013-05-29 06:39:01 -07:00
minggo 82e56774dd Update AUTHORS 
[ci ignore]
 2013-05-29 17:12:19 +08:00
minggo 53365b9e46 Merge pull request #2669 from frranck/master 
adding norwegian language
 2013-05-29 02:10:37 -07:00
Ricardo Quesada a219f9c520 CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-29 17:09:04 +08:00
minggo fdce4038e1 Update AUTHORS 
[ci ignore]
 2013-05-29 16:55:57 +08:00
minggo c862357b50 Merge pull request #2650 from varlucian/onentertransitionfinnished 
OnEnterTransitionDidFinish was called twice when a node is added in onEnter
 2013-05-29 01:53:37 -07:00
minggo 0ca5d99a30 Update AUTHORS 
[ci ignore]
 2013-05-29 16:44:14 +08:00
minggo 9db1a7b550 Merge pull request #2665 from jotel/accel-fix 
Explicitly initialising CCAcceleration structure
 2013-05-29 01:41:26 -07:00
franck 81a0fed3e2 adding norwegian language... 2013-05-29 10:31:46 +02:00
franck 3fab093f5b adding Norwegian language support 2013-05-29 10:16:22 +02:00
Jaroslaw Lewandowski 94eef4d235 Removed unused variable which caused Linux build to fail 2013-05-29 10:15:31 +02:00
Lee, Jae-Hong e48553bc27 Delete ByteBuffer pointer and NULL check. 2013-05-29 10:52:45 +09:00