James Chen
1d59a36ee9
fixed #1620 : Invoking localStorageFree in the destructor of ScriptingCore. Added header file to cocos-ext.h
2013-01-07 17:34:22 +08:00
James Chen
3fa771f0c4
fixed #1620 : Using sqlite3 to implement sys.LocalStorage for iOS and android.
2013-01-07 17:22:06 +08:00
minggo
ba896f7588
Merge pull request #1821 from minggo/iss1639_CCBReader
...
issue #1639:set visible to correct value
2013-01-05 23:05:02 -08: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
3822ceee8c
issue #1620 : Renamed LocalStorage.c to LocalStorage.cpp
2013-01-06 14:40:54 +08:00
James Chen
dc1490c8ae
issue #1620 : Added LocalStorage support to extensions.
2013-01-06 11:57:10 +08:00
minggo
7a1f445bff
issue #1639:set visible to correct value
2013-01-05 18:35:11 +08:00
James Chen
421cf31b34
issue #1640 : Updated jsbinding for CCPhysicsSprite .
2013-01-05 15:09:19 +08:00
James Chen
9ef74bef80
fixed #1636 : Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
...
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
James Chen
7bcbcfa187
fixed #1636 : Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
2013-01-05 10:56:57 +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
tiantian
dc49561357
Fix crash for call runAnimation() in CCBAnimationManagerDelegate::completedAnimationSequenceNamed; Set mRunningSequence to NULL before any runAnimation() call;
2012-12-13 13:21:58 +08:00
minggo
d5533fcf15
fix a type information in CCBAnimationManager
2012-12-10 11:30:07 +08:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
James Chen
c1eded787a
Merge pull request #1724 from FlowerpotGames/gles20
...
fixed #1599 : CCScrollView and CCTableView updates.
2012-12-05 18:28:30 -08:00
Ed Bartley
73239a07e0
* Fixed improper behavior of horizontally scrolling ScrollView
2012-12-05 09:55:06 -05:00
Ed Bartley
3ed97165a5
* Add documentation to CCTableViewDelegate methods.
2012-12-04 15:46:27 -05:00
Ed Bartley
9f04817235
* CCScrollView did not scroll correctly if the container items do not fill the ScrollView. The issue can be observed by modifying TableViewTestLayer::numberOfCellsInTableView(…) in the ExtensionsTest/TableViewTest project from 20 cells to 2 cells.
2012-12-04 15:32:13 -05:00
minggo
58a187f774
do some bug fixes
2012-12-04 18:44:32 +08:00
James Chen
478791a472
Added CCBReader::setCCBRootPath.
2012-12-03 18:27:50 +08:00
James Chen
0333981c94
Suffix check.
2012-11-30 14:16:38 +08:00
James Chen
23629b8187
Made all projects compiled ok on Blackberry port.
2012-11-30 12:40:47 +08:00
James Chen
d27ab38be9
fixed some warning and make win32 release version compiled ok.
2012-11-29 18:04:33 +08:00
James Chen
10195d0215
fixed #1582 : A logic bug in CCBAnimationManager::setAnimatedProperty.
2012-11-29 11:07:06 +08:00
James Chen
95ccf17739
Bind some functions for js:
...
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
void runAnimationsForSequenceNamed(const char *pName);
void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
2012-11-28 11:49:20 +08:00
James Chen
342c7bc724
Merge pull request #1657 from fape/cocos_extensions_marmalade
...
fixed #1578 : Create cocos2dx-ext marmalade project.
2012-11-26 19:15:06 -08:00
James Chen
de8be8561e
minor fix for a comment.
2012-11-27 11:05:52 +08:00
James Chen
8d55abd432
fix touch event lost on Win32, the reason is that:
...
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
2012-11-27 11:03:12 +08:00
James Chen
9bd3014137
Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp.
2012-11-27 10:26:40 +08:00
fape
1843d576d8
create cocos2dx-ext marmalade project
2012-11-26 20:14:10 +01:00
James Chen
e0948a4817
fixed #1576 : Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
2012-11-26 21:51:05 +08:00
minggo
69f6b3970a
Merge pull request #1647 from guanqun/fix-doxygen
...
Fix doxygen related errors and warnings
2012-11-25 23:26:48 -08:00
minggo
832f9180b6
Merge pull request #1651 from minggo/gles20
...
issue #1564:work ok on linux
2012-11-25 19:50:36 -08:00
minggo
1b9a38e195
issue #1564:work ok on linux
2012-11-26 11:46:37 +08:00
Lu Guanqun
0f2d8f8c6b
fix the doxygen warnings
...
cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
parameter 'value'
2012-11-25 23:27:29 +08:00
James Chen
7c1e860d78
issue #1573 : Added CocosDragonJS. Made it compiled ok on iOS,android and win32.
2012-11-23 15:09:03 +08:00
Rohan Kuruvilla
36bbd80b68
Adding changes to CCBreader
2012-11-23 15:08:55 +08:00
James Chen
b66bc98a46
issue #1564 : Made ChipmunkTest of TestJavascript works
2012-11-22 15:19:16 +08:00
James Chen
89a51433b8
issue #1564 : Make TestJavascript works on windows.
2012-11-22 10:24:26 +08:00
James Chen
add23eecda
issue #1564 : Adding missing setter and getter function.
2012-11-22 09:55:43 +08:00
James Chen
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
James Chen
e8cf71407d
issue #1564 : Deleted physics_nodes in cocos2dx since it was moved to extension.
2012-11-20 16:27:47 +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
James Chen
8a21d4e824
issue #1564 : Moved physics_node to extension.
2012-11-20 16:17:20 +08:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
minggo
b497143f93
issue #1555:menu can receive touch event now
2012-11-16 14:51:48 +08:00
minggo
cb2bc37513
issue #1555 : make tests work
2012-11-15 18:34:23 +08:00
Ed Bartley
63b20ae7ea
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
2012-11-14 11:06:18 -05:00
minggo
4efdbca23b
fixed #1545:remove the usage of CREATE_FUNC
2012-11-08 10:41:14 +08:00
Ed Bartley
079ab91ca5
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
2012-11-02 20:45:46 -04:00
Ed Bartley
4ec9793769
TableView updates to provide more touch input to CCTableViewDelegate
2012-11-02 20:26:43 -04:00
Rohan Kuruvilla
09248f3667
Updating CCBReader to latest version from cocos2d-iphone. Includes support for script callbacks
2012-11-01 17:52:07 -07:00
Rohan Kuruvilla
89e40a2c98
Adding support for animationCompletedJSCallback in CCBReader
2012-11-01 00:08:00 -07:00
Rohan Kuruvilla
a9473f1e8a
Changing mAnimationManagers and bringing CCBReader implementation closer to cocos2d-iphone CCBReader
2012-11-01 00:07:34 -07:00
Rohan Kuruvilla
dc51a78981
Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings
2012-11-01 00:06:24 -07:00
James Chen
1a512488fa
fixed #1538 : Logic error in CCControlHuePicker::checkSliderPosition.
...
The distance between current location and center should compare with radius rather than dimension.
2012-10-31 14:32:24 +08:00
James Chen
6f2364b769
Merge pull request #1520 from FlowerpotGames/gles20
...
fixed #1536 : CCControl* should not respond to touches if the control is not visible.
2012-10-30 18:54:05 -07:00
Ed Bartley
f424da2a7e
* CCControl* should not respond to touches if the control is not visible.
2012-10-30 11:10:05 -04:00
minggo
a09367ca7e
Merge pull request #1491 from sburavtsov/HttpClient-destroy-fix
...
Fix for correct unscheduling and instance destruction
2012-10-25 02:05:34 -07:00
Sergey Buravtsov
0b381357b0
Fix for correct unscheduling and instance destruction
2012-10-24 03:33:17 +04:00
johnangel
a2e1400402
Merge remote branch 'upstream/gles20' into gles20
2012-10-16 08:42:30 +02:00
James Chen
fb657f674d
fixed #1510 : Application will freeze when 'numberOfCellsInTableView' returns zero.
2012-10-16 11:31:04 +08:00
James Chen
a65f13defe
issue #1486 : Fix bugs for CCEditBox iOS port.
2012-10-15 13:01:36 +08:00
James Chen
0e76827b7e
issue #1486 : Commenting one line to avoid something like mosaic in 'CCControlExtensionTest', especially the display of 'huePickerBackground.png' when in 800*480 window size with 480*320 design resolution and hd(960*640) resources.
2012-10-14 22:03:23 +08:00
johnangel
ad7dacc281
Merge remote branch 'upstream/gles20' into gles20
2012-10-08 16:35:43 +02:00
Walzer
f1d9629404
Merge pull request #1361 from ncrothe/gles20
...
add the capability to set custom http header to HttpClient
2012-10-08 01:06:39 -07:00
James Chen
cb2f3efc2c
fixed #1495 : CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world.
2012-10-08 14:12:34 +08:00
Donald Alan Morrison
f6b51c0a5f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-25 10:20:18 -07:00
Donald Alan Morrison
a245199075
Jianhua Chen pointed out a semantic error in my "fix". Thanks James!
...
The Static Analyzer doesn't search for this semantic error, even though it is common.
2012-09-25 10:13:49 -07:00
James Chen
d91d7c8317
issue #1483 : Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.
2012-09-25 17:26:09 +08:00
James Chen
83fe21b4f4
issue #1483 : Removed a comment.
2012-09-25 17:03:29 +08:00
James Chen
f7229f74d8
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 16:57:51 +08:00
Donald Alan Morrison
8693c54997
Minor memory-logic error. textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it. Also, an init method called release outside the proper scope (the do{}while(0); block).
...
If you don't like the autorelease pool, it's easy enough to change this fix.
Aside: someone pulled tools/cxx-generator again, not me(!) :-)
2012-09-24 14:55:40 -07:00
minggo
f17545a1ae
fix a compile error
2012-09-24 15:26:18 +08:00
minggo
88952396e4
Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int
2012-09-24 15:16:30 +08:00
James Chen
e4cee68688
Added libExtensions.lib for TestJavascript vs2010 project.
...
Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-24 11:47:33 +08:00
James Chen
a413496a1a
Delete 'cocos2d::' since extension is the sub-namespace of cocos2d.
2012-09-24 11:08:10 +08:00
James Chen
426915dd4a
fixed some compilation error for win32 platform.
2012-09-24 11:05:15 +08:00
ncrothe
b3f5a04ad4
Update extensions/network/HttpClient.cpp
...
Added custom header capability to http wrapper (using curl features). This allows setting non-default content-type for POSTs.
2012-09-22 17:52:04 +03:00
ncrothe
7b9c15176e
Update extensions/network/HttpRequest.h
2012-09-22 17:45:02 +03:00
Byung Choi
2ed9119d4f
fixed pointer to int casting warnings and errors, based on stdint
2012-09-22 03:02:29 +09:00
minggo
0a1f0369e6
fixed #1481 : merge Nicolas's pull request and do some bug fixes
2012-09-21 17:01:19 +08:00
minggo
32de12e479
Merge pull request #1339 from rohankuruvilla/merge2
...
JS Bindings improvements
2012-09-20 19:38:49 -07:00
Walzer
befaf686bb
Merge pull request #1352 from sburavtsov/HttpClientFix-FOLLOW_LOCATION
...
To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION
2012-09-20 18:20:46 -07:00
Rohan Kuruvilla
100a7a1883
Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
0fc7feb3f0
Updating CCBReader to support Scripting Owners
2012-09-20 14:45:34 -07:00
Sergey Buravtsov
5128f0e1a8
To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION
2012-09-20 19:51:04 +04:00
M.W. Park
d042e8557d
fixed CCSpriteLoader's flipX bug.
2012-09-20 12:47:45 +09:00
M.W. Park
b4b9a1be2b
fixed log output.
2012-09-20 12:32:37 +09:00
James Chen
9fabf3a45b
fixed #1470 : Made CCBReader support cocosbuilder v2.1-beta0.
2012-09-19 18:41:50 +08:00
minggo
8cdf73640b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder
2012-09-19 18:08:17 +08:00
minggo
4bff6927b8
issue #1470:re-publish ccb
2012-09-19 17:43:11 +08:00
Ed Bartley
925c21cdde
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
2012-09-18 18:42:41 -04:00
minggo
4bc5e9e415
issue #1470:fix more logical errors
2012-09-18 17:55:03 +08:00
minggo
a0feb5f289
issue #1470:fix some logical errors
2012-09-18 17:04:10 +08:00
minggo
4b969e35c8
issue #1470:implement animation
2012-09-17 18:49:05 +08:00
minggo
0845e08fd3
issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0
2012-09-17 14:27:17 +08:00
johnangel
fdec1ba4b9
Fixing include paths to be able to compile cocos2d-x using
...
external Visual Studio solution, without copying all files
2012-09-15 16:34:31 +02:00
Walzer
0cd3552ef7
fixed #1475 , use vector::insert instead of vector::clear + assign in CCHttpClient::writeData, to prevent losing data
2012-09-10 23:17:16 +08:00
Ed Bartley
c67412618d
Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
...
Conflicts:
extensions/GUI/CCScrollView/CCScrollView.cpp
2012-09-10 10:50:30 -04:00
James Chen
a6acd90c29
fixed #1458 : Updated copyright information for some files which are relative to CCTableView.
2012-09-10 14:13:55 +08:00
James Chen
6f3ee0299a
issue #1458 : Updated vs2010 project configuration.
2012-09-10 14:05:44 +08:00
James Chen
1460f4e42f
issue #1458 : Updated project configuration for all platforms.
...
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
2012-09-10 13:39:12 +08:00
James Chen
554b1709c3
issue #1458 : Adding CCScrollView::updateInset.
2012-09-09 22:46:31 +08:00
James Chen
bf45edeed5
Reverted one line code.
2012-09-09 22:37:32 +08:00
James Chen
6719841b13
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into tableview-gles20
2012-09-09 22:34:53 +08:00
James Chen
d9cc8fa346
issue #1458 : Adding CCTableView support. Updated win32 project configuration.
2012-09-09 22:34:32 +08:00
Walzer
7c4ad685e5
add comment for a potential bug in HttpClient.cpp
2012-09-09 18:25:02 +08:00
ebartley
5deeb3f8fa
Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors.
2012-09-07 15:00:21 -04:00
Ed Bartley
591d15c2a1
CCscrollView screenPos also needs to be adjusted by the scale in order to be used with Retina display.
2012-09-05 15:12:03 -04:00
ThePickleMan
0a96915da2
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
...
Removed meaningless setter...the macro already makes one...
2012-09-04 20:54:34 -05:00
ThePickleMan
423abc6f10
Update extensions/GUI/CCControlExtension/CCControlSlider.h
...
Removed meaningless setter...the macro already makes one...
2012-09-04 20:54:17 -05:00
ThePickleMan
f6f370ffea
Update extensions/GUI/CCControlExtension/CCControlSlider.h
...
changed CC_SYNTHESIZE_READONLY to CC_SYNTHESIZE
2012-09-04 20:48:04 -05:00
ThePickleMan
a4d2d317b5
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
2012-09-03 09:46:55 -05:00
ThePickleMan
da819e1109
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
...
Added default values for max/min allowed values
2012-09-02 16:31:12 -05:00
ThePickleMan
e07320f6a8
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
...
Added minimum/maximum allowed values
2012-09-02 16:10:25 -05:00
ThePickleMan
82ea6fbb99
Update extensions/GUI/CCControlExtension/CCControlSlider.h
...
Added fields and methods for setting the maximum allowed value.
2012-09-02 16:08:13 -05:00
fish
847ccaff7d
CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite.
2012-08-30 10:39:36 -04:00
minggo
0e81fd0568
fixed #1442 : use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
2012-08-27 16:11:07 +08:00
Donald Alan Morrison
5075a83271
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/kazmath/src/ray2.c
2012-08-25 00:00:27 -07:00
Donald Alan Morrison
ee9f3d09a8
Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly
...
converted to 64 bits.
2012-08-24 09:22:02 -07:00
James Chen
ee3e68014b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
2012-08-24 00:16:11 +08:00
James Chen
1685e5c497
issue #1429 : Used java code to implement keyboard layout.
2012-08-24 00:15:15 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
James Chen
3eecc283d0
Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer
2012-08-21 16:57:41 +08:00
James Chen
d918c8186f
Update extensions/GUI/CCEditBox/CCEditBox.cpp
...
Revert this file, uncomment some codes in 'initWithXXX'.
2012-08-21 16:03:36 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
0231f65716
Merge pull request #1208 from minggo/iss1382_ccb_reader
...
fixed #1382:safe retain mOwner to avoid crash caused by null pointer
2012-08-20 20:23:03 -07:00
minggo
4db53b2f91
fixed #1382:safe return mOwner to avoid crash caused by null pointer
2012-08-20 15:54:53 +08:00
James Chen
6c9b4d3357
fixed #1420 : Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
2012-08-20 15:49:02 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00
James Chen
d3338a70e5
issue #1429 : Updated EditBoxTest and fix a bug about callback function.
2012-08-17 14:29:07 +08:00
James Chen
0fce637ec7
issue #1429 : First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
2012-08-15 14:33:56 +08:00
James Chen
3ff21fe275
fixed #1424 : http wrapper compiled ok on win32.
2012-08-09 17:04:55 +08:00
Walzer
9d6e37cf73
issue #1424 , rename "Network" to "network"
2012-08-09 11:44:24 +08:00
Walzer
d2cfdf1d2f
change Network to Network-rename
2012-08-09 11:43:08 +08:00
Walzer
08198c082e
issue #1424 , http wrapper has been tested on iOS, mac, android port.
2012-08-09 10:45:11 +08:00
Walzer
9ee50bb59a
issue #1424 , add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website.
2012-08-08 12:05:02 +08:00
Walzer
b094f70ab3
issue #1424 , http-get works ok. Tomorrow I will focus on post.
2012-08-07 18:28:07 +08:00
qingyun
b3206737e3
add group for CCHttpRequest.h
2012-08-04 18:30:05 +08:00
qingyun
24136dc575
add CCHttpRequest and related tests to repository
2012-08-04 18:27:27 +08:00
Walzer
cc3d850892
fixed #1416 , add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
2012-08-01 15:30:12 +08:00
Walzer
0431cb455b
fixed #1413 , add CCTouch::getLocation(), getDelta() method
...
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
Walzer
b8fa32dbc0
use extensions/GUI instead of extensions/UI
2012-07-30 22:57:59 +08:00
Walzer
dfea09819f
fixed #1409 , sync with CocosBuilder v2.0, use number "4" to stand for PROPERTY_*_DISABLED in CCControlButton
...
The cub & ccbi files in current test suit use "3" to stand for DISABLED state in CCControlButton, while CocosBuilder v2.0 generate "4" for it.
2012-07-29 22:13:20 +08:00
Walzer
1411705de4
fixed #1408 , CCBReader, CCMenuItemImage should be loaded when the target and selector are empty
2012-07-29 21:17:35 +08:00
mustime
1a55b7c5ba
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381
2012-07-27 18:29:57 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
James Chen
9a6729551c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399
2012-07-23 11:59:47 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00
minggo
ac70f8def5
Merge branch 'gles20-adjust-structure' into merge
2012-07-23 11:36:46 +08:00
minggo
5163b17a8a
make CCBReaderTest work ok
2012-07-23 11:33:11 +08:00
James Chen
acd4a5dc9d
issue #1399 : Updated build-win32.bat and libExtensions.vcproj.
2012-07-23 10:55:24 +08:00
James Chen
b2b0a0c3d5
Updated ios project settings and updated some files in CCBReader folder.
2012-07-20 18:02:18 +08:00
James Chen
557f654cf3
Built successfully on android.
2012-07-20 17:06:00 +08:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00
minggo
f9c40f7372
issue #1399 : work ok on iOS after adjusting directory structure
2012-07-19 17:22:36 +08:00
Walzer
8bab593246
move extensions/NDControls to cocos2d-x-extensions repository
2011-06-22 14:54:45 +08:00
minggo
9c49e27bf1
add extensions & tools directory
2011-06-14 14:31:25 +08:00