pktangyue
652f679d50
override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class
2013-07-15 20:13:30 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
James Chen
93bb7bcb31
friend SIOClientImpl --> friend class SIOClientImpl, that will be clearer.
2013-07-13 19:26:46 +08:00
James Chen
4b2165e648
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
2013-07-13 19:24:41 +08:00
James Chen
8409e2942f
Fixing warning in SocketIO.cpp
2013-07-13 19:20:11 +08:00
Chris Hannon
8791c8119e
task: hiding non-interface methods in the SsocketIO and SIOClient classes, adding SIOClientImpl as friend to access
2013-07-12 13:05:15 -04:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
58fe3c7563
closed #2393 : fixed conflicts
2013-07-12 15:07:44 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
minggo
bb758df0d0
issue #2393:mark ccp as deprecated
2013-07-12 14:11:55 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +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
Chris Hannon
126ebb888c
Implements a socket.io client extension, adds a test case and updates the android makefiles.
...
Contains the following tasks:
-initial socket.io extension commit
-sioclientimpl subclasses websocket:delegate to respond to websocket events
-implement static connect methods and basic client creation
-move SocketIO class files into correct extension folder (network)
-create SocketIO test in TestCpp
-update project references
-add missing static modifier to connect method
-implement basic test methods
-update extensions tests with SocketIO test entry
-implement basic handshake and opensocket methods for SocketIO
-add Delegate class to handle callbacks, implement virtual Delegate methods in test
-implement socket and client registries for lookup when connecting to hosts and endpoints
-connect delegate onOpen method by separating impl creation from connection
-update test to demonstrate onOpen callback
-create send and emit methods, move SIOClient into header file, add send and emit methods to test
-implement basic socket.io message parsing
-improve logging for events and messages
-add logic to pull event name from payload
-schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety
-add onConnect handler to to catch socket.io onconnect vs websocket onopen
-add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects
-modify SIOClientImpl to track _uri for easier lookup in registries
-connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code
-create SIOEvent callback type, implement event registry in clients, add test for event registration and callback
-update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed
-check for connect before sending or emitting in the client, cleanup some codes
-change connect logic to reuse existing socket connections instead of opening a new one
-implements get and set Tag methods for clients for easy reference
-improve endpoint handling, add endpoint tests to test layer
-additional error handling within socket disconnect error and failure to open connection
-fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method
-add disconnect and onClose handlers to client so that onClose is called in the delegate
-add disconnect test methods to test layers
-change c-style casts to static_casts when using a CCDICT_FOREACH
-remove some unneeded namespace completion
-add usage documentation
-add handling for disconnect from server, cleanup some codes
-update comments and documentation in the socketiotest
-update includes so the NDK doesn't complain when compiling with c++11
-add socketio.cpp and test.cpp to the android makefiles
-update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2013-07-11 17:41:42 -04:00
James Chen
093d9a507c
closed #2396 : indentation fix.
2013-07-11 17:07:41 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
pktangyue
8f7d9093c9
Merge remote-tracking branch 'origin/develop' into patch1
2013-07-11 16:08:46 +08:00
James Chen
5727d7099b
issue #2395 : Scale9Sprite's default anchor point is center now.
2013-07-11 13:59:57 +08:00
James Chen
b2c0d17aeb
Merge pull request #3122 from dumganhar/iss2389-http-cookie
...
closed 2389: Adding cookie support for HttpClient
2013-07-10 18:37:29 -07:00
James Chen
3af6f6fe58
enableCookies is static method now
2013-07-10 15:46:01 +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
James Chen
3f57275848
issue #2389 : Adding cookie support for HttpClient
2013-07-10 11:37:39 +08:00
Éloi Rivard
e6354bbf0a
Various linux eclipse projects compilation fixes
2013-07-09 15:23:19 +02:00
James Chen
5eb849a789
closed #2381 : ControlSwitch was displayed ugly when adding more than one switch.
2013-07-09 17:23:13 +08:00
James Chen
596c4c3cf2
issue #2387 : Using static_cast instead of C style cast while iterating CCDictionary.
2013-07-09 14:40:43 +08: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
James Chen
976d4ad11e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
cocos2dx/actions/CCActionInterval.cpp
cocos2dx/cocoa/CCDictionary.cpp
samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
2013-07-09 09:48:41 +08:00
Ricardo Quesada
9fe9341646
From C++ best practices
...
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07: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
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
pktangyue
3e5c62f905
fix CCScale9Sprite CapInsets bug for rotated sprite frame
2013-07-08 17:00:27 +08:00
James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +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
samuele3hu
ec2f5376f1
issue #2244:Add namespace to some enums
2013-07-05 16:05:38 +08:00
James Chen
ec902c3550
issue #2373 : Adding missing overload const getter functions.
2013-07-05 15:08:52 +08:00
James Chen
d2746bbe90
issue #2373 : Removing inline for virtual function. Adding more const getter functions.
2013-07-05 15:08:52 +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
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
1d94ce12a2
Merge branch 'const_love' of https://github.com/ricardoquesada/cocos2d-x into const_love
2013-07-04 10:29:56 +08:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
YangLe
18b662c942
fix CCScale9Sprite for rotated sprite frame
...
fix Issue #1145
2013-07-04 00:03:44 +08:00
samuele3hu
ec801ae89d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-02 15:29:19 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
Ricardo Quesada
b434f7332a
Removes #if from header class
...
preventing ugly bugs
2013-07-01 11:52:04 -07:00
James Chen
8b1325b544
Merge pull request #3034 from Squallium/develop
...
Added CocosDenshion dependency to libextension project
2013-07-01 01:54:02 -07:00
Squallium
c3e043ef20
Added CocosDenshion dependency to libextension project
2013-06-30 21:38:06 +02: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
5bb256e837
Merge branch 'develop' into js_mac
2013-06-27 10:48:58 -07:00
Ricardo Quesada
ccd9cb486c
JS Tests compiles and links in Mac
...
...but it doesn't work yet due to a bug with the touch events :-(
2013-06-27 00:58:46 -07:00
James Chen
00d6510a0d
Merge pull request #3014 from wtyqm/develop
...
close #2338 : fix sub ccb node resource root path bug
2013-06-26 20:49:00 -07:00
wtyqm
ab36c433fa
fix sub ccb node resource root path bug
...
When load sub ccb type node , create a new ccbreader from parent
ccbreader. Should copy ccbRootPath from parent, otherwise, load
resource will fail if sub ccb node resource use special path
2013-06-27 09:41:38 +08:00
Justin Hawkwood
9067918d73
Set textview_hidden to true on init
2013-06-26 13:44:49 -07:00
minggo
72937aa6d8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2305-replace-pthread
2013-06-26 14:47:31 +08:00
James Chen
ad7d606b48
Merge pull request #2703 from sergey-shambir/linux_qmake
...
close #2332 : [Linux] Adding project part for QtCreator.
2013-06-25 21:57:20 -07:00
James Chen
ae737365d7
issue #2305 : Sleep(50) on Win32, usleep(50000) on unix --> std::this_thread::sleep_for(std::chrono::milliseconds(50));
2013-06-26 11:34:04 +08:00
James Chen
ea36707c57
issue #2305 : Using the old logic of "wait".
2013-06-26 11:10:19 +08:00
James Chen
3ad11cc63a
issue #2305 : Fixing a bug that passing wrong mutex parameter to "wait".
2013-06-26 11:06:13 +08:00
James Chen
f2ab73c533
issue #2305 : Reverting to use lock and unlock for HttpClient.
2013-06-26 10:45:46 +08:00
James Chen
8a0046a139
issue #2305 : Fixing a crash when error is triggered in WebSocket. Using std::lock_guard to replace lock and unlock manually.
2013-06-26 10:11:10 +08:00
James Chen
79962cdf5d
issue #2305 : Using c++11 std::thread instead of pthread for HttpClient class.
2013-06-26 10:11:10 +08:00
James Chen
cfcc39d924
Merge pull request #2987 from dumganhar/iss2305-std-thread
...
issue #2305 : Using c++11 thread instead of pthread for WebSocket.
2013-06-24 21:54:09 -07:00
James Chen
3b9fa904ba
issue #2305:use c++11 thread instead of pthread for WebSocket.
2013-06-25 12:51:44 +08:00
Ricardo Quesada
ef6f67902f
Adds mac workspace
...
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
2013-06-24 18:04:05 -07:00
James Chen
d9985d07ce
Merge pull request #2981 from dumganhar/iss2325-ios-workspace
...
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 03:33:36 -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
minggo
f5ed772c22
issue #2305:remove unneeded comment
2013-06-24 14:11:30 +08:00
minggo
141105ac69
issue #2305:remove unneeded comment
2013-06-24 14:03:45 +08:00
minggo
e5a122ea39
issue #2305:use c++11 thread instead of pthread in AssetsManager
2013-06-24 13:59:41 +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
f1eaabb09f
issue #2322 : Fixing a warning in extensions/CCArmature/utils/CCDataReaderHelper.cpp.
2013-06-23 17:23:14 +08:00
zcgit
912a52a677
a potential bug in ScrollView
...
check _touches in setTouchEnabled
2013-06-21 18:00:56 +08:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
samuele3hu
35f0b07aa6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 11:16:46 +08:00
James Chen
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
samuele3hu
a862543a4c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 10:44:03 +08:00
James Chen
2a715ec3cf
Merge pull request #2956 from ricardoquesada/cc_namespace_obj
...
issue #2129 : Re-adds 'CC' prefix to objective-c classes.
2013-06-20 19:10:01 -07:00
Ricardo Quesada
578bce4bc8
Re-adds 'CC' prefix to objective-c classes.
...
And also makes it compile on Mac, which was broken
2013-06-20 17:46:22 -07:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
Sam Clegg
3686e8245f
[NaCl] Fix sigslot.h compilation on NaCl ARM
2013-06-20 10:54:11 -07:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00
samuele3hu
15c69563e2
issue #2276 : Add ScrollView lua binding and test sample
2013-06-20 22:39:30 +08:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
cb67ed0227
issue #2129 : Removing CC prefix for extension module.
2013-06-20 14:15:53 +08:00
James Chen
e281fdfa73
issue #2129 : Renaming EditBoxImplIOS to EditBoxImplIOS_objc since it will be conflict with CCEditBoxImplIOS after removing CC prefix.
2013-06-20 13:07:09 +08:00
James Chen
78a5dff06d
issue #2129 : Resetting the namespace of armature to 'cocos2d::extension::armature'.
2013-06-20 12:59:32 +08:00
James Chen
1ea7fd2594
Merge pull request #2904 from edwardzhou/master
...
closed #2312 : WebSocket url parse error for 'ws://domain.com/websocket' pattern
2013-06-19 05:04:11 -07:00
minggo
ccbd0a831d
issue #2304:use function to simplify acceremeter call back
2013-06-19 16:10:53 +08:00
Ricardo Quesada
159ef1ec68
clone() doesn't use copy constructor
...
... and other bug fixes
2013-06-18 15:06:53 -07:00
Ricardo Quesada
d35cc3b0fa
Merge branch 'develop' into clone_reverse_fixes
...
Conflicts:
cocos2dx/actions/CCAction.cpp
cocos2dx/actions/CCActionEase.cpp
cocos2dx/actions/CCActionGrid.cpp
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/actions/CCActionInterval.cpp
scripting/javascript/bindings/generated
2013-06-18 09:59:34 -07:00
James Chen
2c0cc603d1
Merge branch 'master' into develop
...
Conflicts:
extensions/cocos-ext.h
2013-06-18 10:46:25 +08:00
Edward Zhou
53be008dcf
fix url parse error for 'ws://domain.com/websocket' pattern
2013-06-17 18:28:12 +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
James Chen
ccb67cbcb4
Template fix for iOS Template.
2013-06-17 15:54:12 +08:00
Ricardo Quesada
71ea3c7a3c
Fixed headers. Compiles but it doesn't link yet.
...
Many methods not implemented yet.
2013-06-15 18:54:34 -07:00
flaming0
bd0c40026f
Fixed windows build (added CCComponent, CCArmature files to win32 project)
2013-06-16 00:34:23 +04:00
Ricardo Quesada
e40adb7ae7
EaseActions and more
...
Added more reverse() const
2013-06-15 12:38:32 -07:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
minggo
3543ee2ac3
issue #2284 : add some files into extensions linux project
2013-06-14 14:55:46 +08:00
minggo
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
0de1a4ebd8
Merge pull request #2877 from pyrasis/tizen_2.1
...
Support Tizen device
2013-06-12 22:56:23 -07:00
sunzhuoshi
edda79c703
Added config macro for "spine" extension
2013-06-12 14:12:43 +08:00
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
Ricardo Quesada
83b43ab93e
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
...
Handy macros for callbacks.
Instead of:
std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
CALLBACK_1(func_ptr, instance)
And also removes more warnings from the tests
2013-06-11 16:30:05 -07:00
Rene Klacan
f31a258c01
Merge pull request from cocos2d/develop
2013-06-11 01:06:12 +02:00
minggo
bb583996d0
define and export LCC_ENABLE_CHIPMUNK_INTEGRATION for extensions anroid project
2013-06-10 22:19:59 +08:00
James Chen
6f01085a01
[emscripten] Updating extension makefile.
2013-06-10 20:53:33 +08:00
James Chen
cbcc2022cf
[Extension] RENDER_H --> CC_ARMATURE_GLES_RENDER_H
2013-06-10 14:17:16 +08:00
James Chen
a14df8d28d
issue #2271 : Fixing some memory leaks.
2013-06-10 11:43:43 +08:00
James Chen
b0669b4f7d
[Tizen] Updating project configurations.
2013-06-09 18:56:22 +08:00
James Chen
6dcaca78d0
[jsoncpp] Value::null -> Value::jsonNull to avoid conflict when compiling with clang++ or high version of gcc since null is defined as a key word.
2013-06-09 18:56:22 +08:00
James Chen
920418c21f
Crash fix in CCControlColurPickerTest.
2013-06-09 16:38:37 +08:00
James Chen
1cc8f94ec7
Crash fix in CCControlColurPickerTest.
2013-06-09 16:37:15 +08:00
James Chen
0a8ae1e79f
[BB] Updating project configuration after adding CocoStudio runtime.
2013-06-09 15:29:51 +08:00
James Chen
13dd26c85b
[BB] Fixing compilation errors for CocoStudio runtime.
2013-06-09 15:29:51 +08:00
minggo
1a0789cd11
issue #2271 : fixed memory leak of WebSocket
2013-06-09 15:08:10 +08:00
minggo
c4ab295846
issue #2271 : fixed memory leak of CCControlColorPicker
2013-06-09 15:07:58 +08:00
minggo
7a1175601e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-06-09 14:51:57 +08:00
minggo
81b579c032
issue #2271 : fixed memory leak of WebSocket
2013-06-09 14:50:51 +08:00
minggo
f00baac00d
issue #2271 : fixed memory leak of CCControlColorPicker
2013-06-09 14:36:16 +08:00
James Chen
3067b71ea2
fixed #2270 : Adding Armature(CocoStudio runtime) support. Enabling exceptions for marmalade.
2013-06-09 10:54:55 +08:00
James Chen
56f5e9ca32
Changing namespace Json to CSJson to avoid conflicts.
2013-06-09 10:50:03 +08:00
yinkaile
af819c6db5
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
2013-06-08 22:09:34 +08:00
yinkaile
d29931dc4f
1.add hd resource
...
2.remove zobie resource
3.support frame event
2013-06-08 22:08:22 +08:00
James Chen
646d0aa1cf
[LINUX] Fix a compilation error in spine/extension.cpp.
2013-06-08 17:22:49 +08:00
James Chen
ab15cd8c7b
[CCArmature] Updating CCDatas.h. Why to name it 'CCDatas.h" ?????
2013-06-08 16:45:25 +08:00
James Chen
aec713ac4e
[CCArmature] Ignoring a warning of 'delete-non-virtual-dtor' for linux build.
2013-06-08 16:44:37 +08:00
James Chen
93ecfbbf7e
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix
2013-06-08 15:42:41 +08:00
James Chen
d3253dd161
Fixing compilation errors for native client port.
2013-06-08 15:28:58 +08:00
yinkaile
f2021982f4
Change CCAnimation to CCArmatureAnimation
2013-06-08 11:16:17 +08:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
yinkaile
a959c621f2
Standardize code
2013-06-07 21:00:45 +08:00
yinkaile
1be7827d03
Standardize code
2013-06-07 20:54:35 +08:00
yinkaile
d66a3870d4
Standardize code
2013-06-07 20:07:01 +08:00
yinkaile
718a8e763e
Standardize code
2013-06-07 19:57:15 +08:00
yinkaile
a10d0734f2
Standardize code
2013-06-07 19:48:31 +08:00
Lee, Jae-Hong
b9f5691706
[Tizen] Add libwebsockets.h, .a and support C++11
2013-06-07 20:14:43 +09:00
yinkaile
ba09c20434
Standardize code
2013-06-07 18:50:35 +08:00
James Chen
43e8573d8b
Merge pull request #2807 from dumganhar/master
...
[BB] Updating project configuration.
2013-06-07 03:49:10 -07:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
yinkaile
6a6245eefd
Standardize code
2013-06-07 18:29:47 +08:00
James Chen
fc2c068a66
[BB] Updating project configuration.
2013-06-07 18:17:07 +08:00
yinkaile
850ea39107
Standardize code
2013-06-07 17:10:53 +08:00
James Chen
9298492384
Updating project configuration for Blackberry port.
2013-06-07 16:52:49 +08:00
yinkaile
2418afc96d
conform declare and initialize order
2013-06-07 16:13:08 +08:00
yinkaile
e1e41f7124
move const value to CCDataReaderHelper.cpp
2013-06-07 14:47:08 +08:00
yinkaile
d4116f8478
1.remove #pragma endregion
...
2.change str.compare("")==0 to str.length()==0
2013-06-07 14:01:03 +08:00
James Chen
ec8ab8bd8b
Updating multi-platform-xxx template for win32.
2013-06-07 12:57:28 +08:00
samuele3hu
f58d0a04aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 12:57:04 +08:00
James Chen
d72e9d10b5
Updating multi-platform-xxx template for win32.
2013-06-07 12:50:02 +08:00
yinkaile
65974f2243
standardize code
2013-06-07 10:52:32 +08:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
yinkaile
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
Rene Klacan
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02:00
James Chen
a539f69d63
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
2013-06-06 15:02:57 +08:00
James Chen
9a26376b1f
Adding libwebsockets license in WebSocket.h/.cpp.
2013-06-06 15:02:57 +08:00
James Chen
ed4b9b2bb3
Marmalade projects fix.
2013-06-06 14:26:35 +08:00
James Chen
93597a5858
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
2013-06-06 14:22:51 +08:00
James Chen
f056757a9f
Adding libwebsockets license in WebSocket.h/.cpp.
2013-06-06 14:16:57 +08:00
yinkaile
3cfba7bc9a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
extensions/Android.mk
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Android.mk
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
2013-06-06 12:35:18 +08:00
yinkaile
245b0395b1
1.upload CCArmature
2013-06-06 12:02:54 +08:00
minggo
3713ff5b71
Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder
...
add cocosbuilder lua test sample
2013-06-05 01:38:57 -07:00
minggo
a9788a7f9d
Merge pull request #2767 from chengstory/master_Components#2
...
1. change “bool isEnabled()” to "bool isEnabled() const".
2013-06-05 00:52:32 -07:00
samuele3hu
75b26d9cdf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
2013-06-05 15:19:01 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
chengstory
ca3dc682ea
1. change “bool isEnabled()” to "bool isEnabled() const".
...
2. dolete license.
2013-06-05 15:05:49 +08:00
James Chen
47c8205e39
issue #2143 : Adding CCEditBox::getDelegate.
2013-06-05 14:55:13 +08:00
James Chen
57fee8dc98
issue #2143 : Adding CCEditBox::getDelegate.
2013-06-05 14:30:14 +08:00
chengstory
cfb424a6c9
1. add Component struct.
2013-06-04 17:38:43 +08:00
sunxiaoyu
d41a78453a
Update CCEditBoxImplIOS.mm
...
02c6647306
2013-06-04 17:16:45 +08:00
James Chen
7b98808aa7
Merge pull request #2640 from sunxiaoyu/patch-1
...
fixed #2253 : Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
2013-06-04 02:08:42 -07:00
James Chen
1e04c4e743
fixed #2252 : Fixing a bug that stdio.h is in c++ namespace.
2013-06-04 15:09:20 +08:00
James Chen
37df435089
fixed #2252 : Fixing a bug that stdio.h is in c++ namespace.
2013-06-04 15:05:27 +08:00
flaming0
1d3516da44
Update for spine runtime.
2013-06-04 14:47:19 +08:00
flamingo
a81f2b1303
Update Android.mk
2013-06-04 14:47:10 +08:00
flamingo
66943ee667
Update Makefile
...
For nacl (spine runtime)
2013-06-04 14:47:02 +08:00
flamingo
b806376671
Update Android.mk
2013-06-04 14:46:55 +08:00
flaming0
39ce9b4813
Update spine runtime
2013-06-04 14:46:46 +08:00
flaming0
3daf21996c
Update for spine runtime
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-04 14:46:31 +08:00
James Chen
5d89a0cd0c
Merge branch 'develop' into update-spine-runtime-develop
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-04 13:46:05 +08:00
flaming0
92b1da1fce
Merge remote-tracking branch 'refs/remotes/origin/patch-spine' into patch-spine
2013-06-03 20:53:17 +04:00
flaming0
a6c2ad0666
Update for spine runtime.
2013-06-03 20:52:32 +04: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
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
flamingo
6f0f53cf84
Update Android.mk
2013-06-02 20:42:48 +04:00
flamingo
6d7e4f5229
Update Makefile
...
For nacl (spine runtime)
2013-06-02 20:19:12 +04:00
flamingo
f6495a64fb
Update Android.mk
2013-06-02 20:18:27 +04:00
flaming0
b87a89eaa4
Update spine runtime
2013-06-02 19:59:13 +04:00
flaming0
5f1a4a4be7
Update for spine runtime
2013-06-02 18:26:46 +04:00
James Chen
4b8f76c903
WS_ERROR -> ERROR, WS_STATE -> STATE.
2013-06-02 18:56:49 +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