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

1123 Commits

Author SHA1 Message Date
CocosRobot a812aa9cb2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-11 09:58:16 +00:00
James Chen 2603e4acf4 Merge pull request #3540 from samuele3hu/TableView 
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
 2013-09-11 02:52:38 -07:00
samuele3hu 7c62509b02 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-11 09:50:31 +08:00
samuele3hu 29f0909714 issue #2768:Add LuaObjectBridge and LuaJavaBridge 2013-09-11 09:48:24 +08:00
CocosRobot 54c5e63916 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-10 02:07:54 +00:00
CocosRobot a4ca30b9c3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-09 02:55:48 +00:00
samuele3hu 5d22b8671e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView 2013-09-04 22:19:10 +08:00
samuele3hu 4f9a9bfe85 issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions 2013-09-04 22:17:26 +08:00
James Chen 00c0b94d65 closed #2766: Memory leak in the binding glue code of cc.FileUtils.getStringFromFile(getByteArrayFromFile). 2013-09-04 16:38:07 +08:00
James Chen 80e46dc8c1 Merge pull request #3537 from samuele3hu/TableView 
issue #2764:Add TableView lua binding and releated test sample
 2013-09-04 00:04:32 -07:00
samuele3hu 6815e01f84 issue #2764:Add TableView lua binding and releated test sample 2013-09-04 14:02:22 +08:00
CocosRobot 0780e90000 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-04 02:06:59 +00:00
samuele3hu 71e0c4064a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new 2013-09-02 10:55:31 +08:00
samuele3hu 6eb5805e33 issue #2433:Remove some functions and files in cocos2dx_support 2013-09-02 10:54:39 +08:00
CocosRobot 115debd953 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-01 15:17:40 +00:00
CocosRobot f678a4a9a3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-31 10:57:01 +00:00
samuele3hu 5ee2a7e58e issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator 2013-08-30 17:15:16 +08:00
samuele3hu 8f338cc209 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-08-30 15:21:59 +08:00
samuele3hu f184d7cd8f issue #2433:Replace ccDraw** in DrawPrimitives with draw** 2013-08-30 15:06:00 +08:00
samuele3hu f56c6f7087 issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
CocosRobot d2f056e2aa [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-29 08:46:14 +00:00
CocosRobot 6a298b24ea [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-28 14:50:09 +00:00
James Chen 3959cb0d3c Merge pull request #3474 from xbruce/develop 
closed #2746: cc.registerTargettedDelegate doesn't support pure js object as its target.
 2013-08-28 02:29:09 -07:00
samuele3hu 1e54fdec00 issue #2433:update submodule 2013-08-28 15:53:15 +08:00
samuele3hu 1dabab2ca5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
 2013-08-28 15:35:33 +08:00
samuele3hu 9e071afe09 issue #2433:Add more deprecated function and modify some test 2013-08-28 15:11:19 +08:00
CocosRobot 275d719ede [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-28 02:16:33 +00:00
CocosRobot fbfb4d1002 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-27 15:42:55 +00:00
James Chen 78d8576a3a closed #2732: [Linux emscripten] Updating Makefile. 2013-08-27 21:40:29 +08:00
James Chen 16a8e1d92e issue #2732: [Linux, Emscripten] Updating Makefile. 2013-08-27 17:20:12 +08:00
James Chen 7523a6e685 issue #2732: Removing unused files (LuaCocos2d.cpp/.h). 2013-08-27 16:47:06 +08:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen e76e316063 issue #2732: [Win32] Updating project configuration for libJSBinding.vcxproj and liblua.vcxproj. 2013-08-27 16:30:56 +08:00
James Chen 220d4b7d8a issue #2732: Updating scripting/javascript/bindings/Android.mk and scripting/lua/proj.android/Android.mk. 2013-08-27 16:21:06 +08:00
James Chen 7bc1a01f18 issue #2732: Removing "scripting/lua/cocos2dx_support/generated" folder. 2013-08-27 16:20:13 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
James Chen c2099f5d3e issue #2732: Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'. 2013-08-27 14:50:53 +08:00
samuele3hu 59e3785baf issue #2433:Modify platform config 2013-08-26 18:45:50 +08:00
samuele3hu 84fcb26e44 issue #2433:compile error 2013-08-26 18:30:03 +08:00
samuele3hu c7b0b6791f issue #2433:Update typed function and add some manual binding 2013-08-26 18:09:15 +08:00
xbruce cfc5a7f669 Update cocos2d_specifics.cpp 
add need unroot
 2013-08-23 18:22:58 +08:00
xbruce 8076d568ba Update cocos2d_specifics.hpp 
add need unroot
 2013-08-23 18:20:31 +08:00
samuele3hu 6ae80bcaf0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-23 16:14:19 +08:00
samuele3hu e557b6b7c2 issue #2433:Add lua deprecated fiel and modify some test samples 2013-08-23 16:12:59 +08:00
CocosRobot 8345d4849d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-23 08:04:38 +00:00
CocosRobot 4658674175 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-23 03:40:19 +00:00
James Chen ca78d2d129 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
samuele3hu 5f6d9815ca issue #2433:Modify platform config and some test samples 2013-08-22 15:06:34 +08:00
samuele3hu 3b90d0b5b6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-22 13:40:35 +08:00
samuele3hu 0e3d0febc7 issue #2433:Modify platform config 2013-08-22 13:39:05 +08:00
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
samuele3hu 27c59a799d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-22 11:01:38 +08:00
minggo 2de8963a0a fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
samuele3hu 8489514d73 issue #2433:Add a newline 2013-08-22 10:28:33 +08:00
samuele3hu 3cb095f48a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-22 10:17:59 +08:00
samuele3hu bea62800b4 issue #2433:Modify TestLua samples and add some manual binding code 2013-08-22 10:16:57 +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
samuele3hu 7a9f1d6804 issue #2433:Modify TestLua samples and some .ini files 2013-08-20 13:44:37 +08:00
samuele3hu c8b75a1080 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-16 10:13:38 +08:00
samuele3hu de3335a4a9 issue #2433:Update lua manual binding and modify some samples 2013-08-16 10:12:46 +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
samuele3hu 7f8099ce69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	tools/bindings-generator
 2013-08-15 16:21:32 +08:00
samuele3hu 2d5482a0ab issue #2433:Modify cocos2d.ini 2013-08-15 16:14:14 +08:00
samuele3hu f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08: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
samuele3hu 980bea8a97 issue #2433:lua binding generator add hello.lua 2013-08-09 10:07:10 +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
samuele3hu 1175f2034a Merge branch 'iss2433-lua-bindings-generator' of git://github.com/dumganhar/cocos2d-x into iss2433-lua-bindings-generator 2013-08-07 10:39:07 +08:00
samuele3hu 200c5de83f issue #2433:lua binding generator 2013-08-07 10:37:20 +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