James Chen
|
0d3cc9218d
|
Merge pull request #3648 from CocosRobot/updategeneratedsubmodule_1379410806
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
|
2013-09-17 02:49:23 -07:00 |
James Chen
|
43e98be8b7
|
Adding resources of CocoStudio GUI Test.
|
2013-09-17 17:46:40 +08:00 |
Dhilan007
|
3cd581c63f
|
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
|
2013-09-17 17:43:58 +08:00 |
samuele3hu
|
dade2f1fd8
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-17 17:42:35 +08:00 |
samuele3hu
|
068d0140d9
|
Manual bind the getDescendants function of the SpriteBatchNode class
|
2013-09-17 17:41:53 +08:00 |
CocosRobot
|
c0a0dc580a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-17 09:40:09 +00:00 |
boyu0
|
a454e373c7
|
issue #2771: move include chipmunk and box2d to cpp
|
2013-09-17 17:39:08 +08:00 |
James Chen
|
43e97f240a
|
Merge pull request #3635 from dumganhar/box2d_test_bed_fix
issue #2087: [dispatcher] Fix box2d_test crash.
|
2013-09-17 02:29:13 -07:00 |
James Chen
|
beb8fa0b34
|
Merge branch 'develop' into box2d_test_bed_fix
|
2013-09-17 17:21:54 +08:00 |
James Chen
|
8bb2c3979e
|
Merge pull request #3647 from dumganhar/bug422-fix
issue #2087: [dispatcher] Fixing BugTest/Bug422 crashes.[ci skip]
|
2013-09-17 02:18:09 -07:00 |
Dhilan007
|
18cea20634
|
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
|
2013-09-17 17:14:20 +08:00 |
boyu0
|
b5b6406976
|
issue #2771: edit compile setting.
|
2013-09-17 17:09:07 +08:00 |
Dhilan007
|
5d8ea9f1e5
|
JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp".
|
2013-09-17 17:03:45 +08:00 |
James Chen
|
111a2ef4de
|
issue #2087: [dispatcher] Fixing BugTest/Bug422 crashes.
|
2013-09-17 17:03:03 +08:00 |
James Chen
|
81d8558c3c
|
issue #2087: [dispatcher] Removing HANDLE_PRIORITY.
|
2013-09-17 17:03:02 +08:00 |
James Chen
|
cdcfda1f2c
|
issue #2087: [dispatcher] Removing unused codes.
|
2013-09-17 17:00:37 +08:00 |
boyu0
|
89ec5edf78
|
issue #2771: edit compile setting.
|
2013-09-17 16:42:24 +08:00 |
James Chen
|
3fa539081f
|
Merge pull request #3644 from samuele3hu/developTest
Modify some lua test samples bug and delete tool/tolua++ folder[ci skip]
|
2013-09-17 01:41:50 -07:00 |
2youyou2
|
07f72ac1b4
|
Change rotation range from(-180 -- 180) to (-infinity -- infinity)
|
2013-09-17 16:40:47 +08:00 |
boyu0
|
acbb50b543
|
issue #2771: edit Xcode project setting.
|
2013-09-17 16:28:32 +08:00 |
boyu0
|
5040ae33a1
|
issue #2771: add comments
|
2013-09-17 16:27:43 +08:00 |
minggo
|
822e0c2992
|
install glfw in install-deps-linux.sh
|
2013-09-17 16:04:44 +08:00 |
boyu0
|
270bd997cc
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 14:46:36 +08:00 |
boyu0
|
0a53a12f51
|
issue #2771: update project setting
|
2013-09-17 14:31:43 +08:00 |
minggo
|
5e87ded1dd
|
Merge pull request #3643 from chengstory/#4689
Windows bugs.
|
2013-09-16 23:31:34 -07:00 |
minggo
|
e36bdc9b22
|
Merge pull request #3645 from minggo/develop
[ci skip]remove dependence of sdl
|
2013-09-16 23:28:30 -07:00 |
samuele3hu
|
d43709446a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-17 14:00:31 +08:00 |
samuele3hu
|
3809a6feed
|
Repair some lua test samples bug and del tool/tolua++ folders
|
2013-09-17 13:59:48 +08:00 |
minggo
|
b7b73f5f92
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-09-17 13:40:05 +08:00 |
minggo
|
b42c2fc487
|
remove dependence of sdl
|
2013-09-17 13:39:16 +08:00 |
minggo
|
d1259f88e9
|
Merge pull request #3642 from Dhilan007/develop
[ci skip]Add setTouchPriority empty implementation for CCLayer.
|
2013-09-16 22:37:15 -07:00 |
zhangcheng
|
a25c2cabf8
|
1. Fixes failed to build windows.
2. Upload CocoGUI Resources.
|
2013-09-17 13:25:15 +08:00 |
Dhilan007
|
db169c6d91
|
Add setTouchPriority empty implementation for CCLayer.
|
2013-09-17 13:04:28 +08:00 |
samuele3hu
|
5339603bdb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-17 13:00:46 +08:00 |
samuele3hu
|
40ed7bc326
|
Add a deprecated function
|
2013-09-17 12:59:38 +08:00 |
James Chen
|
06f9f88ad9
|
Merge pull request #3640 from dumganhar/makefile-fixes
Makefile fixes
|
2013-09-16 21:10:10 -07:00 |
James Chen
|
9cd99f4c66
|
[Android] ArmatureTest compilation fix.
|
2013-09-17 11:56:00 +08:00 |
minggo
|
934568051a
|
Merge pull request #3641 from minggo/android-fix
implement Cocos2dxHelperListener
|
2013-09-16 20:46:56 -07:00 |
minggo
|
3072144ad5
|
implement Cocos2dxHelperListener
|
2013-09-17 11:44:33 +08:00 |
James Chen
|
fe1b11a814
|
Fixing wrong include.
|
2013-09-17 11:28:33 +08:00 |
boyu0
|
9f7bf4349c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 11:19:47 +08:00 |
boyu0
|
54f7146d5f
|
issue #2771: update vs project setting
|
2013-09-17 11:18:53 +08:00 |
James Chen
|
664345a673
|
Removing unused files. Old XXXDispatcher.
|
2013-09-17 11:01:00 +08:00 |
James Chen
|
480b2dd1d8
|
[Linux] Updating Makefile for TestCpp.
|
2013-09-17 10:52:42 +08:00 |
James Chen
|
28b266bc5e
|
[Android] Android.mk fixes after adding GUI test.
|
2013-09-17 10:49:59 +08:00 |
James Chen
|
650e6ad6fc
|
issue #2087: [dispatcher] Updating MenuTest.
|
2013-09-17 10:46:31 +08:00 |
boyu0
|
481ad7ef12
|
issue #2771: update project setting
|
2013-09-17 10:41:08 +08:00 |
James Chen
|
365419a8b2
|
issue #2087: [dispatcher] Fix box2d_test crash.
|
2013-09-16 23:35:16 +08:00 |
James Chen
|
e0da2578e1
|
Merge pull request #3633 from CocosRobot/updategeneratedsubmodule_1379343833
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
|
2013-09-16 08:32:08 -07:00 |
minggo
|
334c9c9e02
|
Merge pull request #3634 from minggo/develop
fix memory leak
|
2013-09-16 08:30:48 -07:00 |