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
CocosRobot
49780e3fcb
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-28 10:32:21 +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
CocosRobot
8a56b1627d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-21 07:36:03 +00:00
James Chen
1128f9dfc6
Merge pull request #2564 from folecr/jsdb
...
fixed #2187 : JavaScript debugger improved and bugfixed.
2013-05-21 00:31:51 -07:00
CocosRobot
c454fe62df
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-21 06:58:43 +00:00
James Chen
66e631fd35
Merge pull request #2590 from smshuja/master
...
fixed #2186 : New PivotJoint will now accept 3 or 4 parameters like in html5 version.
2013-05-20 20:20:13 -07:00
folecr
554213d0eb
Match CocosPlayer's JSB_DEBUGGER_PORT
2013-05-20 14:30:41 -07:00
folecr
cf328b5592
Set socket option SO_NOSIGPIPE for IOS
2013-05-20 14:30:41 -07:00
folecr
95487da933
clearBuffers() and JSBDebug_BufferWrite() will both immediately write data in the output buffer to the socket.
...
* Note : comments in the code say that locking is not an issue. This should be reviewed.
2013-05-20 14:30:41 -07:00
folecr
923d12fa48
Clean up debugger server
...
* Remove perpetual innner while loop
* Macro to TRACE_DEBUGGER_SERVER
2013-05-20 14:30:40 -07:00
folecr
e0708f496a
New debugger interface
2013-05-20 14:30:40 -07:00
James Chen
db4ee295ee
fixed #2092 : Adding macro to make sure header file to be included only once.
2013-05-20 21:13:55 +08:00
James Chen
8bdcda7ef2
issue #2092 : Bug fix in MinXMLHTTPRequest::send
2013-05-20 21:13:11 +08:00
James Chen
d402b349e2
issue #2092 : Updating win32 project configuration.
2013-05-20 21:12:25 +08:00
James Chen
9e9b9ca831
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue2092-XMLHttpRequest
2013-05-20 20:55:29 +08:00
Shuja Shabandri
be88ba45cd
PivotJoint will now take 3 or 4 arguments like in html5
2013-05-20 14:54:34 +04:00
James Chen
5254d3a702
fixed #2092 : GC issues fix in XMLHttpRequest.
2013-05-20 17:47:47 +08:00
James Chen
55be2f004c
issue #2092 : Removing unused code in XMLHttpHelper.h
2013-05-20 17:46:32 +08:00
minggo
ad45c24c9a
Merge pull request #2574 from minggo/AssetsManager-asynchronization
...
Fix compiling error of AssetsManager project on windows
2013-05-20 01:36:35 -07:00
James Chen
9d385dbd71
Merge branch 'XMLHttpRequest_cchttpclient' of https://github.com/zynga/cocos2d-x into zynga-XMLHttpRequest_cchttpclient
2013-05-20 14:02:55 +08:00
Shuja Shabandri
32498521b4
pointQuery first returns invalid instance of Shape
...
Signed-off-by: Shuja Shabandri <shuja@shabandri.com>
2013-05-19 18:39:54 +04:00
minggo
b118cf6d72
issue #1859:fix compiling error of ScriptingCore.cpp
2013-05-17 09:57:55 +08:00
Carsten Sandtner
2b2d7cb665
Merge branch 'master' into XMLHttpRequest_Demo
...
# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
Update AUTHORS
Update AUTHORS
fixed #2155 : Resolve the bug of callback methods in plugin.
Update AUTHORS
fix a warning caused by member variables initialization order in constructor
it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
initWithStringShadowStroke() renamed to initWithString()
comment fixed
fix alignent problem when rendering text with shadow
fix a problem with float stroke size
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
CCLabelTTF C++ test fixed
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
initWithStringAndTextDefinition() changed method's signature
no more bingins for ccTextDefinition
class renamed and moved to ccTypes.h
CCTextDefinition is passed now by pointers
bindings for CCTextDefinition
ccTextDefinition becomes CCTextDefinition
changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
...
2013-05-16 10:12:19 +02:00
Carsten Sandtner
6e43618004
MinXMLHttpRequest extends from CCObject
...
Added MinXMLHttpRequest to Android.mk for Bindings
Added newline at header as compiler threw a warning.
2013-05-16 10:11:00 +02:00
carlo morgantini
3b50ffe5ba
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
2013-05-15 16:37:08 -07:00
carlo morgantini
315999edad
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
2013-05-15 16:37:08 -07:00
Carsten Sandtner
370a540352
fixed possible memory holes.
2013-05-15 15:15:23 +02:00
Carsten Sandtner
4cb3001fc6
Fixed check for arguments at xhr.send()
2013-05-15 13:57:25 +02:00
Carsten Sandtner
919c347c6d
changed method to strip newlines as Android complained.
2013-05-14 17:21:27 +02:00
Carsten Sandtner
a7e0a83a2e
remove initialization of withCredentialsValue = flase as iso c++ complains it.
2013-05-14 15:50:56 +02:00
Carsten Sandtner
6449d79d60
Fixed some typo
2013-05-14 14:16:22 +02:00
Carsten Sandtner
32d2ee8104
Deactivated Debugging flag.
2013-05-14 13:19:32 +02:00
Carsten Sandtner
1b80208329
Tidied up comments
2013-05-14 12:03:58 +02:00
Carsten Sandtner
2e68188321
Some code cleaning
2013-05-14 11:36:48 +02:00
Carsten Sandtner
915265dd34
Merge branch 'master' into XMLHttpRequest_cchttpclient
...
# By Sam Clegg (2) and James Chen (1)
# Via James Chen
* master:
Update AUTHORS [ci skip]
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
Log assert messages
2013-05-14 11:19:46 +02:00
James Chen
99664b5998
Merge pull request #2391 from sbc100/log_asserts
...
fixed #2152 : Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
2013-05-13 19:56:28 -07:00
Carsten Sandtner
d61ee643a9
changed xmlhttprequest to use cchttpclient instead of raw curl. XHR is now async.
2013-05-13 16:57:55 +02:00
Carsten Sandtner
e86f11e36a
Using CChttpClient instead of curl.
2013-05-10 15:00:03 +02:00
Carsten Sandtner
65eb73f81c
activate XMLHttpRequest in bindings.config
2013-05-08 13:13:21 +02:00