Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
Ricardo Quesada
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
James Chen
596c4c3cf2
issue #2387 : Using static_cast instead of C style cast while iterating CCDictionary.
2013-07-09 14:40:43 +08:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
James Chen
00d6510a0d
Merge pull request #3014 from wtyqm/develop
...
close #2338 : fix sub ccb node resource root path bug
2013-06-26 20:49:00 -07:00
wtyqm
ab36c433fa
fix sub ccb node resource root path bug
...
When load sub ccb type node , create a new ccbreader from parent
ccbreader. Should copy ccbRootPath from parent, otherwise, load
resource will fail if sub ccb node resource use special path
2013-06-27 09:41:38 +08:00
James Chen
cb67ed0227
issue #2129 : Removing CC prefix for extension module.
2013-06-20 14:15:53 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
ec8ab8bd8b
Updating multi-platform-xxx template for win32.
2013-06-07 12:57:28 +08:00
James Chen
d72e9d10b5
Updating multi-platform-xxx template for win32.
2013-06-07 12:50:02 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
Rohan Kuruvilla
3d356d0a8f
Removing setting ignoreAnchorPoint for child CCB files. Was causing a bug with positioning
2013-05-07 14:53:41 -07:00
James Chen
685fe16e10
fixed #2076 : Adding a method CCBReader::setResolutionScale for setting resolution scale manually
2013-04-23 10:39:59 +08:00
James Chen
a5d78830db
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile.
2013-04-15 10:39:44 +08:00
James Chen
a1568d1f74
fixed #2040 : Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
2013-04-15 10:18:35 +08:00
James Chen
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
James Chen
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
Rohan Kuruvilla
80a268baf6
Fixing couple of bugs in reader that was checked into different branch
2013-03-18 23:20:14 -07:00
Rohan Kuruvilla
9acaaa289a
Making the changes to support Sound, Callbacks and skew property in CCBReader
2013-03-18 16:06:46 -07:00
fins
3b6c46b478
fix crash in CCBReader::readFloat()
2013-03-16 23:47:58 +01:00
Sam Clegg
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -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
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08: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
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
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
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
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
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
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
Rohan Kuruvilla
36bbd80b68
Adding changes to CCBreader
2012-11-23 15:08: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
a9473f1e8a
Changing mAnimationManagers and bringing CCBReader implementation closer to cocos2d-iphone CCBReader
2012-11-01 00:07:34 -07: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
minggo
0a1f0369e6
fixed #1481 : merge Nicolas's pull request and do some bug fixes
2012-09-21 17:01:19 +08:00
minggo
a0feb5f289
issue #1470:fix some logical errors
2012-09-18 17:04:10 +08:00
minggo
0845e08fd3
issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0
2012-09-17 14:27:17 +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