Commit Graph

64 Commits

Author SHA1 Message Date
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
Mircea Rila 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
koowolf 0aaa1dc0db closed #4291:open CCEditBox as modal dialog 2014-03-06 22:17:20 +08:00
martell 23cf748534 Added x64 support for Windows - CCExtensions 2014-01-11 12:31:04 +00:00
WuHuan 1cd68accc1 Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
WuHuan 954ee61022 testcpp mingw 2014-01-08 16:58:36 +08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen d8061477c1 issue #2790: Removes CCSort.h/.cpp from projects. 2013-12-07 14:21:01 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
CaiWenzhi be7c7a5f0b Modify windows project. 2013-09-23 19:54:43 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
zhangcheng 529d43544f 1. rename CCCActionFrameEasing.cpp to CCActionFrameEasing.cpp. 2013-09-18 11:22:30 +08:00
zhangcheng a1d2045793 1.rename cocoaction system files 2013-09-17 22:39:42 +08:00
zhangcheng b86a8271d9 1. Upload Cocostudio Action. 2013-09-17 21:14:45 +08:00
James Chen 72c2d4ca35 Merge branch 'develop' into 2youyouo2-develop
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:12:03 +08:00
James Chen c12a655fdf [GUI] Fix compilation error on win32. 2013-09-16 20:05:25 +08:00
James Chen 621e682e6e [GUI] Fixing compilation errors for win32.
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:00:48 +08:00
James Chen dba7f3eae6 [GUI] Fixing compilation errors for win32. 2013-09-16 19:53:59 +08:00
2youyou2 302555e711 standardizate code 2013-09-16 14:13:55 +08:00
2youyou2 db4813f161 1.remove CC from class name
2.fix async loading
2013-09-15 19:08:45 +08:00
yinkaile 74bd8b09d6 update armature 2013-09-13 18:07:37 +08:00
zhangcheng 1115d0d3f9 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
minggo bafc01c2aa issue 2430:fix a compiling error and add missing cpp 2013-07-26 15:55:12 +08: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 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04: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 5f1a4a4be7 Update for spine runtime 2013-06-02 18:26:46 +04:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 4a9b07e0c4 Updating libExtensions.vcxproj. 2013-03-19 17:27:39 +08:00
James Chen 17d9837b45 Adds AssetsManager support for win32. 2013-02-25 18:03:38 +08:00
James Chen 157e229f8c fixed #1634: Added the very first implementation of CCEditBox for Win32. 2013-01-31 14:04:49 +08:00
James Chen 3bdfb82e9c Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-01-30 22:31:19 +08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
Jozef Prídavok 9889b4f9fd Added the very first implementation of CCEditBox for Win32. 2013-01-10 23:59:21 +01:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen 1882ca30f5 issue #1620: Binding sqlite3 to sys.localStorage. And updated win32 project configuration. 2013-01-06 14:42:24 +08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1.
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
2012-12-19 19:28:25 +01:00
James Chen d27ab38be9 fixed some warning and make win32 release version compiled ok. 2012-11-29 18:04:33 +08:00
James Chen 0d0234de2a issue #1564: Updated Project configurations for android and win32 since physics_nodes was moved to Extension folder. 2012-11-20 16:22:14 +08:00