James Chen
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
minggo
7a1f445bff
issue #1639:set visible to correct value
2013-01-05 18:35:11 +08:00
minggo
d5533fcf15
fix a type information in CCBAnimationManager
2012-12-10 11:30:07 +08: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
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
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
James Chen
e0948a4817
fixed #1576 : Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
2012-11-26 21:51:05 +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
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08: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
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
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
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
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
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
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
d9cc8fa346
issue #1458 : Adding CCTableView support. Updated win32 project configuration.
2012-09-09 22:34:32 +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
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
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04: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
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
minggo
5163b17a8a
make CCBReaderTest work ok
2012-07-23 11:33:11 +08:00
James Chen
b2b0a0c3d5
Updated ios project settings and updated some files in CCBReader folder.
2012-07-20 18:02:18 +08:00