James Chen
|
2d0ca10bbf
|
issue #2087: [dispatcher] fixedPriority == 0 is forbidden since it's used for scene graph based priority.
|
2013-09-16 22:46:44 +08:00 |
James Chen
|
157ffa9299
|
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
Merge gui to develop 3.0 branch
|
2013-09-16 07:45:23 -07:00 |
CaiWenzhi
|
f983155d7c
|
Modify scene sample
|
2013-09-16 22:29:53 +08:00 |
James Chen
|
605fdb73bb
|
issue #2087: [dispatcher] Reverts: CCLOG --> CCLOGINFO.
|
2013-09-16 22:23:07 +08:00 |
James Chen
|
a5d0820823
|
Merge pull request #3630 from dumganhar/develop
issue #2087: [dispatcher] Adding remove all event listener method in Node, removed unused codes.
|
2013-09-16 07:21:30 -07:00 |
James Chen
|
36bfb24d29
|
issue #2087: [dispatcher] Adding remove all event listener method in Node, removed unused codes.
|
2013-09-16 22:20:01 +08:00 |
boyu0
|
a48fee881d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-16 22:16:50 +08:00 |
CaiWenzhi
|
d276bfc885
|
modify mk files
|
2013-09-16 22:15:29 +08:00 |
minggo
|
7d6df7963b
|
Merge pull request #3629 from minggo/develop
[ci skip]update changelog
|
2013-09-16 07:10:41 -07:00 |
minggo
|
d31a81cb15
|
update changelog
|
2013-09-16 22:08:38 +08:00 |
boyu0
|
2c66f1b95e
|
issue #2771: Implement the minimum set of physical API. Improve the PhysicsTest
|
2013-09-16 21:22:22 +08:00 |
CaiWenzhi
|
0b48552f04
|
Modify scene reader
|
2013-09-16 21:07:11 +08:00 |
James Chen
|
5907e56601
|
Update AUTHORS [ci skip]
|
2013-09-16 21:00:24 +08:00 |
James Chen
|
61d9fd3c8a
|
Merge pull request #3626 from dumganhar/savdalion-suppressed-C4996
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3624[ci skip]
|
2013-09-16 05:58:29 -07:00 |
James Chen
|
b128018f76
|
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
|
2013-09-16 20:58:26 +08:00 |
CaiWenzhi
|
759fcc147b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop
|
2013-09-16 20:55:55 +08:00 |
CaiWenzhi
|
ca599b4852
|
Merge guy to 3.0 branch
|
2013-09-16 20:54:13 +08:00 |
James Chen
|
afc8627796
|
Merge pull request #3625 from dumganhar/develop
Re-adding the submodule of plugin which was deleted in pull request #3623[ci skip]
|
2013-09-16 05:53:09 -07:00 |
James Chen
|
6a662c094f
|
Re-adding the submodule of plugin which was deleted in pull request #3623.
|
2013-09-16 20:53:27 +08:00 |
James Chen
|
a8032b4a58
|
Merge pull request #3623 from dumganhar/2youyouo2-develop
Updating armature (Merge PR https://github.com/cocos2d/cocos2d-x/pull/3600)[ci skip]
|
2013-09-16 05:44:40 -07:00 |
James Chen
|
9981aecddf
|
Removing unneeded log in win32/CCEGLView.cpp.
|
2013-09-16 20:41:03 +08:00 |
signmotion
|
5dffb1b44e
|
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
|
2013-09-16 15:38:03 +03:00 |
James Chen
|
72c2d4ca35
|
Merge branch 'develop' into 2youyouo2-develop
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-09-16 20:12:03 +08:00 |
James Chen
|
79ed827e7b
|
Merge pull request #3622 from dumganhar/develop
[GUI] Fixing compilation errors for win32. [ci skip]
|
2013-09-16 05:04:01 -07:00 |
James Chen
|
c12a655fdf
|
[GUI] Fix compilation error on win32.
|
2013-09-16 20:05:25 +08:00 |
James Chen
|
621e682e6e
|
[GUI] Fixing compilation errors for win32.
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-09-16 20:00:48 +08:00 |
James Chen
|
dba7f3eae6
|
[GUI] Fixing compilation errors for win32.
|
2013-09-16 19:53:59 +08:00 |
minggo
|
21d299150e
|
Merge pull request #3621 from minggo/develop
upstream synchronize
|
2013-09-16 04:47:21 -07:00 |
minggo
|
819fbf2866
|
upstream synchronize
|
2013-09-16 19:46:14 +08:00 |
minggo
|
a96d16f94c
|
Merge pull request #3620 from samuele3hu/developTest
Develop test
|
2013-09-16 04:31:25 -07:00 |
James Chen
|
83d61dff44
|
[Armature] Fixing compilation errors.
|
2013-09-16 19:27:34 +08:00 |
James Chen
|
22fd21db13
|
Fixing iOS and Mac project config.
|
2013-09-16 18:20:52 +08:00 |
James Chen
|
208f705845
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
|
2013-09-16 18:18:23 +08:00 |
minggo
|
0fe28b7410
|
Merge pull request #3617 from boyu0/bug2745_after_PerformanceTextureTest_render_error
closed #2745: fix bug: _dataLen not set at Image::initWithString() and I...
|
2013-09-16 03:08:40 -07:00 |
samuele3hu
|
2ff505be81
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-16 18:05:35 +08:00 |
minggo
|
061004901d
|
Merge pull request #3619 from minggo/develop
[ci skip]set default projection to 3d
|
2013-09-16 03:03:01 -07:00 |
minggo
|
4d4933728e
|
Merge pull request #3615 from boyu0/bug2815_Texture2DTest_crash
closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it d...
|
2013-09-16 03:02:04 -07:00 |
minggo
|
13f83a084e
|
set default projection to 3d
|
2013-09-16 18:01:16 +08:00 |
James Chen
|
e44dcb648a
|
Merge pull request #3618 from dumganhar/nutty898-MergerGUIDevelop
[GUI] Merge PR https://github.com/cocos2d/cocos2d-x/pull/3613 [ci skip]
|
2013-09-16 02:59:35 -07:00 |
James Chen
|
cc41377591
|
[CocoGUI] Updating linux makefile.
|
2013-09-16 17:24:25 +08:00 |
boyu0
|
c726765b4a
|
closed #2745: fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke()
|
2013-09-16 17:13:44 +08:00 |
James Chen
|
3e7708dcd1
|
Updating Android.mk
|
2013-09-16 17:12:15 +08:00 |
James Chen
|
5ee8ad8c4f
|
Fix compilation errors for CocoGUI.
|
2013-09-16 17:12:15 +08:00 |
CaiWenzhi
|
210af21615
|
Modify member names
|
2013-09-16 17:12:15 +08:00 |
CaiWenzhi
|
a6428824d5
|
Modify makefiles
|
2013-09-16 17:12:15 +08:00 |
CaiWenzhi
|
cf4b8c0163
|
Add guy loading of scene
|
2013-09-16 17:12:15 +08:00 |
CaiWenzhi
|
4843046d17
|
Merge GUI to develop step 1;
|
2013-09-16 17:12:15 +08:00 |
James Chen
|
f50722de67
|
Merge pull request #3616 from CocosRobot/updategeneratedsubmodule_1379321876
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
|
2013-09-16 02:05:38 -07:00 |
samuele3hu
|
cf5e04ad63
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
Conflicts:
samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
|
2013-09-16 16:58:30 +08:00 |
CocosRobot
|
f607d6d248
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-16 08:58:07 +00:00 |