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

1009 Commits

Author SHA1 Message Date
minggo d9da52ce86 Merge pull request #3454 from minggo/array-support-sort 
Array can be use in stl::sort() when not using vector inside
 2013-08-21 20:50:03 -07:00
minggo 2de8963a0a fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
James Chen 1ee7790f0e Initializing Array after it was constructed. 2013-08-22 10:15:47 +08:00
James Chen 5a393994cd [Best C++ practice] ResponseType is enum class now. Renaming properties in MinXmlHttpRequest class. 2013-08-20 18:35:15 +08:00
James Chen 5407719f44 closed #2586: The utf8 response in XmlHttpRequest are mess codes. 2013-08-20 17:50:43 +08:00
CocosRobot 1107974892 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-15 14:23:52 +00:00
CocosRobot 79ced6ba3a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-15 11:25:15 +00:00
James Chen 9dbd74d2a8 Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner 
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
 2013-08-15 04:19:17 -07:00
James Chen 05534e87f4 closed #2521: Updating jsb_cocosbuilder.js, it supports CCControl now. 2013-08-12 11:27:09 +08:00
James Chen 1af0db12f6 issue #2521: Reporting an error when the callback function is undefined in 'js_cocos2dx_setCallback'. 2013-08-12 11:24:08 +08:00
James Chen f0e0b7600b issue #2521: Adding 'cc.convertColor3BtoHexString' in jsb_cocos2d.js. 2013-08-12 11:22:15 +08:00
minggo fd7d892847 Merge pull request #3403 from dumganhar/iss1690-bind-cccontrol 
closed #1690: Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS.
 2013-08-09 00:31:52 -07:00
James Chen 28789d674d issue #1690: [C++ Best Practice] Adding space in for loop. 2013-08-09 15:31:20 +08:00
James Chen 299562e3be issue #1690: Initializing member variables for JSB_ControlButtonTarget. 2013-08-09 15:08:12 +08:00
James Chen 10948fcef0 issue #1690: [C++ Best Practice] '{' in new line. 2013-08-09 15:00:06 +08:00
James Chen fd3843c4e0 issue #1690: [C++ Best Practice]Adding a space after 'if'. 2013-08-09 14:49:39 +08:00
James Chen f527387b1e closed #1690: Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS. 2013-08-09 10:58:25 +08:00
James Chen 9ce4388214 Merge branch 'iss1690-cccontorl-js' into iss1690-bind-cccontrol 2013-08-08 14:27:24 +08:00
CocosRobot 6f84509261 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-08 03:02:27 +00:00
CocosRobot 89b3e7e193 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-08 01:44:58 +00:00
James Chen 7910581654 Merge pull request #3388 from dumganhar/iss2483-sp-v23 
closed 2483: Upgrading spidermonkey library to v23.
 2013-08-07 18:39:40 -07:00
CocosRobot 98aae97de3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-07 06:33:44 +00:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
boyu0 ffd821ee13 issue #2345: update generated index 2013-08-07 13:48:12 +08:00
boyu0 ec6343a9b8 fix js and linux compile error 2013-08-07 10:34:30 +08:00
James Chen 6fdd95e3aa issue #2483: The callback type of 'delete' property has been changed from 'JS_PropertyStub' to 'JS_DeletePropertyStub' in v23. 2013-08-07 10:29:12 +08:00
James Chen aa97e223d8 issue #2483: Upgrading spidermonkey library to v23 for all supported platforms. 2013-08-07 10:29:12 +08:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
boyu0 94f9921d5e issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
CocosRobot a53a388005 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-05 05:44:27 +00:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
James Chen 78ad7bcb48 ControlEvent --> Control::EventType. 2013-08-05 10:03:02 +08:00
James Chen 8626455d69 Adding CCControl js binding. 2013-08-05 09:51:46 +08:00
CocosRobot a6279367d5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-02 02:46:30 +00:00
Timothy Qiu 5ad5cfed7a Yet another documentation fix. 
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
 2013-08-01 21:40:13 +08:00
carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
 2013-07-31 13:58:25 -07:00
CocosRobot e1d572fce5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-31 08:26:40 +00:00
minggo 0530109a9f Merge pull request #3178 from boyu0/2345 
Refactor CCImage and CCTexture2D
 2013-07-31 01:21:18 -07:00
Huabing.Xu b68339ef4e replace indent by using space instead of tab 2013-07-31 10:58:15 +08:00
Huabing.Xu c1023b5cb5 closed #2448: Fix some indent syntax! 2013-07-31 10:46:10 +08:00
Huabing.Xu 832fcf2adb closed #2448 : Fix crash when call glGetAttachedShaders with a NULL parameter on Windows 2013-07-31 10:37:42 +08:00
Lee, Jae-Hong 4beeda2294 [Tizen] Fix compile error. 2013-07-30 15:43:05 +09:00
boyu0 afde1e57b2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
boyu0 41cac18ae2 edit for lua 2013-07-29 14:04:51 +08:00
James Chen b9e29cd07e [JSB] Mark cc.TMXTiledMap.propertiesForGID to deprecated method. 2013-07-29 10:06:39 +08:00
minggo 9780b75da8 Merge pull request #3273 from thp/develop-qt5 
Port Cocos2D-X to Qt 5 (develop branch)
 2013-07-28 16:51:55 -07:00
samuele3hu 873a35a557 Merge branch 'DrawNode' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 00:27:26 +08:00
samuele3hu 3c953a934e issue #2404:Add more deprecated function and Modify template vs11 solution 2013-07-28 00:16:16 +08:00