samuele3hu
|
7e81f32016
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText
|
2014-04-18 11:55:30 +08:00 |
samuele3hu
|
914516a4e0
|
fix the compile error about luabindings and add the `RichText` test cases.
|
2014-04-18 11:54:57 +08:00 |
chuanweizhang2013
|
2a9c99ff66
|
Merge pull request #25 from cocos2d/develop
update cocos2d-x
|
2014-04-18 11:45:53 +08:00 |
CocosRobot
|
a78a1090c3
|
[AUTO]: updating luabinding automatically
|
2014-04-18 02:51:14 +00:00 |
minggo
|
7399ef2527
|
Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize
Develop nutty widgetsupportscontentsize
|
2014-04-18 10:47:10 +08:00 |
minggo
|
a8a8ef85e6
|
add comment for EventListenerTouchOneByOne::checkAvailable()
|
2014-04-17 14:46:52 +08:00 |
CaiWenzhi
|
a8bfa094c0
|
Remove useless codes
|
2014-04-17 14:27:21 +08:00 |
CaiWenzhi
|
ed4fcd5d1a
|
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
|
2014-04-17 14:23:08 +08:00 |
CaiWenzhi
|
19f6526ef8
|
Widget supports contentsize
|
2014-04-17 14:08:25 +08:00 |
samuele3hu
|
11515f6ab3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
|
2014-04-17 11:06:20 +08:00 |
samuele3hu
|
1331fff62c
|
fix the bug that exit layer can’t end SimpleAudioEngine
|
2014-04-17 10:36:08 +08:00 |
James Chen
|
30e1d41dbf
|
Makes 'compareRenderCommand' as a static function instead of a global function
|
2014-04-17 10:16:37 +08:00 |
andyque
|
a9ed075d50
|
closed #4883. fixed slider hittest problem
|
2014-04-17 10:15:58 +08:00 |
James Chen
|
63f54cb5f7
|
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
|
2014-04-17 10:15:11 +08:00 |
zifter
|
08d975268d
|
Fix for issue http://www.cocos2d-x.org/issues/4880.
|
2014-04-17 03:15:43 +03:00 |
Elviss Strazdins
|
5ddef013ba
|
Flipping RenderTexture's sprite instead of scaling it by -1
|
2014-04-17 02:22:34 +03:00 |
Huabing.Xu
|
d14d3007d0
|
remove kazmath include file
|
2014-04-16 14:08:58 +08:00 |
Huabing.Xu
|
346d42f723
|
remove warning message---finished
|
2014-04-16 11:20:45 +08:00 |
Huabing.Xu
|
6fd7197d96
|
remove warning message---continue
|
2014-04-16 11:18:23 +08:00 |
Huabing.Xu
|
a32bb8cd23
|
remove warning message---continue
|
2014-04-16 10:58:34 +08:00 |
Huabing.Xu
|
b01941b6ac
|
remove warning message---continue
|
2014-04-16 10:42:39 +08:00 |
Huabing.Xu
|
2bb32a8e4b
|
remove warning message
|
2014-04-16 10:27:17 +08:00 |
Huabing.Xu
|
30dec564e6
|
remove kazmath/kazmath.h include
|
2014-04-15 23:50:28 +08:00 |
Huabing.Xu
|
debad86ec1
|
fix compile error after merge
|
2014-04-15 22:35:35 +08:00 |
Huabing.Xu
|
95cb7721f6
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
|
2014-04-15 22:21:04 +08:00 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
Huabing.Xu
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
Huabing.Xu
|
917ae6e88b
|
deprecate Point, using Vector2 instead
|
2014-04-15 17:46:44 +08:00 |
Huabing.Xu
|
5303f50904
|
Migrate to Vector2 in DrawPrimitive.h
|
2014-04-15 17:29:23 +08:00 |
cw
|
312cd49b1a
|
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
|
2014-04-15 17:10:24 +08:00 |
cw
|
d361efacae
|
add update
|
2014-04-15 17:10:11 +08:00 |
Huabing.Xu
|
9c33b48b50
|
remove Point in CCNode.h and CCSprite.h
|
2014-04-15 17:09:18 +08:00 |
Huabing.Xu
|
511e868ac4
|
migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2
|
2014-04-15 16:59:16 +08:00 |
Huabing.Xu
|
e351b778c1
|
migrate setAnchorPoint to Vector2
|
2014-04-15 16:47:29 +08:00 |
Huabing.Xu
|
6686b657a4
|
Migrate getPostion and correspondent member variable to Vector2
|
2014-04-15 16:28:59 +08:00 |
Huabing.Xu
|
071cbc7565
|
migrate setPosition to Vector2
|
2014-04-15 16:16:14 +08:00 |
Huabing.Xu
|
ec2ef0f64b
|
migrate convertXXXX to Vector2 step2
|
2014-04-15 14:41:09 +08:00 |
Huabing.Xu
|
633173005b
|
migrate convertXXXX to Vector2
|
2014-04-15 14:29:12 +08:00 |
Huabing.Xu
|
4df714b9d8
|
Migrate to Vector2 in class Director
|
2014-04-15 14:18:40 +08:00 |
Huabing.Xu
|
44be9a38ec
|
Node convertToNodeSpace and convertToWorldSpace use Vector2
|
2014-04-15 14:09:46 +08:00 |
minggo
|
46e7058587
|
update version information
|
2014-04-15 13:58:51 +08:00 |
Huabing.Xu
|
11fc8ac308
|
conversion from Vector2 and Point
|
2014-04-15 13:58:08 +08:00 |
minggo
|
38b982f938
|
Merge pull request #6286 from dumganhar/rename-listener-method
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
|
2014-04-15 13:43:25 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
James Chen
|
8134404734
|
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'
-> 'EventListener::(s|g)etAssociatedNode'
|
2014-04-15 12:50:33 +08:00 |
Huabing.Xu
|
3f496069b4
|
add interface in Vector2 for Point
|
2014-04-15 11:58:08 +08:00 |
CocosRobot
|
4f9387447d
|
[AUTO]: updating luabinding automatically
|
2014-04-15 03:41:34 +00:00 |
Ricardo Quesada
|
3978cee2ee
|
compiles on windows
|
2014-04-14 20:00:06 -07:00 |
Ricardo Quesada
|
584ccf65e4
|
Culling working again
|
2014-04-14 16:46:19 -07:00 |
boyu0
|
c98f50026f
|
issue $4771: move PhysicsWorld to layer.
|
2014-04-15 03:21:18 +08:00 |
Huabing.Xu
|
c081fc61aa
|
comment kmMat4 & Matrix conversion code
|
2014-04-14 17:49:45 +08:00 |
Huabing.Xu
|
15cc63c2ba
|
remove kmVec3 in ActionCamera
|
2014-04-14 15:26:05 +08:00 |
minggo
|
de5f52857a
|
Merge pull request #6273 from CocosRobot/update_lua_bindings_1397458473
[AUTO]: updating luabinding automatically
|
2014-04-14 14:56:35 +08:00 |
CocosRobot
|
daccbdb2bf
|
[AUTO]: updating luabinding automatically
|
2014-04-14 06:55:48 +00:00 |
minggo
|
26494c000b
|
Merge pull request #6257 from dumganhar/group-command-manager-not-singleton
GroupCommandManager should not be a singleton, it should be managed by Renderer.
|
2014-04-14 14:52:39 +08:00 |
minggo
|
bb15d0ecf9
|
Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option
Add interface setCullingEnabled(), culling is disabled by default
|
2014-04-14 14:50:11 +08:00 |
Huabing.Xu
|
3601fe9297
|
android can work
|
2014-04-14 14:30:17 +08:00 |
Huabing.Xu
|
c3bf78494a
|
remove CCFrustum.cpp, we will use new instead
|
2014-04-14 14:18:32 +08:00 |
James Chen
|
eb651a6ae4
|
Merge pull request #6272 from Dhilan007/develop
LabelTTF:fixed display incorrect if create by FontDefinition.
|
2014-04-14 14:09:50 +08:00 |
Huabing.Xu
|
ec5398e7c6
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
|
2014-04-14 14:08:19 +08:00 |
Dhilan007
|
aef2767d23
|
change variable name.
|
2014-04-14 13:42:37 +08:00 |
Dhilan007
|
6fe64b83f8
|
LabelTTF:fixed display incorrect if create by FontDefinition.
|
2014-04-14 11:33:46 +08:00 |
Huabing.Xu
|
9935e8ddfb
|
setCullingEnabled set to public access
changed renderer->culling test case
|
2014-04-14 11:33:40 +08:00 |
minggo
|
4faa1c9651
|
Merge pull request #6243 from koowolf/wp8_audio
closed #4762: fix some problems in cocosdension in wp8
|
2014-04-14 10:47:45 +08:00 |
minggo
|
9f9a87f09d
|
Merge pull request #6254 from dumganhar/clippingnode-leak
Memory leak fix for ClippingNode
|
2014-04-14 10:17:37 +08:00 |
minggo
|
4669e7fa39
|
Merge pull request #6255 from dumganhar/cocostudio-leak
Memory leak fix in macro IMPLEMENT_CLASS_INFO
|
2014-04-14 10:13:52 +08:00 |
James Chen
|
44a01be0f5
|
Merge pull request #6266 from dumganhar/develop
Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&
|
2014-04-14 10:04:44 +08:00 |
James Chen
|
5000873778
|
Const love: std::function<void(Texture2D*)> -> const
std::function<void(Texture2D*)>&
|
2014-04-14 10:01:17 +08:00 |
Huabing.Xu
|
37bfeff8f0
|
Add interface setCullingEnabled(), culling is disabled by default
|
2014-04-14 09:56:01 +08:00 |
Huabing.Xu
|
80f96398b3
|
1. changed comment message in CCNode.cpp
2. changed Director projection to Matrix
|
2014-04-14 09:30:51 +08:00 |
Sachin Garg
|
69223549f3
|
Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity.
|
2014-04-14 05:46:30 +05:30 |
Anton Sokolchenko
|
503d270f8f
|
Fix loosing precision
I had a warning on building for iPhone 64 bit.
As you can see above variable "rc" has a type of size_t too( void Console::commandUpload(int fd) );
|
2014-04-13 01:55:43 +03:00 |
Anton Sokolchenko
|
65cf2e1256
|
Update CCImage.cpp
|
2014-04-13 01:13:58 +03:00 |
Mazyad Alabduljaleel
|
40e6288ac7
|
[NEW]: update HTTPClient to use C++11 callbacks
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
|
2014-04-13 01:06:04 +04:00 |
Anton Sokolchenko
|
a9ccb812ed
|
Fix memory leak
|
2014-04-12 18:47:00 +03:00 |
Sergey
|
436285accd
|
isActivityVisible method
|
2014-04-12 12:38:01 +04:00 |
James Chen
|
b276c42ae6
|
GroupCommandManager should not be a singleton, it should be managed by Renderer.
|
2014-04-12 13:01:42 +08:00 |
James Chen
|
b715a87791
|
Memory leak fix in macro IMPLEMENT_CLASS_INFO
|
2014-04-12 12:58:00 +08:00 |
James Chen
|
922b399ef2
|
Memory leak fix for ClippingNode
|
2014-04-12 12:56:36 +08:00 |
James Chen
|
377b50e6fd
|
Merge pull request #6249 from dumganhar/develop
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' in ConsoleTest.
|
2014-04-11 20:28:00 +08:00 |
James Chen
|
576d9d872c
|
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next'
in ConsoleTest.
|
2014-04-11 20:07:54 +08:00 |
James Chen
|
6417c8f8e9
|
Merge pull request #6244 from dumganhar/develop
Warning fixes in ui, getZOrder -> getLocalZOrder
|
2014-04-11 18:14:54 +08:00 |
James Chen
|
7c5b4be0b1
|
Warning fixes in ui, getZOrder -> getLocalZOrder
|
2014-04-11 18:06:53 +08:00 |
koowolf
|
5b3d5badfa
|
closed #4763: 1.fix stopalleffect lead to stop background music 2.fix play effect may lead to memory leak
|
2014-04-11 17:53:00 +08:00 |
James Chen
|
b40773f6d0
|
Merge pull request #6240 from dabingnn/develop_add_rendererAssert
Trigger an assert if a command is added while render is rendering.
|
2014-04-11 17:37:02 +08:00 |
Huabing.Xu
|
a8378a2b99
|
adjust comment
|
2014-04-11 17:31:35 +08:00 |
Huabing.Xu
|
866c4ad735
|
remove kmMat4 in Armature
|
2014-04-11 17:25:28 +08:00 |
Huabing.Xu
|
7af4d558c6
|
remove kmMat4 in AffineTransform.cpp
|
2014-04-11 17:19:32 +08:00 |
Huabing.Xu
|
7c027b16b0
|
change assert message
|
2014-04-11 16:07:55 +08:00 |
Huabing.Xu
|
51289e8a4c
|
1. add assert condition of rendering when adding command
2. fix bug: renderTexture->SpriteRenderTextureBug
|
2014-04-11 16:05:22 +08:00 |
James Chen
|
c44e2f9bc8
|
Merge pull request #6211 from chuanweizhang2013/luaruntime
update lua template runtime
|
2014-04-11 15:08:15 +08:00 |
samuele3hu
|
2f1f09d5bf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-11 14:35:07 +08:00 |
samuele3hu
|
5b2cf595a2
|
fix the crash invoked by calling the `glGetUniformfv`
|
2014-04-11 14:31:44 +08:00 |
Huabing.Xu
|
554ede75f0
|
remove kmMat4 in ActionCamera.cpp
|
2014-04-11 14:00:55 +08:00 |
Huabing.Xu
|
e5802a56da
|
remove kmMat4 in RenderTexture.cpp
|
2014-04-11 13:58:42 +08:00 |
James Chen
|
588d825691
|
Merge pull request #6236 from dumganhar/develop
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
|
2014-04-11 13:53:54 +08:00 |
James Chen
|
85cc100ac4
|
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
|
2014-04-11 13:51:40 +08:00 |
Huabing.Xu
|
685b9ea297
|
android can work now
|
2014-04-11 12:02:56 +08:00 |
Huabing.Xu
|
1670e07300
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-04-11 11:18:13 +08:00 |
Huabing.Xu
|
ad18add1af
|
remove kmMat4 in Sprite.cpp
|
2014-04-11 11:00:08 +08:00 |
James Chen
|
48a5fd555b
|
Compilation error fix in CCQuadCommand.cpp
|
2014-04-11 10:50:38 +08:00 |
James Chen
|
dbeefcdff2
|
Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230
|
2014-04-11 10:48:29 +08:00 |
chuanweizhang2013
|
41933a6fd0
|
Merge pull request #23 from cocos2d/develop
update cocos2d-x
|
2014-04-11 09:55:51 +08:00 |
samuele3hu
|
f136108037
|
fix compile error
|
2014-04-11 09:52:09 +08:00 |
chuanweizhang2013
|
337bc2f2e8
|
Merge pull request #22 from cocos2d/develop
update cocos2d-x
|
2014-04-11 09:33:04 +08:00 |
samuele3hu
|
70dec15e76
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 23:38:57 +08:00 |
samuele3hu
|
c687b97c6e
|
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-10 23:36:25 +08:00 |
Huabing.Xu
|
591b1e9231
|
remove kmMat4 in Node.cpp
|
2014-04-10 23:12:29 +08:00 |
minggo
|
951bf1cbfa
|
remove unneeded codes
|
2014-04-10 22:56:40 +08:00 |
Huabing.Xu
|
d70305cf3b
|
remove kmMat4 in Render.cpp GLProgram, Grid, Layer
|
2014-04-10 22:38:57 +08:00 |
James Chen
|
8e2bd0d2ee
|
Merge pull request #6229 from dumganhar/develop
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
|
2014-04-10 21:16:19 +08:00 |
James Chen
|
6b21e598c5
|
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
|
2014-04-10 21:14:24 +08:00 |
James Chen
|
cfc2a05194
|
Merge pull request #6228 from dumganhar/develop
Initializes member variables for QualCommand class.
|
2014-04-10 21:01:22 +08:00 |
James Chen
|
1fdcaaa2c6
|
Initialzies member variables for QualCommand class.
|
2014-04-10 20:31:44 +08:00 |
James Chen
|
f99b9bbabe
|
Merge pull request #6225 from heliclei/fix-console-linux-crash2
fix CCConsole linux crash
|
2014-04-10 19:57:50 +08:00 |
James Chen
|
7b4bec1395
|
Merge pull request #6226 from dumganhar/develop
Initializes member variables for TransitionScene class
|
2014-04-10 19:33:17 +08:00 |
James Chen
|
e7a4ac531a
|
Initializes member variables for TransitionScene class
|
2014-04-10 19:29:07 +08:00 |
heliclei
|
157fce785c
|
fix CCConsole linux crash
|
2014-04-10 18:31:28 +08:00 |
Huabing.Xu
|
84cf5ca895
|
remove kmMat4 in Director.cpp
|
2014-04-10 17:36:47 +08:00 |
James Chen
|
167682fb46
|
Merge pull request #6222 from Dhilan007/develop
Add CCFontFNT.h to cocos2d.h
|
2014-04-10 17:33:36 +08:00 |
Dhilan007
|
8472e51b85
|
Add CCFontFNT.h to cocos2d.h
|
2014-04-10 17:31:42 +08:00 |
James Chen
|
2d131cf96a
|
Merge pull request #6221 from dumganhar/develop
Removed unused comments in GUIDefine.h
|
2014-04-10 17:19:56 +08:00 |
James Chen
|
39b25c9307
|
Removed unused comments in GUIDefine.h
|
2014-04-10 17:15:59 +08:00 |
James Chen
|
5d882cea23
|
Merge pull request #6213 from koowolf/wp8_fix
fix compiler error in wp8
|
2014-04-10 17:10:08 +08:00 |
Huabing.Xu
|
4e0be639a2
|
remove typo
|
2014-04-10 17:09:48 +08:00 |
James Chen
|
443195df40
|
Merge pull request #6123 from ololomax/patch-1
set _node to null in createNodeWithSceneFile
|
2014-04-10 17:05:45 +08:00 |
Huabing.Xu
|
7441c06680
|
change matrix projection compatible with kazmath logic
|
2014-04-10 17:02:36 +08:00 |
CocosRobot
|
431f843773
|
[AUTO]: updating luabinding automatically
|
2014-04-10 08:20:27 +00:00 |
samuele3hu
|
748391f252
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 15:55:45 +08:00 |
samuele3hu
|
249163c32d
|
Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
|
2014-04-10 15:52:51 +08:00 |
James Chen
|
428cea061c
|
Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node
closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children
|
2014-04-10 15:35:29 +08:00 |
James Chen
|
a258df38a9
|
closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children
|
2014-04-10 15:31:22 +08:00 |
koowolf
|
aa51e5dd22
|
fix compiler error in wp8
|
2014-04-10 15:15:17 +08:00 |
samuele3hu
|
c4c4358708
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 15:05:41 +08:00 |
samuele3hu
|
2800133c99
|
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 14:54:14 +08:00 |
CocosRobot
|
3f1e8c83a4
|
[AUTO]: updating luabinding automatically
|
2014-04-10 06:19:59 +00:00 |
James Chen
|
7ec9d6907e
|
Moved the constructor and init function of SpriteBatchNode to protected access.
|
2014-04-10 14:11:40 +08:00 |
James Chen
|
6bdef136a7
|
Merge pull request #6145 from wefiends/set_fullscreen_videomode
CCGLView: Add createWithFullscreen overloaded method that sets video mode.
|
2014-04-10 12:45:57 +08:00 |
James Chen
|
599e14efaa
|
Merge pull request #6207 from CocosRobot/update_lua_bindings_1397100218
[AUTO]: updating luabinding automatically
|
2014-04-10 11:27:04 +08:00 |
CocosRobot
|
782bdd90f5
|
[AUTO]: updating luabinding automatically
|
2014-04-10 03:24:38 +00:00 |
James Chen
|
efb443dea0
|
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
issue #4729: Move deprecated stuff to deprecated folder
|
2014-04-10 11:17:21 +08:00 |
James Chen
|
ba1f535201
|
Merge pull request #6199 from Dhilan007/develop_label
closed #4743: Label:Makes the create functions of Label clearer.
|
2014-04-10 11:15:56 +08:00 |
Huabing.Xu
|
231cdcb906
|
adjust comment message
|
2014-04-10 11:14:46 +08:00 |
James Chen
|
117f248a3b
|
Fix for FileUtils::getData
|
2014-04-09 20:07:00 -07:00 |
Dhilan007
|
8ab372fdd9
|
Label:Add compatible API of the create functions.
|
2014-04-10 10:58:49 +08:00 |
Huabing.Xu
|
07ac817a7c
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-10 10:52:15 +08:00 |
James Chen
|
782d3cd3be
|
issue #4729: Linux fixes
|
2014-04-09 19:51:05 -07:00 |
chuanweizhang2013
|
91e42a17f5
|
Merge pull request #21 from cocos2d/develop
update cocos2d-x
|
2014-04-10 10:28:12 +08:00 |
Dhilan007
|
390685ae93
|
Label:Change setter of system font name.
|
2014-04-10 10:23:00 +08:00 |
James Chen
|
9a25613eb2
|
Merge pull request #6203 from dumganhar/develop
Fix for CC_CALLBACK_3 macro
|
2014-04-10 10:08:34 +08:00 |
James Chen
|
7db741cf42
|
Fix for CC_CALLBACK_3 macro
|
2014-04-10 10:07:01 +08:00 |
Anton Sokolchenko
|
eb568998b2
|
Update SimpleAudioEngineOpenAL.cpp
|
2014-04-10 01:00:23 +03:00 |
Anton Sokolchenko
|
5fadd6f9ab
|
Fix memory leak
471: If this executed "if (!file.file) ", then
473: dynamically allocated variable "data" is leaked.
|
2014-04-09 23:25:54 +03:00 |
James Chen
|
890dd64d38
|
issue #4729: some warning fixes and compilation error fixes on win32.
|
2014-04-10 01:29:13 +08:00 |
James Chen
|
364fc4722a
|
issue #4729: Updates CCInputDelegate.h
|
2014-04-10 00:52:41 +08:00 |
James Chen
|
5dc6dd87e9
|
issue #4729: include "ccTypes.h" in ccCArray.cpp for CC_INVALID_INDEX
|
2014-04-10 00:36:43 +08:00 |
James Chen
|
5615717617
|
issue #4729: NULL -> nullptr in constructor or setXXX(NULL)
|
2014-04-10 00:36:43 +08:00 |
James Chen
|
377086d67a
|
issue #4729: don't use 'using namespace std;'
|
2014-04-10 00:36:42 +08:00 |
James Chen
|
e59374de81
|
issue #4729: Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h,
probably there is a better place to define this variable, but let's just
choose ccTypes.h now.
|
2014-04-10 00:36:42 +08:00 |
James Chen
|
9d8d256bee
|
issue #4729: Android build works ok.
|
2014-04-10 00:36:42 +08:00 |
James Chen
|
a240c7b240
|
issue #4729: Moved CCNotificationCenter.h/.cpp to deprecated folder.
|
2014-04-10 00:36:42 +08:00 |
James Chen
|
0bb8f3da78
|
issue #4729: Updates win32/winrt xxx_headers.props
|
2014-04-10 00:36:42 +08:00 |
James Chen
|
43d6e1176a
|
issue #4729: Compilation error fixes for linux
|
2014-04-10 00:36:42 +08:00 |
James Chen
|
2fc6c0150c
|
issue #4729: iOS/Mac works fine
|
2014-04-10 00:36:41 +08:00 |
James Chen
|
5b296a62e9
|
issue #4729: Moved deprecated classes to 'cocos/deprecated' folder
|
2014-04-10 00:36:41 +08:00 |
minggo
|
2beed5d398
|
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
Develop fix renderer bug
|
2014-04-10 00:27:33 +08:00 |
Nick Barrios
|
64fc13cae2
|
CCGLView.h: Remove createWithFullscreen declaration.
|
2014-04-09 12:15:24 -04:00 |
Dhilan007
|
05b8123803
|
Label:Makes the create functions of Label just do one thing.
|
2014-04-09 23:31:05 +08:00 |
Dhilan007
|
67652357e1
|
1.Makes the create functions of Label clear.
|
2014-04-09 21:35:08 +08:00 |
James Chen
|
61134426a8
|
Some fixes detected by xcode analyze
|
2014-04-09 20:41:09 +08:00 |
Sergey
|
fdb863ae00
|
merge error fix
|
2014-04-09 13:59:22 +04:00 |
Anton Sokolchenko
|
87015ae888
|
2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
|
2014-04-09 11:37:56 +03:00 |
samuele3hu
|
b6579aa322
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 16:25:44 +08:00 |
James Chen
|
d71483632f
|
Merge pull request #6187 from Dhilan007/develop_activity
closed #4659:Remove the usage of OpenSL
|
2014-04-09 15:39:06 +08:00 |
Sergey
|
a6dc241986
|
On activity result listener added
it is strongly need fro most extensions like Game Center and In app billing
|
2014-04-09 11:27:53 +04:00 |
James Chen
|
39cca5012c
|
Merge pull request #6188 from Mazyod/develop-cocos2dx
[FIX]: HTTPClient should not report 2xx status codes as errors!
|
2014-04-09 15:27:52 +08:00 |
James Chen
|
671832acb7
|
Merge pull request #6184 from shujunqiao/lua-manual-console
[lua] add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp
|
2014-04-09 15:16:27 +08:00 |
Mazyad Alabduljaleel
|
1928a0cb07
|
= [FIX]: HTTPClient should not report 2xx status codes as errors!
|
2014-04-09 11:07:51 +04:00 |
Dhilan007
|
d310d8d099
|
closed #4659:Remove the usage of OpenSL
|
2014-04-09 14:57:07 +08:00 |
Huabing.Xu
|
a269ac2864
|
remove kmMat4 interface in cocostudio and UI
|
2014-04-09 14:44:54 +08:00 |
samuele3hu
|
1c124f52ad
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 14:29:04 +08:00 |
samuele3hu
|
dbd01051d8
|
close #4721:clone for EventListeners of lua didn't clone the related property
|
2014-04-09 14:26:05 +08:00 |
Huabing.Xu
|
504fa2aa60
|
remove kmMat4 interface in AffineTransform
|
2014-04-09 14:21:41 +08:00 |
shujunqiao
|
2c2876698d
|
add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp.
|
2014-04-09 14:20:02 +08:00 |
James Chen
|
c344a1e349
|
Merge pull request #6182 from Dhilan007/develop_activity
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
|
2014-04-09 14:08:06 +08:00 |
James Chen
|
d93a7e6445
|
Merge pull request #6177 from DarraghCoy/small_dangling_ptr_fix
Small dangling ptr fix to EventDispatcher::removeEventListenersForTarget
|
2014-04-09 13:22:24 +08:00 |
Huabing.Xu
|
8d01d4e07d
|
remove kmMat4 interface in cocos/2d folder
|
2014-04-09 11:53:01 +08:00 |
Huabing.Xu
|
491c97bfeb
|
remove kmMat4 interface in class RenderTexture and TextureFieldTTF file
|
2014-04-09 11:41:20 +08:00 |
Huabing.Xu
|
092d8d9ae9
|
remove kmMat4 interface in class Sprite
|
2014-04-09 11:28:34 +08:00 |
Huabing.Xu
|
e3a9972c4c
|
remove kmMat4 interface in class MotionStreak and ProgressTimer
|
2014-04-09 11:21:05 +08:00 |
Huabing.Xu
|
9496399cd0
|
remove kmMat4 interface in class Layer
|
2014-04-09 10:37:41 +08:00 |
Huabing.Xu
|
be4901d078
|
remove kmMat4 interface in class Label
|
2014-04-09 10:06:30 +08:00 |
Huabing.Xu
|
3e16857c92
|
remove kmMat4 interface in class DrawNode
|
2014-04-09 09:59:56 +08:00 |
chuanweizhang2013
|
c75466f555
|
Merge pull request #20 from cocos2d/develop
update cocos2d-x
|
2014-04-09 09:43:01 +08:00 |
Darragh Coy
|
93724b3806
|
Add in missing template parameter in function arg.
|
2014-04-08 12:34:22 -07:00 |
Darragh Coy
|
cbf85259cd
|
Convert tabs to spaces
|
2014-04-08 11:44:54 -07:00 |
Darragh Coy
|
14b210a082
|
RefPtr<T> - add move semantics
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
|
2014-04-08 11:34:27 -07:00 |
Nick Barrios
|
9c2a148256
|
CCGLView: Remove createWithFullScreen(const std::string& viewName, Size size) overload. Use more specific createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) instead.
|
2014-04-08 14:02:36 -04:00 |
Darragh Coy
|
a34b952e8d
|
Revert "Fix Android build for RefPtr addition."
This reverts commit 586383a05e .
|
2014-04-08 10:35:55 -07:00 |
Nick Barrios
|
6b8d5dd090
|
CCGLView: Add support for specifying video mode and monitor for fullscreen window creation.
|
2014-04-08 13:33:24 -04:00 |