d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
3a654b4615
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
70c25ecded
modify project using short path
2015-03-05 13:40:52 +08:00
4de96cf1e6
modify pu path
2015-03-05 13:28:42 +08:00
5c460ebb2d
add/update particle files
2015-03-02 13:07:32 +08:00
954fd52493
rename folder and fix warning
2015-02-12 17:54:27 +08:00
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
a26e91f839
no message
2014-10-09 18:30:39 +08:00
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
14f3d6f230
Adjust the dependencies of extensions & cocostudio on android.
2014-07-16 13:47:57 +08:00
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
a079c9759a
issue #4097 : Deletes CCEditBoxImplTizen.h/.cpp.
2014-02-20 16:42:28 +08:00
25b15d94d4
[Android] Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in extension project. Define it in `Application.mk` instead.
2014-01-26 17:55:38 +08:00
d8061477c1
issue #2790 : Removes CCSort.h/.cpp from projects.
2013-12-07 14:21:01 +08:00
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
866906fd58
issue #2905:modify project settings to include correct audio path
2013-10-10 15:40:06 +08:00
fa892c2158
Remove layoutexecutant class
2013-09-23 19:16:20 +08:00
3fbf61ad52
issue #2087 : Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes.
2013-09-19 09:14:51 +08:00
0708edb762
1. remove CocoStudio/GUI/Action *.cpp *.h
2013-09-17 23:45:53 +08:00
a1d2045793
1.rename cocoaction system files
2013-09-17 22:39:42 +08:00
b86a8271d9
1. Upload Cocostudio Action.
2013-09-17 21:14:45 +08:00
28b266bc5e
[Android] Android.mk fixes after adding GUI test.
2013-09-17 10:49:59 +08:00
208f705845
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-09-16 18:18:23 +08:00
3e7708dcd1
Updating Android.mk
2013-09-16 17:12:15 +08:00
a6428824d5
Modify makefiles
2013-09-16 17:12:15 +08:00
ac8261bcd5
update Android.mk
2013-09-16 09:56:25 +08:00
24c8438fa6
[Dispatcher] Updating Android.mk, and some refractor.
2013-09-12 17:31:37 +08:00
9bf6ab1e16
1. fixes error of 34 line in android.mk.
2013-09-10 11:50:08 +08:00
8b509c456f
1. add shadernode.cpp to linux, nacl mk files.
2013-09-10 11:47:02 +08:00
100228b4ae
1. fixes failed to build on linux.
2013-09-10 11:21:18 +08:00
1115d0d3f9
1. merge scenereader Armature merge to cocos2dx 3.0.
2013-09-09 19:51:26 +08:00
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
9cba2c42c1
closed #2434 : simply Android.mk
2013-08-02 17:33:27 +08:00
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
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
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
5d89a0cd0c
Merge branch 'develop' into update-spine-runtime-develop
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-04 13:46:05 +08:00
6f0f53cf84
Update Android.mk
2013-06-02 20:42:48 +04:00
f6495a64fb
Update Android.mk
2013-06-02 20:18:27 +04:00
05a88c89dc
fixed #1647 : Adding WebSocket support for Cpp and JSB.
2013-05-31 23:13:03 +08:00
Ricardo Quesada