samuele3hu
eed0297c59
Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-22 09:39:57 +08:00
James Chen
50c280fb9d
Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp.
2013-07-21 19:10:22 +08:00
Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
CocosRobot
476e53b490
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 15:24:06 +00:00
samuele3hu
90af254fac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-19 14:57:38 +08:00
samuele3hu
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +08:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
CocosRobot
f3615b40d5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 03:50:49 +00:00
James Chen
6ffac07a81
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-19 11:08:47 +08:00
samuele3hu
236b675e21
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-18 23:29:41 +08:00
samuele3hu
78cd3e561e
issue #2404:Move deprecated functions to Deprecated.lua
2013-07-18 23:27:07 +08:00
CocosRobot
11daa0f769
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 09:53:56 +00:00
minggo
208c1312f4
Merge pull request #3171 from samuele3hu/ScriptHandler
...
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGL,ScrollView handlers operation
2013-07-18 02:48:37 -07:00
CocosRobot
ca06ed4f2c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 07:38:53 +00:00
CocosRobot
2523e7746b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 10:21:56 +00:00
James Chen
86ef8f45e7
Merge branch 'functions' of https://github.com/colesbury/cocos2d-x into colesbury-functions
2013-07-17 17:51:05 +08:00
CocosRobot
e8777b8722
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 09:46:49 +00:00
James Chen
a9eea0a887
issue #2407 : Updating jsb_deprecated.js and cocos2dx.ini.
2013-07-17 17:38:03 +08:00
samuele3hu
8447341896
issue #2377 : Modify LuaWebScoket linux compile error
2013-07-17 16:40:31 +08:00
CocosRobot
8cc8d56ed2
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 06:53:49 +00:00
samuele3hu
c9f0f09dac
issue #2377:Del CallFunc and CallFuncN handler operation and Modify LuaWebScoket linux config
2013-07-17 14:44:28 +08:00
samuele3hu
3018f5b3d7
issue #2377:Adjust some function places.
2013-07-17 13:43:27 +08:00
samuele3hu
6ce5bbf09a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-17 10:16:11 +08:00
samuele3hu
0f1ac9983f
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation.
2013-07-17 10:15:25 +08:00
Sam Gross
96c15efb66
Add JSFunctionWrapper in preparation for bindings-generator changes.
2013-07-16 19:30:47 -04:00
CocosRobot
1ea10c75c3
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 09:50:03 +00:00
James Chen
80590dcfc1
Merge pull request #3132 from samuele3hu/ScriptHandler
...
issue 2377:Add scriptHandlerMgr to manager lua script handler
2013-07-16 02:40:50 -07:00
James Chen
b71e9d83e1
Merge pull request #3165 from sunzhuoshi/master
...
Fixed bad js constant names and added config macro for "spine" extension
2013-07-16 02:36:49 -07:00
samuele3hu
596eb9df3e
issue #2377:Modify tojs/cocos2dx.ini and a function name
2013-07-16 16:45:57 +08:00
James Chen
63bd5cf10b
closed #2307 : Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension.
...
The issue was fixed at https://github.com/cocos2d/cocos2d-x/pull/2869 .
Reported at http://www.cocos2d-x.org/boards/20/topics/25430?r=31702
2013-07-16 15:06:36 +08:00
sunzhuoshi
8cad37a8d8
Fixed javascript constant names auto-generated
2013-07-16 14:47:47 +08:00
samuele3hu
241c01bec3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-16 14:47:46 +08:00
James Chen
c813ff4b02
issue #2404 : Mark cc.Action.copy and cc.Animation.copy as deprecated methods.
2013-07-16 14:43:20 +08:00
James Chen
570240a75f
Merge pull request #3145 from jdmunro/jsb-distancesq
...
Added JSB support for ccpDistanceSQ
2013-07-15 22:42:37 -07:00
James Chen
92d6fbddd3
Merge pull request #3156 from colesbury/js_log
...
Ignore formatting specifiers in JavaScript log messages.
2013-07-15 22:36:13 -07:00
samuele3hu
e593956c38
issue #2377:Modify solution config
2013-07-16 13:26:37 +08:00
CocosRobot
c956385841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 05:10:52 +00:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
CocosRobot
5ce0e0df50
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 02:46:07 +00:00
CocosRobot
c2fc2219f5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 02:33:31 +00:00
James Chen
62b12cbe82
Updating jsb_deprecated.js.
2013-07-16 10:14:52 +08:00
James Chen
a36a4bf19b
issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods.
2013-07-16 10:02:02 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
Sam Gross
903b63abaf
Ignore formatting specifiers in JavaScript log messages.
2013-07-15 15:10:02 -04:00
CocosRobot
00052e8f4f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 09:03:47 +00:00
James Chen
a83cc0ff69
issue #2397 : Updating LUA bindings.
2013-07-15 16:25:46 +08:00
samuele3hu
80a6811f9f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-15 10:39:08 +08:00
samuele3hu
51c3ced4ba
issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples
2013-07-15 10:38:16 +08:00
jdmunro
43f5b09964
Added JSB support for ccpDistanceSQ.
2013-07-14 09:53:09 +01:00
minggo
34b60e99f1
Merge pull request #3140 from minggo/iss2393-mark_deprecated
...
Use Point, Rect and Size member functions instead of global functions
2013-07-12 08:59:27 -07:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
CocosRobot
e0ed817177
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-12 09:01:48 +00:00
CocosRobot
746a077623
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-12 08:35:39 +00:00
James Chen
c6b0882766
issue #2397 : Updating Lua bindings.
2013-07-12 15:42:14 +08:00
minggo
2d205c235f
closed #2393:fix some warnings
2013-07-12 15:29:32 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
James Chen
853a503d2f
issue #2397 : Updating bindings configuration. [Lua and JS].
2013-07-12 13:48:31 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
samuele3hu
81ad976eed
issue #2377:Remove registerNotificationHandler function
2013-07-11 16:42:11 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
samuele3hu
ff29d2b5d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-11 13:40:16 +08:00
samuele3hu
9007b9feee
issue #2377:Replace the CallFunc script Handler and repair Testlua Bug
2013-07-11 13:38:25 +08:00
samuele3hu
31d0e492c2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-10 15:05:02 +08:00
samuele3hu
cf1cbe1bd6
issue #2377:add scriptHandlerMgr and modify ActionManager.lua
2013-07-10 15:04:00 +08:00
Lee, Jae-Hong
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
Éloi Rivard
d0c34cd2ae
Removed warnings from external projects (libbox2D & liblua)
2013-07-09 15:23:19 +02:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
CocosRobot
920634d70c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-09 03:29:23 +00:00
CocosRobot
945c967409
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-09 02:19:07 +00:00
dumganhar
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
dumganhar
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
minggo
da41046e4a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2129-remove_prefix
2013-07-08 18:12:38 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
CocosRobot
bff888507a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-08 08:10:07 +00:00
minggo
cf96ec079e
Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix
...
Bug fixes. Please see the commits for details.
2013-07-08 00:40:23 -07:00
James Chen
7a7d451acf
issue #2129 : Reverting changes in cocos2d_specifics.cpp
2013-07-08 15:19:26 +08:00
James Chen
17e1b65646
issue #2129 : Adding 'FontDefinition_to_jsval' and reverting some changes.
2013-07-08 15:18:57 +08:00
minggo
b39e7e205f
issue #2129:modify pkg files
2013-07-08 11:34:31 +08:00
James Chen
db0a15b02f
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
2013-07-06 15:19:09 +08:00
minggo
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
minggo
7e56bb57c8
Merge pull request #3076 from samuele3hu/execDev
...
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-05 01:32:06 -07:00
James Chen
47c28c43c9
Updating auto jsbindings glue codes.
2013-07-05 15:34:45 +08:00
samuele3hu
bb244edae6
issue #2244:Modify a function name to createCCBReader
2013-07-05 10:25:37 +08:00
samuele3hu
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
minggo
7bcafb46a4
Merge pull request #3051 from samuele3hu/execDev
...
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
2013-07-04 03:33:12 -07:00
samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
James Chen
1755e7778f
close #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:15:48 +08:00
James Chen
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
James Chen
1d941f7c25
issue #2371 : Adding scripting/lua/luajit/mac/libluajit.a
2013-07-04 17:11:13 +08:00
James Chen
686a1021b6
issue #2371 : Updating luajit building script for Mac 64 bit. We need to build a 32bit, 64bit fat library.
2013-07-04 17:08:56 +08:00
James Chen
399a6a9a48
issue #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:07:56 +08:00
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
40effbf3bf
issue #2373:fix a compiling error
2013-07-04 13:58:50 +08:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
James Chen
cf369c0c66
Merge pull request #3052 from smshuja/pivotjoint-class
...
Pivotjoint constructor and pointQueryFirst in Space class will return false instead of invalid shape object
2013-07-03 19:21:48 -07:00
samuele3hu
c5e5c49332
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-04 09:52:28 +08:00
James Chen
7892f1ac9d
Merge pull request #3053 from dumganhar/iss2285-js-motionstreak
...
Adding MotionStreak test for TestJavascript.
2013-07-03 01:36:07 -07:00
James Chen
1a1040bdd5
[manually] Updating auto-generated JS glue codes.
2013-07-03 16:33:34 +08:00
James Chen
75d8e10994
[manual] Updating auto-generated jsbinding glue codes.
2013-07-03 16:27:26 +08:00
James Chen
ed7e208895
Revert some codes in cocos2d_specifics.cpp.
2013-07-03 16:07:06 +08:00
James Chen
72344a318e
closed #2363 : Fixing compilation errors for JS projects.
2013-07-03 14:57:29 +08:00
Shuja Shabandri
fee6a2fc87
pointQueryFirst in Space class returns invalid Shape when a shape is not found
2013-07-02 12:24:17 +04:00
Shuja Shabandri
96f8b59b9f
PivotJoint class constructor will now take 3 or 4 arguments like in html5
2013-07-02 12:20:33 +04:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
samuele3hu
fe8e30c3e0
issue #2243:Add a uniform fund in ScriptEngineProtocol
2013-07-01 15:04:14 +08:00
CocosRobot
bc6acb6411
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-29 04:35:21 +00:00
James Chen
e20de6b6aa
Reverting submodules.
2013-06-29 11:45:16 +08:00
Ricardo Quesada
b846a3060e
cocos2d-x in Mac:
...
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
2013-06-28 19:02:10 -07:00
Ricardo Quesada
9b1684b666
Merge remote-tracking branch 'cocos2d/develop' into js_mac
2013-06-27 22:15:03 -07:00
Ricardo Quesada
b0de6d0e8c
Project fixes
...
In debug: optimization is NONE, and other small fixes for Mac
2013-06-27 18:14:24 -07:00
Ricardo Quesada
b1be161e5d
updates to SpiderMonkey v22
2013-06-27 17:34:53 -07:00
Ricardo Quesada
5bb256e837
Merge branch 'develop' into js_mac
2013-06-27 10:48:58 -07:00
James Chen
0f2719fa06
issue #2340 : Checking jsc( js compiled) files first.
2013-06-27 17:20:02 +08:00
James Chen
2a688f67c9
closed #2340 : Updating spidermonkey library for iOS.
2013-06-27 16:23:00 +08:00
James Chen
9781e10476
closed #2340 : Upgrading SpiderMonkey to Firefox v22.
2013-06-27 16:10:38 +08:00
minggo
d2940bf4c7
Merge pull request #3008 from minggo/ccx_filesystem
...
remove unneeded codes when using assets manager
2013-06-26 18:53:34 -07:00
Ricardo Quesada
880a2a53f6
Merge branch 'develop' into js_mac
2013-06-26 18:38:55 -07:00
James Chen
30fa9e80d3
Merge pull request #3012 from dumganhar/ios-project-fix
...
Fixing iOS workspace project, using c99 instead of gnu99.
2013-06-26 02:55:01 -07:00
James Chen
0fdf4b97d6
Fixing iOS workspace project, using c99 instead of gnu99.
2013-06-26 17:52:54 +08:00
minggo
7e26a86e2e
issue #2329:not bind CCFileUtils private function
2013-06-26 17:36:31 +08:00
CocosRobot
b681238425
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-26 09:07:45 +00:00
James Chen
057d5c18a4
issue #2305 : sched_yield(); --> std::this_thread::yield();
2013-06-26 14:55:20 +08:00
James Chen
adf6932543
issue #2305 : Using std::thread instead of pthread for ScriptingCore.
2013-06-26 14:41:19 +08:00
Ricardo Quesada
c22ebb154d
Merge branch 'develop' into js_mac
2013-06-25 10:21:26 -07:00
Ricardo Quesada
297c63cd5e
jsbidings for mac
2013-06-25 10:19:55 -07:00
samuele3hu
46bcf6ddba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle
2013-06-25 15:22:14 +08:00
samuele3hu
3b058fe019
issue #2276 : Add OpenGL lua module
2013-06-25 14:55:57 +08:00
James Chen
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
James Chen
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
James Chen
80cb06d3f7
Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-24 10:01:57 +08:00
James Chen
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
James Chen
24d32010d6
Compilation errors in ScriptingCore.cpp fixes
2013-06-21 22:29:48 +08:00
samuele3hu
b9d79293cd
issue #2276 : Modify InitLuaScrollView to initLuaScrollView
2013-06-21 15:46:59 +08:00
samuele3hu
a6d072e679
issue #2276 : Modify LuaScrollView create method
2013-06-21 15:42:39 +08:00
samuele3hu
7d0c073215
issue #2276 : Modify vs2012 solution config
2013-06-21 14:57:17 +08:00
samuele3hu
6d71b41101
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 14:18:26 +08:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
James Chen
1608f4b286
Adding COCOS2D_DEBUG=1 for liblua project. Adding missing files in liblua project.
2013-06-21 12:07:31 +08:00
samuele3hu
a862543a4c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 10:44:03 +08:00
samuele3hu
c527fecfe3
issue #2276 : Add scrollview sample test in cocosbuilder and modify some config
2013-06-21 10:43:02 +08:00
Sam Clegg
60bfca0e45
[NaCl] Remove missing functions from lua stdlib.
...
NaCl doesn't support tmpfile() or exec() so remove
these from the lua stdlib build when building for NaCl.
2013-06-20 12:56:15 -07:00
Sam Clegg
203d2e4559
Fix compile warnings in LuaOpengl.cpp
2013-06-20 12:56:12 -07:00
James Chen
8b9090eb55
fixed #2315 : [JSB] Iterating through cc.Node children causes crash.
2013-06-20 22:51:54 +08:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00
samuele3hu
15c69563e2
issue #2276 : Add ScrollView lua binding and test sample
2013-06-20 22:39:30 +08:00
James Chen
de0e683014
Merge pull request #2949 from dumganhar/develop
...
Bug fixes for the tool to generate luabindings.
2013-06-20 05:56:50 -07:00
James Chen
1b66a98390
Bug fixes for the tool to generate luabindings.
2013-06-20 19:00:23 +08:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
CocosRobot
e651c40d66
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-20 08:25:36 +00:00
James Chen
36d82c9384
closed #2129 : Updating LuaCocos2d.cpp.
2013-06-20 15:10:44 +08:00
James Chen
9cbf513c9e
issue #2129 : jsb_CCXXX --> jsb_XXX
2013-06-20 14:58:33 +08:00
James Chen
ba1fe39d91
issue #2129 : Removing CC prefix for scripting module.
2013-06-20 14:33:59 +08:00
samuele3hu
fb075d7a7d
issue #2277 : Delete some conflict file and resolve some error
2013-06-20 11:28:16 +08:00
samuele3hu
0c4f99080b
issue #2277 : modify platform config except win32
2013-06-20 10:19:46 +08:00
samuele3hu
b818001007
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
2013-06-19 16:43:15 +08:00
samuele3hu
b48cf5997d
issue #2277 : Add OpenGL lua test samples
2013-06-19 16:40:02 +08:00
James Chen
e432496dc4
Merge pull request #2869 from xyhl515/develop
...
issue #2307 : JSB function getCPBody return type is not right.
2013-06-18 23:56:21 -07:00
CocosRobot
d418d16fa9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-19 04:51:43 +00:00
James Chen
3cfb2b86c1
issue #2300 : invoking clone(c++) method when cc.Action.copy() is called.
2013-06-19 12:09:18 +08:00
James Chen
504a9e714e
issue #2300 : copy --> clone for luabinding.
2013-06-19 12:08:26 +08:00
minggo
b9c85d87ae
Merge pull request #2896 from dumganhar/iss2129-format-codes
...
issue #2129 : New naming of member varibles, renaming m_iVar to _var.
2013-06-17 03:27:01 -07:00
samuele3hu
778708426c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
2013-06-17 14:38:08 +08:00
samuele3hu
26f1bd5171
issue #2277 : Add OpenGL lua binding
2013-06-17 14:19:00 +08:00
CocosRobot
a9559c0db6
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-16 03:08:06 +00:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
James Chen
82cd7bb01f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-14 15:41:01 +08:00
CocosRobot
96d12bc1b9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-14 06:24:17 +00:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
1f2f366ef6
Merge pull request #2868 from folecr/develop
...
fixed #2281 : When user has built with JS Debugger support ScriptingCore will handle necessary runtime changes
2013-06-12 23:52:53 -07:00
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
xyhl515
9ea4f7ea8e
fix Jsb function getCPBody return type bug
2013-06-11 11:04:29 +08:00
folecr
99266d19c5
If user has enabled debugger support, call enableDebugger() to setup the debug context, start the debugger thread, etc.
2013-06-10 11:38:31 -07:00
James Chen
88b67c7961
[Marmalade] Updating scripting/lua/proj.marmalde/lua.mkf.
2013-06-10 14:56:24 +08:00
James Chen
b0669b4f7d
[Tizen] Updating project configurations.
2013-06-09 18:56:22 +08:00
James Chen
0a8ae1e79f
[BB] Updating project configuration after adding CocoStudio runtime.
2013-06-09 15:29:51 +08:00
samuele3hu
ad0ade46ce
fix issue #2103 : modify AudioEngine module read-only
2013-06-09 11:38:18 +08:00
samuele3hu
bc699c1c1e
issue #2103 modify AudioEngine framework and CocosDenshionTest sample
2013-06-09 10:32:23 +08:00
James Chen
8e29638435
Merge pull request #2821 from samuele3hu/audioEngine
...
Encapsulating SimpleAudioEngine to AudioEngine in lua and updating CocosDenshionTest.lua
2013-06-08 02:59:30 -07:00
James Chen
32609aeeef
Merge pull request #2824 from edwardzhou/master
...
Cast variables to their own type, and print warning info if no corresponding lua callback function instead of crash
2013-06-08 00:01:55 -07:00
samuele3hu
836bfe1d3f
issue #2103 modify audioEngine table name to AudioEngine
2013-06-08 14:06:19 +08:00
Edward Zhou
00629f6cb9
1) cast variables to their own type; 2) print warning info if no corresponding lua callback function instead of crash;
2013-06-08 13:28:06 +08:00
CocosRobot
b7fdf5a0a8
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-08 03:33:22 +00:00
samuele3hu
34b4cb48ab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
2013-06-08 11:25:51 +08:00
samuele3hu
4be415cc04
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
2013-06-08 11:23:21 +08:00
CocosRobot
f036f7b881
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-08 02:48:40 +00:00
James Chen
007a33f89a
Merge pull request #2809 from edwardzhou/master
...
issue #2103 : correct the type detecting order for Lua CCBProxy::getNodeTypeName.
2013-06-07 19:37:19 -07:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
Edward Zhou
9cc351f47b
correct the type detecting order forgetNodeTypeName
2013-06-07 19:49:22 +08:00
James Chen
43e8573d8b
Merge pull request #2807 from dumganhar/master
...
[BB] Updating project configuration.
2013-06-07 03:49:10 -07:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
James Chen
fc2c068a66
[BB] Updating project configuration.
2013-06-07 18:17:07 +08:00
samuele3hu
50f44db9a8
issue #2103 add webSocket lua test sample
2013-06-07 17:02:00 +08:00
James Chen
9298492384
Updating project configuration for Blackberry port.
2013-06-07 16:52:49 +08:00
samuele3hu
16a34b0da3
issue #2103 add webSocket lua test sample
2013-06-07 16:51:50 +08:00
samuele3hu
a2cf4933c4
issue #2103 add webSocket lua test sample
2013-06-07 14:57:36 +08:00
samuele3hu
f58d0a04aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 12:57:04 +08:00
samuele3hu
c021f700d3
issue #2103 add webSocket lua test sample
2013-06-07 12:54:39 +08:00
folecr
4a9504717b
Fix flags for debugger server socket
...
* Works on iOS and Android
2013-06-07 10:55:44 +08:00
James Chen
736fe3c63a
Merge pull request #2792 from folecr/jsdb
...
Fix flags for debugger server socket
2013-06-06 19:45:33 -07:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
CocosRobot
919d24d5b2
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-07 01:41:52 +00:00
folecr
c01c9c8350
Fix flags for debugger server socket
...
* Works on iOS and Android
2013-06-06 07:35:54 -07:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
CocosRobot
42f3b3ccfa
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-06 08:33:16 +00:00
James Chen
8c3b1899bb
Removing unreadable print in CCBReaderLoad.lua.
2013-06-06 14:23:30 +08:00
James Chen
ba295d416f
[Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master]
2013-06-06 10:19:46 +08:00
James Chen
3c69a17752
[Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey.
2013-06-06 10:12:44 +08:00
CocosRobot
8c6d6e9ef8
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-05 13:01:25 +00:00
James Chen
a5263673fb
Fixing compilation errors on Android.
2013-06-05 19:56:23 +08:00
minggo
271d1fa55a
Merge pull request #2772 from minggo/lua-win32
...
issue #2103:make HelloLua & TestLua work on vs2010
2013-06-05 03:15:09 -07:00
minggo
cdf09c04ea
issue #2103:make HelloLua & TestLua work on vs2010
2013-06-05 17:43:49 +08:00
CocosRobot
7e866d8060
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-05 08:43:03 +00:00
samuele3hu
75b26d9cdf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
2013-06-05 15:19:01 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
James Chen
5d92a98287
fixed #2143 : cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
2013-06-05 14:55:13 +08:00
James Chen
d0c0d303f5
fixed #2143 : cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
2013-06-05 14:31:07 +08:00
CocosRobot
0bc9c19e76
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-04 10:36:03 +00:00
CocosRobot
be08d6c81d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-04 05:23:21 +00:00
James Chen
a597323734
Merge pull request #2739 from dumganhar/iss2247-proxy-function-develop
...
fixed #2247 : Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes].
2013-06-03 22:02:45 -07:00
James Chen
6cc3ba9a5d
fixed #2247 : Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes].
2013-06-04 13:02:02 +08:00
James Chen
64dec0df56
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-04 13:01:50 +08:00
James Chen
58205ff322
fixed #2247 : Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes].
2013-06-04 12:53:42 +08:00
CocosRobot
be8ed6e3a4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-04 03:20:16 +00:00
James Chen
bba2d2bbdc
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-03 22:31:24 +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
samuele3hu
db7a2a1290
issue #2103 modify some compile setup and delete some deprecated lua function
2013-06-03 16:07:06 +08:00
CocosRobot
8912ff963d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-03 07:49:49 +00:00
CocosRobot
bfbbb7bbfd
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-03 07:35:56 +00: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
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
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
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
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
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
7b25d61824
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into websocket
2013-06-01 23:33:01 +08:00
folecr
fa8b2005c3
Spidermonkey for Android/x86
2013-06-01 23:28:37 +08:00