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

9312 Commits

Author SHA1 Message Date
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
samuele3hu db7a2a1290 issue #2103 modify some compile setup and delete some deprecated lua function 2013-06-03 16:07:06 +08: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 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
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 b8916b3a5d Merge pull request #2679 from natural-law/master 
Refactor the framework of plugin
 2013-06-02 20:57:22 -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 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 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
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 #1647: Updating JS-test. 2013-06-02 18:56:30 +08:00
James Chen 2218d70826 fixed #1647: Adding missing files. 2013-06-02 18:56:17 +08:00
James Chen cedb427a6e fixed #1647: 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 #2705 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 #2702 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 #2701 from dumganhar/master 
Merge some changes of tizen from develop branch.
 2013-06-01 08:23:15 -07:00
James Chen 0ff1ef6f84 Merge branch 'tizen_2.1' of https://github.com/pyrasis/cocos2d-x 2013-06-01 23:20:11 +08:00
minggo 8aff87d82a Merge pull request #2685 from ricardoquesada/configuration_default_values 
CCConfiguration supports default values in the query
 2013-05-30 19:20:45 -07:00
Ricardo Quesada bf08b6040a uses the cocos2d.x namespace for "cocos2d x" configuration values 2013-05-30 16:29:36 -07:00
Ricardo Quesada f6665d492b CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-30 16:10:31 -07:00
zhangbin ba6e952668 Merge branch 'ForReflection' 
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
 2013-05-30 15:44:11 +08:00
zhangbin 01ca1805e8 issue #2224 : Modify the implementation of plugin flurry & umeng on iOS for the new framework. 2013-05-30 14:57:39 +08:00
zhangbin 50747530e0 issue #2224 : Implement reflection in plugin on iOS. 2013-05-30 14:50:21 +08:00
minggo 809b020de5 Merge pull request #2652 from liuyq/memcpy 
CCTextureAtlas::updateQuad modify for the memcpy hot spot
 2013-05-29 22:58:17 -07:00
Yongqin Liu 1091e71bda Revert the CCSprite.cpp and CCSprite.h to first merge other changes 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-30 10:21:48 +08:00
minggo 038cc86537 Merge pull request #2672 from ricardoquesada/configuration_get_value_fix 
Adds support for "CCString" types for boolean and integers
 2013-05-29 19:05:30 -07:00
Yongqin Liu d0f75ba92a Fix the bug for the bound check 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-30 09:54:09 +08:00
Ricardo Quesada 827fa638ca Adds support for "CCString" types for boolean and integers 2013-05-29 15:49:34 -07:00
Ben Ward d166de4684 Fixed tabbing. 2013-05-29 15:40:19 +01: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
Yongqin Liu aea9e04fbf Add out of bound check for the index before do the update 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-29 19:18:46 +08:00
minggo 05db67e8ae Merge pull request #2667 from ricardoquesada/configuration_format_2 
CCConfiguration has format
 2013-05-29 01:59:34 -07:00
zhangbin a6346a8036 issue #2224 : Use variable argument functions in the implementation of reflection. 2013-05-29 14:22:08 +08:00
Yongqin Liu f6b5208be5 CCLabelAtlas.cpp: add check for n when call setDirty 
in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.

Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
 2013-05-29 10:45:47 +08:00
Lee, Jae-Hong e48553bc27 Delete ByteBuffer pointer and NULL check. 2013-05-29 10:52:45 +09:00