05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
234c902630
fixing cmakelist after merge
2014-05-15 22:26:41 +09:00
d7f1af876a
fixed network link library curl in win32 case : libcurl_imp
2014-05-10 10:07:57 +09:00
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
42c374157d
CC_CALLBACK_2 not std::bind directly
2014-04-25 17:32:21 +08:00
5cc483276b
use new ccHttpRequestCallback.
2014-04-25 17:15:57 +08:00
40e6288ac7
[NEW]: update HTTPClient to use C++11 callbacks
...
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
2014-04-13 01:06:04 +04:00
1928a0cb07
= [FIX]: HTTPClient should not report 2xx status codes as errors!
2014-04-09 11:07:51 +04:00
6970955378
added wp8 support files and projects
2014-03-28 15:32:52 -07:00
db8efd32f7
fixed reserved word DELETE in wp8 compiler
2014-03-28 11:26:41 -07:00
8f95e27dc7
Merge pull request #5943 from koowolf/websocket_fix
...
closed #4542 : WebsocketTest crashes on win32, it may delete mutex which is still being locked
2014-03-25 16:28:18 +08:00
c37584ee5c
closed #4542 : fix crash in win32(delete mutex while still lock)
2014-03-25 16:14:21 +08:00
ae2027ea53
Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
2014-03-24 17:59:44 +08:00
e075b82dfe
tab -> 4 spaces, whitespace cleanup.
2014-03-24 17:58:35 +08:00
b6a175457c
Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923
2014-03-24 17:55:43 +08:00
ba37c07053
[add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code
...
-update static connect method to match JS API, kept original method but marked deprecated
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2014-03-21 11:45:14 -04:00
7ab639ec0f
fix lots compile warnings
2014-03-20 16:24:55 +08:00
629c6b9a89
fixed #3868 . Add guard check to send method of HttpClient
2014-03-04 10:07:49 +08:00
757425c54b
issue #4165 : Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.
2014-03-03 11:00:30 +08:00
46c93f07ad
fixed #4103 . fix crash when websocket close
2014-02-28 17:32:54 +08:00
d4b9544365
fixed #3868 . when the singleton destoryed, the cocos thread may later than that which will cause the s_responseQueue to be nil.
2014-02-27 11:25:44 +08:00
e7de92a54f
fixed #3868 . when singleton delted, it should dispatch callbacks.
2014-02-26 10:59:56 +08:00
0658355772
Merge pull request #4415 from HoGarfield/WsThreadHelper
...
closed #4103 : Potential crash when websocket connection closes
2014-02-20 20:44:55 +08:00
e9fa65b6f4
closed #4101 : No callback is invoked when websocket connection fails
2014-02-20 19:29:53 +08:00
dc6839d692
Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232
2014-02-20 19:27:17 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
4272d4fa61
Linux websockets support.
2014-02-13 00:53:51 +01:00
d8b1f78039
Update WebSocket.cpp
...
bufix: when connecting fail, libwebsocket_client_connect() will return NULL, and onSocketCallback() will not be called, so we need trigger WS_MSG_TO_UITHREAD_ERROR here.
2014-01-26 15:59:14 +08:00
b6cd40521e
fix link error on vs.
2014-01-25 19:41:20 +08:00
d0e3a81d18
fix compiling error cause by undefined ssize_t on vs.
2014-01-21 09:52:43 +08:00
432534d857
#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.
2014-01-20 17:31:12 +08:00
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
cfbceb0e22
Fixes compilation issues on Linux
2014-01-16 21:49:14 -08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
f87af9e998
fix linux build
2014-01-09 19:49:11 +08:00
2f4b094598
Merge pull request #4 from cocos2d/develop
...
update
2014-01-09 02:56:21 -08:00
f8d369248b
closed #3605 : Websocket doesn't support send/receive data which larger than 4096 bytes, renames member variables to follow cocos2d-x coding guide line.
2014-01-09 15:18:06 +08:00
480a9277da
fix WebSocket cannot send/receive more than 4096 bytes of data
2014-01-09 13:29:56 +08:00
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
2a3481f20c
Moves temp files to CURRENT_BINARY_DIR.
2014-01-06 23:44:36 -08:00
d4c1aa92d5
add copyrights for 2014, in folders other then 2d.
2014-01-07 11:47:11 +08:00
d345139a08
fix compiling errors
2014-01-02 21:53:18 +08:00
f2b1a3cc83
Merge pull request #4793 from minggo/namespace
...
network -> cocos2d::network
2014-01-02 00:38:50 -08:00
minggo