unknown
|
419fc2a89d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-02 16:04:55 +08:00 |
pipu
|
06a0026632
|
Update ActionTimelineTestScene
|
2014-12-02 16:00:30 +08:00 |
pipu
|
4d0950d828
|
Update submodule that are plugin, ccd-res bindings-generator, cocos2d-console
|
2014-12-02 15:56:32 +08:00 |
minggo
|
741884014b
|
[ci skip] Update CHANGELOG
|
2014-12-02 15:52:46 +08:00 |
minggo
|
825888be1c
|
[ci skip]Update Authors
|
2014-12-02 15:49:37 +08:00 |
minggo
|
4d2ea40db0
|
Merge pull request #9265 from shrimpz/fix_label_crashed_on_android
Fix label crashed on android #9255
|
2014-12-02 15:48:10 +08:00 |
James Chen
|
4f7b1deb75
|
remove travis ci notification by email
|
2014-12-02 15:26:55 +08:00 |
minggo
|
628cd97397
|
Merge pull request #9340 from Dhilan007/v3-33rc1
Fixed fail to play background music again after invoking stopBackgroundMusic
|
2014-12-02 15:09:28 +08:00 |
Wenhai Lin
|
1bfdd757a2
|
Fixed fail to play background music again after invoking stopBackgroundMusic
|
2014-12-02 15:03:26 +08:00 |
minggo
|
dd0339f551
|
[ci skip] Update CHANGELOG
|
2014-12-02 14:47:48 +08:00 |
pipu
|
26a6c9a724
|
Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters
|
2014-12-02 12:30:34 +08:00 |
pipu
|
915449f77a
|
Modify UICheckBox
|
2014-12-02 12:23:15 +08:00 |
pipu
|
1cbc0120be
|
Merge branch 'v3' into v3_flatbuffers
|
2014-12-01 22:56:18 +08:00 |
pipu
|
417fc3ca26
|
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
|
2014-12-01 22:35:08 +08:00 |
pipu
|
8041d9927d
|
Add CustomWidgetCallbackBindTest into CMakeLists.txt of cpp-tests
|
2014-12-01 22:33:47 +08:00 |
zhounan
|
1fcf6b5007
|
Update cpp-tests/proj.win32/cpp-tests.vcxproj, cpp-tests/proj.win32/cpp-tests.vcxproj.filters
|
2014-12-01 22:31:01 +08:00 |
pipu
|
09f0722f3a
|
1, Update cpp-testsComponent.vcxproj.
|
2014-12-01 22:23:54 +08:00 |
pipu
|
c2fc246ce9
|
Add CustomWidgetCallbackBindTest into Android.mk of cpp-tests
|
2014-12-01 22:07:16 +08:00 |
pipu
|
22b044805c
|
Add callback parse
|
2014-12-01 21:50:05 +08:00 |
pipu
|
57dbb214ca
|
Modify that serialize "percent" default property for SilderReader
|
2014-12-01 19:58:48 +08:00 |
pipu
|
69729bcd65
|
Add that parse "color" in NodeReader
|
2014-12-01 16:27:21 +08:00 |
samuele3hu
|
1da44b0897
|
Add more useful trace back info when got invalid arguments by calling functions
|
2014-12-01 15:53:41 +08:00 |
yusheng.lu
|
346bf0f123
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-01 15:32:41 +08:00 |
minggo
|
b1fbde90cc
|
Merge pull request #9168 from super626/fixsprite
refact reskin test code
|
2014-12-01 14:10:36 +08:00 |
zhounan
|
4b0654a34c
|
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
|
2014-12-01 13:21:03 +08:00 |
zhounan
|
7ffc6f9784
|
Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters
|
2014-12-01 13:18:57 +08:00 |
pipu
|
4aea718c13
|
Delete protobuf-lite in User Head Search Path
|
2014-12-01 12:56:49 +08:00 |
pipu
|
584c7dc7c6
|
Delete that use protocol buffers
|
2014-12-01 12:46:29 +08:00 |
pipu
|
1447919be1
|
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
|
2014-12-01 11:49:11 +08:00 |
pipu
|
27261ddcc0
|
Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader
|
2014-12-01 11:48:04 +08:00 |
samuele3hu
|
ef16a460e6
|
Update bindings-generator submodule
|
2014-12-01 11:16:40 +08:00 |
samuele3hu
|
9900ccba4d
|
Add support to clang3.4 because of using the ndk-r10c
|
2014-12-01 11:15:56 +08:00 |
honghui
|
118569c972
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-11-30 15:37:30 +08:00 |
Huabing.Xu
|
c9d0b0f1f2
|
Merge pull request #9315 from dabingnn/v3_3rc1
udpate changeLog
|
2014-11-29 22:31:28 +08:00 |
Huabing.Xu
|
24fe7d9829
|
udpate changeLog
|
2014-11-29 22:30:54 +08:00 |
Huabing.Xu
|
6db15b09b9
|
Merge pull request #9314 from cocoscodeide/runtime
update runtime template
|
2014-11-29 22:24:26 +08:00 |
Huabing.Xu
|
0aa50b8b68
|
Merge pull request #9312 from dabingnn/v3_3rc1
update releaseNotes
|
2014-11-29 20:27:36 +08:00 |
honghui
|
047c36a270
|
update runtime template
|
2014-11-29 16:05:18 +08:00 |
Huabing.Xu
|
2d94a78baa
|
update releaseNotes
|
2014-11-29 13:20:21 +08:00 |
Huabing.Xu
|
522a77e1a8
|
Merge pull request #9311 from andyque/fixLinuxTemplate
fix linux cpp and lua template
|
2014-11-29 09:20:22 +08:00 |
andyque
|
79918d789e
|
fix cocos2d root
|
2014-11-28 08:24:48 -08:00 |
andyque
|
bdd46f7e55
|
fix linux cpp and lua template
|
2014-11-28 08:20:02 -08:00 |
Park June Chul
|
9b792d97c4
|
Merge pull request #2 from cocos2d/v3
update project
|
2014-11-28 22:52:13 +09:00 |
Huabing.Xu
|
21653516d7
|
Merge pull request #9309 from CocosRobot/update_cocosfiles_1417164855
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-28 16:55:54 +08:00 |
CocosRobot
|
ff8d2624eb
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-28 08:54:16 +00:00 |
honghui
|
9fefad5f35
|
debugging lua code in package support
|
2014-11-28 15:40:12 +08:00 |
Huabing.Xu
|
639a654232
|
Merge pull request #9307 from andyque/change3rdparty
change 3rd party dependency to 26
|
2014-11-28 15:14:50 +08:00 |
yangxiao
|
b476e65c6a
|
Merge branch 'newcode' into fixsprite
|
2014-11-28 14:33:04 +08:00 |
andyque
|
09e41f5f19
|
change 3rd party dependency to 26
|
2014-11-28 14:25:48 +08:00 |
yangxiao
|
437ee04d5d
|
fix linux
|
2014-11-28 14:12:38 +08:00 |