James Chen
f16a64cf4a
issue #2404 : Compilation error fixes.
2013-07-25 11:56:09 +08:00
Thomas Perl
62958c8321
Qt5 build support (initial work)
2013-07-24 20:18:42 +02:00
minggo
99949331b1
fix error and compilings error in templates
2013-07-24 17:27:29 +08:00
samuele3hu
8e0a3b16a1
issue #2429:LuaWebSocket supports sending binary string passed by lua
2013-07-24 15:42:32 +08:00
samuele3hu
5b888d44e4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-24 15:34:32 +08:00
samuele3hu
ff980477d7
issue #2429:LuaWebSocket supports passing binary string buffer to c++
2013-07-24 15:33:37 +08:00
minggo
ff0cbb9d0b
Merge pull request #3232 from samuele3hu/TestSample
...
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-23 23:33:28 -07:00
samuele3hu
bf692c8fde
issue #2426:Modify tab and spaces
2013-07-24 12:03:54 +08:00
samuele3hu
a52bab7a66
issue #2426:Modify coding style
2013-07-24 11:51:24 +08:00
James Chen
4cc3f63507
closed #2427 : Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
2013-07-24 11:51:12 +08:00
CocosRobot
88211a401a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-24 03:06:37 +00:00
samuele3hu
45cc09c6cc
issue #2426:Modify tab and spaces
2013-07-24 10:32:59 +08:00
samuele3hu
4f1a46136a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-24 10:15:39 +08:00
samuele3hu
e9df175e9a
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-24 10:15:16 +08:00
Ricardo Quesada
1f37d4d00a
More best practices fixes and other bug fixes
...
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
CocosRobot
18248b0e85
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-23 14:32:59 +00:00
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
James Chen
9b0f2a6e33
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol
2013-07-22 17:25:29 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
minggo
8660543d77
Merge pull request #3198 from samuele3hu/deprecatedfunc
...
issue #2404:Move deprecated functions in Lua
2013-07-22 00:27:06 -07:00
CocosRobot
2030d9f94b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-22 06:54:13 +00:00
samuele3hu
510a5912fd
issue #2404:Add many functions to Deprecated.lua
2013-07-22 13:42:58 +08:00
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