60ed1dcd3a
Merge pull request #4341 from Dhilan007/touchfix
...
fix touches not working in cocosbuilder
2013-11-19 18:20:42 -08:00
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
23f36e0406
fix touches not working in cocosbuilder
2013-11-19 19:24:04 +08:00
1fc928df41
HotFix: use static cast for format conversion
2013-11-19 11:32:12 +08:00
49f34c5339
HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture
2013-11-19 11:19:12 +08:00
458b9b53da
HotFix: fix CCB particle alpha blend
2013-11-19 11:16:14 +08:00
5c8d24a11e
hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
2013-11-18 14:12:07 +08:00
db804891ed
fix some warnings
2013-11-16 20:02:49 +08:00
0c309acbe7
fix CCBReader magic bytes compare bug which cause CocosBuilderTest turns black
2013-11-15 15:41:43 +08:00
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
5c58a8224c
Merge pull request #4168 from xhcnb/fix_ccb_nodeloader
...
[ci skip]Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom p...
2013-11-13 19:46:08 -08:00
f56cf9b8bf
Merge pull request #4222 from HoGarfield/Scale9SpriteLoader
...
[ci skip]To set anchor point to 0,0 when created by loader
2013-11-13 19:23:49 -08:00
fbb4d02251
When anchor point is 0,0 , CocosBuilder will not output anchor point param setting request.Although the Scale9Sprite`s anchor point is default to 0, 0, but when calling function "initWithBatchNode", the anchor point will be set to 0.5, 0.5.
2013-11-13 14:38:01 +08:00
be64dd97cf
replaces `delete[]` with `free()` in C-based API
...
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.
- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`
But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...
So, this patch does:
- Migrates the API from `new []` / `delete[]` to `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
2013-11-11 18:09:47 -08:00
dbafd9af2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-12 10:07:26 +08:00
d75c96443d
issue #2770 : fix some warning
2013-11-11 18:28:59 +08:00
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
891ddb5018
Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom properties to it, but when you create some nodes with the same custom_class , and they have different custom properties, as they are same class and the share one Loader, so in the loader _customProperties will be wrong.
...
So, I dropped some lines to clear _customProperties before handle an new node.
2013-11-11 15:45:07 +08:00
bbb2579114
Merge pull request #4160 from dabingnn/iss3025_TextureCache
...
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
6c1144ee79
issue #2770 : fix some warning
2013-11-11 12:49:38 +08:00
99bcca0532
issue #3025 : replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
2013-11-07 19:11:09 +08:00
84a6aa29cd
Adds more 64-bit fixes
...
Replaces more `int` with `long` where it makes sense.
Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
2013-11-05 17:36:44 -08:00
9be8ca3714
[cmake] output lib to root/lib
2013-11-04 21:03:08 +08:00
922924e1ab
TestCpp is ok.
2013-11-04 21:03:07 +08:00
a68d92ff5a
perfect vs-project configuration
2013-10-31 10:51:38 +08:00
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
0002815acb
Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
2013-10-22 15:56:35 +08:00
74b514c299
Merge pull request #3979 from HoGarfield/AutoPlay-Animation
...
closed #3033 : CCBReader can't play sequence automatically in JSB.
2013-10-22 00:30:47 -07:00
232f0d598b
issues #2905:add new vs project
2013-10-21 22:21:11 +08:00
464d1598d2
fixed bug of CCBReader that can not autoplaySequence
2013-10-19 16:48:57 +08:00
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
e50f9fc43b
issue #2905 : jsbinding samples and lua binding samples build ok on android
2013-10-17 15:04:30 +08:00
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
James Chen