CocosRobot
|
bff888507a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-08 08:10:07 +00: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 |
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
|
04465622b7
|
issue #2129:remove prefix of types in ccTypes.h
|
2013-07-05 16:49:22 +08:00 |
James Chen
|
47c28c43c9
|
Updating auto jsbindings glue codes.
|
2013-07-05 15:34:45 +08:00 |
minggo
|
40effbf3bf
|
issue #2373:fix a compiling error
|
2013-07-04 13:58:50 +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 |
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 |
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 |
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 |
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 |
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
|
297c63cd5e
|
jsbidings for mac
|
2013-06-25 10:19:55 -07: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 |
James Chen
|
8b9090eb55
|
fixed #2315: [JSB] Iterating through cc.Node children causes crash.
|
2013-06-20 22:51:54 +08:00 |
CocosRobot
|
e651c40d66
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-20 08:25:36 +00: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 |
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 |
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 |
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 |
CocosRobot
|
96d12bc1b9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-14 06:24:17 +00: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 |
CocosRobot
|
b7fdf5a0a8
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-08 03:33:22 +00:00 |
CocosRobot
|
f036f7b881
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-08 02:48:40 +00: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 |
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 |
CocosRobot
|
42f3b3ccfa
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-06 08:33:16 +00: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 |
CocosRobot
|
7e866d8060
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-05 08:43:03 +00: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 |
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 |
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 |
James Chen
|
8e15cdf5fd
|
WS_ERROR -> ERROR, WS_STATE -> STATE.
|
2013-06-01 19:51:10 +08:00 |
James Chen
|
d5f45466a9
|
issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive.
|
2013-06-01 07:58:23 +08:00 |
James Chen
|
669066b954
|
fixed #1647: Adding missing files.
|
2013-05-31 23:25:01 +08:00 |
James Chen
|
05a88c89dc
|
fixed #1647: Adding WebSocket support for Cpp and JSB.
|
2013-05-31 23:13:03 +08:00 |
folecr
|
c7ce3d10d3
|
Spidermonkey for Android/x86
|
2013-05-30 17:18:17 -07:00 |
CocosRobot
|
49780e3fcb
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-05-28 10:32:21 +00:00 |
CocosRobot
|
0f64be0ce4
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-05-28 10:19:13 +00:00 |
CocosRobot
|
bad653a900
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-05-24 09:31:15 +00:00 |
Carsten Sandtner
|
820983f40c
|
Fixed setHeader while Android had problems with stringstreams.
|
2013-05-23 14:37:32 +02:00 |
CocosRobot
|
41c7adb532
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-05-23 09:40:35 +00:00 |
James Chen
|
974546557d
|
fixed #2214: Upgrading Spidermonkey to Firefox v21
|
2013-05-22 17:31:07 +08:00 |
James Chen
|
e21926edb8
|
fixed #1644: Passing NULL parameter to ccdictionary_to_jsval will cause crash.
|
2013-05-22 11:56:47 +08:00 |
CocosRobot
|
552082d491
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-05-21 10:36:26 +00:00 |