Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,306 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1022 Commits

Author SHA1 Message Date
minggo c8baa94753 issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
Neo Kim d42d847fb3 Added 'setPlaceholderFont()' to CCEditBox 2013-02-25 15:05:38 +09:00
minggo 32fbced31f issue #1489:modify sample code and add readme 2013-02-22 16:02:53 +08:00
minggo 91f5972b42 issue 1489:add AssetsManager 2013-02-22 11:04:09 +08:00
James Chen cf33a4538d fixed #1730: Binds CCScrollView and CCTableView to js. 2013-02-21 10:06:22 +08:00
Neo Kim 7da2dc953d Move height adjustment code from 'getRect' to 'keyboardWillShow' 2013-02-20 22:52:49 +09:00
Neo Kim a7c87f3b38 Add 'setFont' and 'setAnchorPoint' to CCEditBox 2013-02-20 22:41:08 +09:00
James Chen 60ab4c4886 issue #1733: Updated linux makefile. 2013-02-19 18:06:30 +08:00
James Chen a94aa15031 issue #1733: Adding extension project for linux. 2013-02-19 17:28:49 +08:00
hailong 2f0e10cd74 CCBReader error with generated animations 
synchronous with cocos2d-iPhone
 2013-02-19 12:27:39 +08:00
James Chen 9c906bbe30 fixed #1712: fix an issue of lacking table view cells after touch ended. 2013-02-18 09:45:01 +08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
James Chen 0a9a952edc fixed #1711: Wrong clipping rectangle of CCScrollView when the scale of its ancestors isn't equal to 1. 2013-02-16 14:18:13 +08:00
James Chen 36e5da29b0 Merge branch 'master' of https://github.com/ztoky/cocos2d-x into ztoky-master 2013-02-16 13:48:35 +08:00
Heewon Song 10375ae660 Fix for CCScrollView clipping bug 
fix : wrong cliping rect when ancestors scale is not 1
 2013-02-14 18:43:27 +09:00
folecr b204e97ad2 Simpler, correct handling of spritesheet sources 
* bounds of insets are calculated relative to sprite
 * transformations are then applied to get the texture coordinates
 * handle sprites stored rotated in a spritesheet correctly
 2013-02-11 13:26:40 -08:00
James Chen 7e136b67a6 Merge pull request #1966 from fape/marmalade_cosmetics 
Marmalade cosmetics
 2013-02-06 19:21:46 -08:00
Darragh Coy 5902de93ce Committing a fix for a potential unaligned memory access crash in CCBReader::readFloat(), 
caused by incorrect compiler optimisations/assumptions surrounding the use of memcpy().
 2013-02-06 14:44:15 -08:00
fape 2f5db30332 add missing defines doc file to marmalade project file 2013-02-06 14:51:10 +01:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
xyhl515 3316f8c961 Update extensions/GUI/CCControlExtension/CCControlSwitch.cpp 
implement setOn(isOn,false)
 2013-01-31 22:12:37 +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
James Chen ef131beed1 Merge pull request #1885 from dumganhar/refactor-ccfileutils 
issue #1683 :Refactoring CCFileUtils.TO BE DONE: 
Making the api of CCFileUtils more c++ friendly.
 2013-01-25 05:55:10 -08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
minggo f8c4a5638d Merge pull request #1888 from folecr/s9sprite 
Fix some bugs in CCScale9Sprite
 2013-01-25 02:14:59 -08:00
James Chen 6a31f4edaf Fixed a logical error in CCNodeLoader.cpp. 2013-01-25 11:04:41 +08:00
folecr dcda7ad240 Use instances only if valid 2013-01-24 15:43:59 -08:00
folecr 3f41b361d3 CCScale9Sprite : handles default modes correctly. Bugs when the source is a sprite that is stored rotated in a spritesheet. 2013-01-23 16:42:14 -08:00
Ed Bartley 39a39fb9f4 CCTableView: Added a delegate method to inform the implementor that a cell as about to be recycled. CCTableView no longer crashes if a CCTableViewDelegate is not provided. 2013-01-23 14:04:49 -05:00
James Chen 9042e814ff Merge pull request #1883 from dumganhar/iss-ccb-leak 
fixed #1670: fixed retain interaction. Only CCNode should retain CCAnimationManager, CCAnimationManger shouldn't retain CCNode.
 2013-01-22 23:23:55 -08:00
James Chen 37f91c5c1d Comment the unneeded codes. 2013-01-23 15:18:13 +08:00
James Chen 83ea9e5e2c fixed #1670: fixed retain interaction. Only CCNode should retain CCAnimationManager, CCAnimationManger shouldn't retain CCNode. 2013-01-23 15:14:40 +08:00
James Chen 1eecf7fbb6 Merge pull request #1874 from MarcelBloemendaal/master 
fixed #1674: Calling wrong initializer in CCScale9Sprite.
 2013-01-22 00:01:54 -08:00
James Chen c5214dd485 Updated the comments for CCBMemberVariableAssigner. 2013-01-22 15:10:30 +08:00
James Chen 0187bb6504 Merge pull request #1876 from dumganhar/iss1639-custom-property 
fixed #1639: Added custom property support for CCBReader.
 2013-01-21 23:03:53 -08:00
Marcel Bloemendaal 696ea07495 Fixed CCScale9Sprite::create(caInsets, file); 
Fixed calling of wrong initializer in CCScale9Sprite, the create(CCRect
capInsets, const char* file). It used to call initWithFile(file,
capInsets), but this is the initializer for a file and a frame rect.
The initializer with capInsets has the capInsets rect as the first
argument. This caused unexpected behaviour.
 2013-01-21 14:55:45 +01:00
James Chen a470489f7c fixed #1639: The target of Custom property needs to be self. 2013-01-21 21:09:03 +08:00
James Chen c0d568da9b fixed #1639: Added custom property support for CCBReader. 2013-01-21 18:37:17 +08:00
James Chen 4a68e4ab89 fixed #1670: Fixed memory leak in CCBReader. 2013-01-21 14:40:29 +08:00
James Chen 0c10eff039 Merge branch 'gles20' of https://github.com/tiantian20007/cocos2d-x into pr1757 2013-01-21 11:33:47 +08:00
minggo 4baf92760b fixed #1639:add CCBEaseInstant 2013-01-21 11:18:06 +08:00
James Chen 571d86d51d fixed #1553: fixed a memory leak in CCControlButton. 2013-01-21 10:16:07 +08:00
James Chen e761856b4d Added restriction marco `CC_TARGET_PLATFORM == CC_PLATFORM_MAC` for CCEditBox of MAC port. 
This can avoid compilation errors if other platforms include these files.
 2013-01-15 15:11:20 +08:00
James Chen 6733f786a5 fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
James Chen 0fd16e7b31 Merge pull request #1827 from folecr/assert_fix 
fixed #1654: Assert fix for android.
 2013-01-13 22:15:11 -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
Jozef Prídavok 229ad55dfa Fixed and refactored Mac Implementation. 2013-01-09 15:34:53 +01:00
Jozef Prídavok 4f2f5a3c8f Added EditBox implementation for Mac OSX. 2013-01-09 15:09:57 +01:00
folecr c0ecad31fe Consistent use of CCAssert 
* Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
 2013-01-08 14:11:34 -08: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 774e9dcc23 Merge pull request #1823 from dumganhar/iss1620-sys-localstorage 
fixed #1620: Using sqlite3 to implement sys.LocalStorage.
 2013-01-07 02:30:26 -08:00
James Chen b662d5c569 fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
James Chen 43b95f2a9a fixed #1620: Check return value. 2013-01-07 17:38:52 +08:00
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