minggo
8b5068d4c5
Merge pull request #4273 from boyu0/fix_ccbreader_magic_bits_compare_bug
...
[ci skip]fix CCBReader magic bytes compare bug.
2013-11-14 23:45:33 -08:00
minggo
2923b1c1ed
Merge pull request #4271 from nutty898/develop_nutty_modify_relativelayout
...
[ci skip]Modify relative layout
2013-11-14 23:43:30 -08:00
boyu0
0c309acbe7
fix CCBReader magic bytes compare bug which cause CocosBuilderTest turns black
2013-11-15 15:41:43 +08:00
samuele3
63d4014586
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-15 14:52:17 +08:00
CaiWenzhi
75d9bde459
Modify relative layout
2013-11-15 14:37:34 +08:00
samuele3
c1bdd8ad3c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-15 13:49:19 +08:00
samuele3
ec9bc0069f
Modify template of lua ios_mac config and some bugs
2013-11-15 13:48:34 +08:00
CaiWenzhi
1730fcddcb
Modify layout
2013-11-15 13:29:39 +08:00
Huabing.Xu
e14295c404
Merge branch 'develop' into free_instead_of_delete
2013-11-15 09:45:03 +08:00
Huabing.Xu
022b5c7b9a
Merge branch 'develop' into free_instead_of_delete
...
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
fix asynchronize loading bug
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #3185 support for html5.
fixed bug of widget
fixed bugs of widget
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
Add deprecated functions of class TextureCache
fix warning
set z order after reorder
fixed #3185 replace NULL to nullptr.
add "override"
fixed #3185
Modify code criterion
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-11-15 09:44:29 +08:00
Ricardo Quesada
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
Ricardo Quesada
17a6575bd3
more protected constructors
...
Adds protected constructors for:
* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
2013-11-14 16:33:43 -08:00
Ricardo Quesada
dd68eb4796
ParticleSystem uses protected constructors
2013-11-14 16:21:49 -08:00
Ricardo Quesada
b87684c022
fixes Sprite::setTexture()
...
Sprite::setTexture(std::string&) works as expected.
It sets the texture rect of the sprite
2013-11-14 15:37:43 -08:00
Ricardo Quesada
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
minggo
9b746d22f5
Merge pull request #4259 from minggo/async-loading-fix
...
[ci skip]fix asynchronize loading bug
2013-11-14 02:40:44 -08:00
minggo
2f7f05d1d7
fix asynchronize loading bug
2013-11-14 18:39:23 +08:00
minggo
f06d71dd49
Merge pull request #4258 from CocosRobot/updategeneratedsubmodule_1384421963
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 02:26:45 -08:00
CocosRobot
523cb2e8d9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 09:39:25 +00:00
minggo
c594a673fc
Merge pull request #4244 from chengstory/#3185
...
[ci skip]fixed #3185
2013-11-14 01:33:26 -08:00
Huabing.Xu
4894632467
Fix bug: add android, fix android can not compile
2013-11-14 17:14:35 +08:00
chengstory
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +08:00
CaiWenzhi
19c605eb51
Merge branch 'develop' into develop_nutty_code_criterion
2013-11-14 15:46:52 +08:00
CaiWenzhi
5f22edf095
fixed bug of widget
2013-11-14 15:42:59 +08:00
minggo
e0076cbdf3
Merge pull request #4246 from minggo/zorder-fix
...
[ci skip]Zorder fix
2013-11-13 23:26:05 -08:00
Huabing.Xu
03c8c8f4fc
Fix bug: use free() in imageCommon_cpp.h
2013-11-14 14:48:16 +08:00
Huabing.Xu
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
CaiWenzhi
dee5305f7b
fixed bugs of widget
2013-11-14 14:46:44 +08:00
CaiWenzhi
ccaa8f7310
Merge branch 'develop' into develop_nutty_code_criterion
2013-11-14 14:31:04 +08:00
samuele3
a20620c185
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-14 14:14:52 +08:00
samuele3
babc985409
Add deprecated functions of class TextureCache
2013-11-14 14:12:25 +08:00
minggo
a057274115
set z order after reorder
2013-11-14 14:08:50 +08:00
chengstory
e9f5e889d6
fixed #3185 replace NULL to nullptr.
2013-11-14 14:05:24 +08:00
CaiWenzhi
2432e6e40d
add "override"
2013-11-14 13:42:10 +08:00
Huabing.Xu
46ef7a7fbc
Fix bug: deprecate old interface
2013-11-14 13:35:17 +08:00
chengstory
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +08:00
CocosRobot
515d20d863
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 04:32:48 +00:00
rablwupei
96462eb81f
fix bug: cccolor to jsval function has error in jsb
2013-11-14 12:03:44 +08:00
minggo
996be7502a
Merge pull request #4129 from michaelcontento/color-convenience
...
[ci skip]Colors are now compare- and explicit convertible
2013-11-13 19:50:31 -08:00
minggo
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
CaiWenzhi
611ba9e9f5
Modify code criterion
2013-11-14 11:37:46 +08:00
minggo
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
minggo
95effc0207
Merge pull request #4234 from xhcnb/dev_fix_ccuserdefalut
...
[ci skip]Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-13 19:16:34 -08:00
Jason Xu
f4425f5db2
C++11: NULL -> nullptr
2013-11-14 11:08:50 +08:00
Jason Xu
dee3bffcdc
Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-14 10:40:06 +08:00
minggo
ed83a0b374
Merge pull request #4205 from bmanGH/fix_touch_retain
...
[ci skip]fix direct delete touch object without use release crash bug;
2013-11-13 18:30:21 -08:00
minggo
e6653e133b
Merge pull request #4193 from ricardoquesada/doxygen_markdown
...
[ci skip]Adds markdown comments in the doxstrings
2013-11-13 18:15:59 -08:00
minggo
97063dfe7d
Merge pull request #4208 from bmanGH/feature/add_functions_to_glprogram
...
[ci skip]add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
2013-11-13 18:10:10 -08:00
minggo
a34011c682
Merge pull request #4229 from dabingnn/develop_fix_zFighting_TransitionScenePageTurn
...
[ci skip]Fix bug: Z fighting on TransitionScenePageTurn
2013-11-13 18:08:25 -08:00
Huabing.Xu
b4b4e99522
Fix bug: rename const with under line seperator
2013-11-14 10:00:59 +08:00
minggo
84689e0121
Merge pull request #4206 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warnings
2013-11-13 17:57:25 -08:00
minggo
7b61a34d71
Merge pull request #4230 from CocosRobot/updategeneratedsubmodule_1384393975
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-13 17:55:15 -08:00
CocosRobot
dff9c6a5b5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 01:52:57 +00:00
minggo
87fd45a6a4
Merge pull request #4226 from nutty898/develop_nutty_addfunctiontoguireader_3
...
[ci skip]Develop nutty addfunctiontoguireader 3
2013-11-13 17:51:35 -08:00
minggo
408ab94eba
Merge pull request #4215 from liamcindy/develop
...
[ci skip]fixed ui animation play error
2013-11-13 17:47:39 -08:00
minggo
4abf5b50dd
Merge pull request #4214 from samuele3hu/developCCS
...
[ci skip]issue #2868:Add CocoStudio UI lua binding and some releated test samples
2013-11-13 17:45:34 -08:00
Huabing.Xu
ccbbff3c22
Fix bug: Z fighting on TransitionScenePageTurn
2013-11-14 09:44:35 +08:00
Ricardo Quesada
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
CaiWenzhi
9c1bd673ff
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-13 20:43:57 +08:00
CaiWenzhi
3ac054edbd
Fixed bugs
2013-11-13 20:38:18 +08:00
CaiWenzhi
5f68e028b5
Modify reader and fixed bugs
2013-11-13 20:01:57 +08:00
samuele3
17f74eeb17
issue #2868:Modify armature test samples and add more armature test samples
2013-11-13 18:18:29 +08:00
minggo
304b09527b
Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime
...
[ci skip]Configuration of VAO in runtime
2013-11-12 22:55:29 -08:00
bmanGH
2687ee8915
put '{' in a new line to follow cocos2d-x coding style
2013-11-13 14:52:16 +08:00
garfield_ho
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
boyu0
ca4c289fd8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-13 11:24:19 +08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
CaiWenzhi
0665d6c9bc
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-13 10:19:09 +08:00
CaiWenzhi
03b3d583e8
Modify scenereader
2013-11-13 10:16:16 +08:00
samuele3
26c3266711
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-13 10:15:24 +08:00
samuele3
062fb85943
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
2013-11-13 10:12:44 +08:00
Ricardo Quesada
4848e3d3bb
correct size for Listener ID
2013-11-12 17:14:51 -08:00
bmanGH
683ce1692d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime
...
Conflicts:
cocos2dx/CCConfiguration.cpp
cocos2dx/draw_nodes/CCDrawNode.cpp
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
cocos2dx/platform/android/CCEGLView.cpp
cocos2dx/platform/ios/EAGLView.mm
cocos2dx/textures/CCTextureAtlas.cpp
cocos2dx/textures/CCTextureAtlas.h
2013-11-12 20:18:04 +08:00
bmanGH
9893fbc514
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
2013-11-12 19:24:09 +08:00
bmanGH
f540131320
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
2013-11-12 18:59:37 +08:00
boyu0
15c8c04f3a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-12 18:22:26 +08:00
boyu0
0aa140a6e5
issue #2771 : add comments
2013-11-12 18:13:44 +08:00
samuele3
f429c4c632
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-12 17:51:33 +08:00
CocosRobot
0acaa1f76e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-12 09:50:13 +00:00
samuele3
ae6597dbaa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
...
Conflicts:
tools/bindings-generator
2013-11-12 17:23:41 +08:00
samuele3
18bc96096c
Resolve some warning and modify uint32_t to long
2013-11-12 17:18:51 +08:00
samuele3
c1d256c159
issue #2868:modify ccs lua test samples
2013-11-12 16:52:03 +08:00
minggo
8d79e67ecf
Merge pull request #4165 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-11 23:57:30 -08:00
samuele3
cfb1cfdf65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
boyu0
9eac5c4a41
issue #2771 : add comment and improve API
2013-11-12 15:28:07 +08:00
samuele3
482ee5d47f
issue #2868:Add more ccs lua test samples
2013-11-12 15:25:47 +08:00
Ricardo Quesada
6b29391212
Adds markdown comments in the doxstrings
...
Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.
This will make our comments easier to read.
This patch only adds markdown to CCNode.h as a test.
If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
2013-11-11 20:21:01 -08:00
Liam
f0ca796da1
merge from develop
2013-11-12 11:20:29 +08:00
James Chen
42ca4f6122
Merge pull request #4187 from dumganhar/develop
...
#include <algorithm> for std::max, std::min on VS2013.
2013-11-11 18:52:16 -08:00
James Chen
db07c781ab
#include <algorithm> for std::max, std::min on VS2013.
2013-11-12 10:35:50 +08:00
James Chen
cfd82a26bb
Merge pull request #4156 from bopohaa/patch-1
...
closed #3159 : Webp Test Crashes.
2013-11-11 18:31:03 -08:00
Ricardo Quesada
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
boyu0
dbafd9af2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-12 10:07:26 +08:00
James Chen
cc3a6ebda9
Merge pull request #4150 from ledyba/fix_ccdevice
...
Close X Display
2013-11-11 17:40:32 -08:00
minggo
44bed76c21
Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3
...
[ci skip]Develop nutty optimizeguireader 3
2013-11-11 17:36:22 -08:00
Ricardo Quesada
d6446e9b14
calls `delete[]` instead of `delete`
...
calls `delete[]` instead of `delete`
2013-11-11 16:07:46 -08:00
James Chen
51cfd3fb4b
Merge pull request #4151 from pyrasis/develop
...
[Win32] fix compile error.
2013-11-11 04:42:42 -08:00
CocosRobot
3472d7ad50
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 10:57:57 +00:00
boyu0
d75c96443d
issue #2770 : fix some warning
2013-11-11 18:28:59 +08:00
CaiWenzhi
b688e39584
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-11 18:23:21 +08:00
CaiWenzhi
4f76141c41
optimize guireader
2013-11-11 18:22:14 +08:00
minggo
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo
d3cf36ba37
Merge pull request #4171 from dumganhar/jsb-64bit-fix
...
[ci skip]Jsb 64bit fix
2013-11-11 02:17:42 -08:00
CaiWenzhi
782c26bc37
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-11 17:57:43 +08:00
2youyou2
cdae8f51bc
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-11-11 17:30:52 +08:00
2youyou2
528c257497
add setUserObject method to CCArmatureAnimation
2013-11-11 17:30:37 +08:00
minggo
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
samuele3
7cfe890d5d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-11 17:04:37 +08:00
samuele3
06c7d3e96d
issue #2868:Add ccd lua test samples
2013-11-11 17:03:43 +08:00
minggo
2a31ff04c2
Merge pull request #4166 from dabingnn/iss3025_TextureCache
...
[ci skip]issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 00:46:46 -08:00
James Chen
49289d7576
Adding cc.TextureCache.getInstance() to jsb_deprecated.js.
2013-11-11 16:45:44 +08:00
James Chen
20b350a58b
Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp).
2013-11-11 16:45:44 +08:00
James Chen
0151ac60ba
fix 64bit warning. unsigned int (int) —> long.
2013-11-11 16:45:44 +08:00
boyu0
a54603390e
issue #2771 : change pointQuery implements
2013-11-11 16:23:42 +08:00
CocosRobot
2e52dd4905
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 08:05:15 +00:00
Huabing.Xu
dfcae4ed0d
issue #3025 : change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore
2013-11-11 16:04:34 +08:00
Jason Xu
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
Huabing.Xu
3fc16256ab
issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 15:40:12 +08:00
boyu0
b3f44a0805
issue #2771 : edit assert message
2013-11-11 15:31:20 +08:00
yinkaile
677cf00355
fix compiler warning
2013-11-11 15:29:24 +08:00
yinkaile
50ab5783d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-11 15:16:13 +08:00
minggo
cd22f5543b
Merge pull request #3997 from ondesly/screen_size_change
...
[ci skip]android & ios screen size change support
2013-11-10 23:10:13 -08:00
minggo
bbb2579114
Merge pull request #4160 from dabingnn/iss3025_TextureCache
...
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
boyu0
13efb7e822
issue #2771 : add pointQuery
2013-11-11 15:03:17 +08:00
yinkaile
9f67ea786e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-11 14:57:20 +08:00
yinkaile
0bb8714f86
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-11-11 14:53:18 +08:00
yinkaile
5ba1e4ce10
1.remove compiler wornings
...
2.change void Bone::removeFromParent(bool recursion); to void Bone::removeFromParent();
2013-11-11 14:50:30 +08:00
James Chen
9d7a8c44f9
Reverts auto-generated.
2013-11-11 14:40:23 +08:00
James Chen
8f8d0f86d7
Updating Bindings-generator.
2013-11-11 14:38:12 +08:00
James Chen
ff3bfbe8a2
Using std::unordered_map instead of UTHASH for js_type_class_t.
...
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
2013-11-11 14:36:43 +08:00
James Chen
55cf30b7c8
HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp.
2013-11-11 14:36:43 +08:00
James Chen
5a0df8d2e8
VS2012 doesn’t support invoke another constructor method in current constructor.
2013-11-11 14:36:43 +08:00
James Chen
fe88f7c941
Fixing memory leak of JSStringWrapper::set .
2013-11-11 14:36:43 +08:00
James Chen
9d5813b7d9
Some fixes:
...
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
2013-11-11 14:36:42 +08:00
Huabing.Xu
55b9462b17
issue #3025 : directly use _textureCache in Director
2013-11-11 14:21:41 +08:00
boyu0
9b99872067
issue #2770 : fix some warning
2013-11-11 14:11:06 +08:00
minggo
e193311e55
Merge pull request #4161 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warning
2013-11-10 22:10:10 -08:00
2youyou2
0a72c3c1c2
1.when add a skin to last index, applay it's skindata to the previous skindata
...
2.Do not retain target when regist frame event and movement event
2013-11-11 13:33:47 +08:00
James Chen
707a6c246f
Merge pull request #4157 from dumganhar/iss3137-fix-acc
...
closed #3137 : Device::setAccelerometerEnabled needs to be invoked before adding ACC listener
2013-11-10 21:03:24 -08:00
boyu0
6c1144ee79
issue #2770 : fix some warning
2013-11-11 12:49:38 +08:00
minggo
e981dbf7e4
Merge pull request #4158 from dumganhar/remove-jsb-version
...
[ci skip]Removing JSB Version since JSB source codes will be updated with cocos2d-x.
2013-11-10 20:45:22 -08:00
minggo
def560c811
Merge pull request #4159 from mlepage/develop
...
[ci skip]Fix typos and other trivial cleanup
2013-11-10 20:06:56 -08:00
Huabing.Xu
02da3a29cc
issue #3025 : deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead
2013-11-11 11:38:02 +08:00
Marc Lepage
27b82f8f67
Fix typos and other trivial cleanup
2013-11-10 22:00:50 -05:00
James Chen
0c4b6e7a37
Removing JSB Version since JSB source codes will be updated with cocos2d-x.
...
Also, remove some unused codes.
2013-11-11 10:40:51 +08:00
James Chen
a6c85a3906
issue #3137 : Disabling Accelerometer when layer is destroyed.
2013-11-11 10:23:05 +08:00
minggo
9a3d2e941e
Merge pull request #3969 from dualface/develop
...
[ci skip]fix tolua_fix, cleanup peertable after object deleted
2013-11-10 17:44:24 -08:00
bopohaa
ef92efcd79
Update CCImageCommon_cpp.h
...
webp don't work for me
2013-11-11 02:28:27 +03:00
James Chen
deeaa4d1bc
Merge pull request #4148 from dumganhar/touch-onebyone-available
...
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
2013-11-10 00:39:30 -08:00
dualface
c75c20de04
fix Lua 5.2 compatibility
2013-11-10 11:49:52 +08:00
CocosRobot
6e6c63e111
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-10 03:29:03 +00:00
samuele3
d4dbc7a442
Add conversion config for long type
2013-11-10 09:21:33 +08:00
dualface
2a2fc81f86
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-10 00:00:19 +08:00
samuele3
e26fe04deb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-09 23:04:11 +08:00
samuele3
286393d28e
issue #2868:Add more manual lua binding functions
2013-11-09 22:58:40 +08:00
Lee, Jae-Hong
e132142689
[Win32] Update libGUI project
...
- Update files list.
2013-11-09 23:57:18 +09:00
Lee, Jae-Hong
3d23ca328e
[Win32] fix compile error.
...
- fix C2552 error in VS2012.
2013-11-09 23:56:24 +09:00
Lee, Jae-Hong
5e36021d54
[Win32] fix argument type.
...
- argument of interface is a long type.
2013-11-09 23:44:15 +09:00
psi
c4e70387f7
Close display
2013-11-09 23:02:45 +09:00
James Chen
f3a5245bfa
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
2013-11-09 18:11:57 +08:00
Ricardo Quesada
5faae4a51e
removes exe bit from text files
2013-11-08 11:30:50 -08:00
CaiWenzhi
a0f794b7df
optimize layout
2013-11-08 23:26:44 +08:00
CaiWenzhi
8a5084effa
add list view event
2013-11-08 20:29:49 +08:00
CaiWenzhi
1f389d3779
Rename event interface
2013-11-08 18:43:06 +08:00
Huabing.Xu
b726c6fd2c
issue #3025 : move VolatileTexture static function to VolatileTextureMgr
2013-11-08 16:47:33 +08:00
boyu0
4efacdbcf3
issue #2771 : rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs
2013-11-08 16:17:56 +08:00
minggo
4553db492a
Merge pull request #4141 from Dhilan007/m_c_jsb
...
[ci skip]use float instead for create point object
2013-11-07 23:57:14 -08:00
CaiWenzhi
da27169d45
add "setUserObject" method
2013-11-08 14:58:20 +08:00
Liam
2aaa21255f
fixed cocostudio action can not looping
2013-11-08 14:34:24 +08:00
boyu0
a56dedb41a
issue #2771 : add class PhysicsDebugDraw
2013-11-08 14:25:03 +08:00
Dhilan007
314f2ac62e
use float instead for create point object
2013-11-08 14:13:39 +08:00
Huabing.Xu
6f1e98df34
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache
2013-11-08 13:50:22 +08:00
CocosRobot
fd37d3e973
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-08 04:17:15 +00:00
CaiWenzhi
18f411fd1e
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-08 11:36:59 +08:00
Huabing.Xu
935d472979
issue #3025 : remove TextureCache::_sharedTextureCache
2013-11-08 11:36:27 +08:00
minggo
56d7da8933
Merge pull request #4130 from ricardoquesada/love_in_textfield
...
[ci skip]More std::string& usage
2013-11-07 19:14:35 -08:00
CocosRobot
240fc2ade1
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-08 03:10:36 +00:00
minggo
d2bb1c72cc
Merge pull request #4117 from michaelcontento/add-missing-setscale-to-sprite
...
[ci skip]add Sprite::setScale(float, float)
2013-11-07 18:54:04 -08:00
minggo
d1f94e0d9d
Merge pull request #4111 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physical
2013-11-07 18:51:15 -08:00
minggo
167242e540
Merge pull request #4127 from Dhilan007/ANCHOR_XXX
...
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
2013-11-07 18:45:50 -08:00
Ricardo Quesada
ffd4342548
Adds more strings
...
and more `override`
and fixes some indetentation issues
2013-11-07 12:42:16 -08:00
Ricardo Quesada
e4662b371a
TextField uses std::string& in the public API
...
and uses std::string instead of std::string* internally
2013-11-07 11:58:48 -08:00
Michael Contento
0160bec3ad
Colors are now compare- and explicit convertible
2013-11-07 18:13:33 +01:00
Dhilan007
916361af3f
Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc.
2013-11-07 23:40:33 +08:00
samuele3
f56269ce85
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-07 23:23:11 +08:00
samuele3
16d572c04f
issue #2868:Add manual lua binding files
2013-11-07 23:22:11 +08:00
CaiWenzhi
c69163559b
Move some method from helper to reader
2013-11-07 21:26:56 +08:00
CaiWenzhi
9b4aa95b31
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 21:18:21 +08:00
Huabing.Xu
99bcca0532
issue #3025 : replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
2013-11-07 19:11:09 +08:00
Huabing.Xu
c8fe6077aa
issue #3025 : Deprecate TextureCache::getInstance() destroyInstance()
2013-11-07 19:10:14 +08:00
Huabing.Xu
99546cef46
issue #3025 : add getTextureCache() in CCdirector()
2013-11-07 18:52:36 +08:00
minggo
237f7a7839
Merge pull request #4125 from minggo/fix-compiling-error
...
[ci skip]fix compiling erros on Android
2013-11-07 02:04:27 -08:00
boyu0
b6c98ab1eb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:59:01 +08:00
boyu0
e278ad66c8
issue #2771 : change PhysicsJoint::create() to PhysicsJoint::construct()
2013-11-07 17:46:05 +08:00
CaiWenzhi
b0a422eb09
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 17:40:13 +08:00
boyu0
7363be0697
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:37:33 +08:00
minggo
b9b14571ac
fix compiling erros on Android
2013-11-07 17:16:31 +08:00
CaiWenzhi
e2249c8c3f
Fixed crash
2013-11-07 17:15:52 +08:00
CocosRobot
a116e7ec79
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-07 09:11:22 +00:00
CaiWenzhi
9f2297a5a6
add "retain" to listeners
2013-11-07 16:46:41 +08:00
samuele3
9f5095b9c3
Reslove the compiled error
2013-11-07 16:43:04 +08:00
boyu0
ef5440f738
issue #2771 : change rayCast and rectQuery callback class to std::function
2013-11-07 16:23:50 +08:00
samuele3
e6fd1fece1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
2013-11-07 15:28:48 +08:00
samuele3
8c025a2cee
Reslove the linux compiled error
2013-11-07 15:12:19 +08:00
boyu0
eb508e4728
issue #2771 : fix PhysicsWorld functions name readadd/removexxx -> doadd/removexxx delayTestAdd/Removexxx -> add/removexxxOrDelay
2013-11-07 15:12:13 +08:00
boyu0
a02fd7c6da
issue #2771 : fix PhysicsWorld some bugs
2013-11-07 14:40:09 +08:00
boyu0
f2cd5ca630
issue #2771 : fix body and joint memory bugs. add removeFormWorld and destroy to PhysicsJoint, and add a destroy param to PhysicsWorld->removeJoint()
2013-11-07 14:17:57 +08:00
CaiWenzhi
af5ab02bc7
temp commit
2013-11-07 14:00:51 +08:00
CaiWenzhi
cf20ae03ee
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 10:01:00 +08:00
CaiWenzhi
fa0011346e
fixed linux build error
2013-11-07 09:58:24 +08:00
Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
Michael Contento
b7173cd60d
add Sprite::setScale(float, float)
2013-11-06 14:42:31 +01:00
James Chen
d6d041f561
issue #3113 : [Linux] Adding options for modules.
2013-11-06 19:17:34 +08:00
CaiWenzhi
e765eb1e7a
Test commit
2013-11-06 18:30:09 +08:00
CaiWenzhi
7163dd4d76
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-06 18:13:51 +08:00
CocosRobot
8a836dc477
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 09:38:34 +00:00
CaiWenzhi
94896b5b74
Modify mk files
2013-11-06 17:20:14 +08:00
2youyou2
3ea0d2f12d
change override function
2013-11-06 16:37:30 +08:00
2youyou2
73e5310bf6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:29:54 +08:00
CaiWenzhi
12570b5e8f
temp commit
2013-11-06 16:20:01 +08:00
CaiWenzhi
7a207431cd
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
...
Conflicts:
cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
2youyou2
fcf0b1ef5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:06:37 +08:00
CaiWenzhi
e0aa82da13
Merge master branch to develop branch
2013-11-06 16:04:06 +08:00
CocosRobot
d990699417
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 08:00:35 +00:00
James Chen
9d3716e964
Merge pull request #4109 from HoGarfield/JS_Call
...
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
2013-11-05 23:56:03 -08:00
boyu0
6c27a0df0b
issue #2771 : make api more friendly
2013-11-06 15:43:29 +08:00
garfield_ho
f36fd002cd
Remove duplicate
2013-11-06 15:40:23 +08:00
2youyou2
efd8f62992
add virtual
2013-11-06 15:40:06 +08:00
garfield_ho
f6070406cd
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
2013-11-06 15:31:58 +08:00
James Chen
2e80e95a37
[Linux] compilation fix for PR #4099
2013-11-06 15:26:33 +08:00
2youyou2
12d6bc1722
1. change CCARRAY_FOREACH to range-based loop
2013-11-06 15:25:44 +08:00
James Chen
4e4798fdcc
Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix
2013-11-06 15:15:47 +08:00
James Chen
33a243155f
Merge pull request #4107 from dumganhar/cmake
...
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-05 23:09:23 -08:00
James Chen
f3c40a3e7a
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-06 14:54:35 +08:00
boyu0
a01fcc6f36
issue #2771 : move header definition to first line
2013-11-06 14:51:56 +08:00
CocosRobot
d7ed908818
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 06:20:17 +00:00
minggo
a416a6b258
Merge pull request #4102 from ricardoquesada/uses_string
...
Uses `const std::string&`
2013-11-05 22:14:27 -08:00
2youyou2
f05c1590ae
1.fix particle kCCPositionTypeFree state bug
2013-11-06 11:20:16 +08:00
Ricardo Quesada
555f3609c8
Uses `const std::string&`
...
... instead of const char*
* Because it is more robust
* and it is faster... yes faster.
It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.
It is faster to have everthing in std::string as soon as possible to
prevent further conversions.
There are still some parts of the code that require conversion, but
most of the code was converted.
2013-11-05 19:02:03 -08:00
Ricardo Quesada
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
Chris Hannon
471dd07f3b
[android] update nativeactivity.cpp to work with changes made in commit 0220f27 (AMD support), changing int to long int for the second argument in most touch callbacks
2013-11-05 15:54:31 -05:00
2youyou2
8b86373b08
1.Change to range-based loop
2013-11-05 20:33:29 +08:00
boyu0
af129e25f0
issue #2771 : change some coding style
2013-11-05 20:02:58 +08:00
2youyou2
16c23d0ad3
remove CC_PROPERTY and CC_SYNTHESIZE.
2013-11-05 19:53:38 +08:00
CocosRobot
47e0d343ff
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 11:30:43 +00:00
James Chen
64b9cba5d5
Merge pull request #4092 from samuele3hu/developCCS
...
issue 2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
2013-11-05 03:24:20 -08:00
samuele3
66256e9ad7
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
2013-11-05 17:48:29 +08:00
samuele3
b9e5d4bc91
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 17:37:54 +08:00
samuele3
61d8f9673c
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
2013-11-05 17:34:25 +08:00
CocosRobot
8c75cd0dfa
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 08:07:15 +00:00