garfield_ho
|
bac83f3740
|
Cancel the onSubThreadEnded callback,because _ws may be deleted in the onClose callback.
|
2013-12-02 17:19:52 +08:00 |
signmotion
|
41daad30fa
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-11-29 19:44:03 +02:00 |
signmotion
|
0d9cd9784b
|
* Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float').
|
2013-11-23 07:23:06 +02:00 |
Ricardo Quesada
|
b6ddc6d048
|
Uses std::unordered_map<> instead of std::map<>
and more fixes.
|
2013-11-21 13:43:59 -08:00 |
James Chen
|
91a57c614d
|
closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes.
|
2013-11-19 00:19:57 +08:00 |
minggo
|
1e15071dc7
|
remove makefiles
|
2013-11-11 17:29:48 +08:00 |
James Chen
|
f3c40a3e7a
|
issue #3113: 32Bit fix and 13.10 32bit complication is ok.
|
2013-11-06 14:54:35 +08:00 |
James Chen
|
9be8ca3714
|
[cmake] output lib to root/lib
|
2013-11-04 21:03:08 +08:00 |
James Chen
|
daa91ad413
|
[CMake] Update library dependency.
|
2013-11-04 21:03:07 +08:00 |
James Chen
|
922924e1ab
|
TestCpp is ok.
|
2013-11-04 21:03:07 +08:00 |
samuelhu
|
663b27d1e7
|
#3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 18:06:02 +08:00 |
samuelhu
|
70082ddc29
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 17:54:35 +08:00 |
minggo
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +08:00 |
minggo
|
6a664d480a
|
issue #2905:samples build ok on linux
|
2013-10-22 18:01:56 +08:00 |
Dhilan007
|
232f0d598b
|
issues #2905:add new vs project
|
2013-10-21 22:21:11 +08:00 |
minggo
|
8f9756f030
|
issue #2905:TestJavascript build ok on Android
|
2013-10-17 11:28:57 +08:00 |
minggo
|
91eada6c1e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder
|
2013-10-16 16:50:46 +08:00 |
minggo
|
8f7a489a4d
|
issue #2905:make cocostudio and gui flat
|
2013-10-16 16:48:39 +08:00 |
James Chen
|
6fba0dd5db
|
issue #2905: [iOS Mac] TestJavascript works now.
|
2013-10-16 15:43:59 +08:00 |
minggo
|
6fc2be62f5
|
issue #2905: testcpp bild ok on Android
|
2013-10-15 18:00:03 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |