James Chen
|
fa995c27fb
|
Merge pull request #5257 from dumganhar/iss3871-stop-propagation-fix
closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
|
2014-01-27 00:35:04 -08:00 |
James Chen
|
098869852b
|
issue #3871: Removes unneeded empty lines.
|
2014-01-27 16:32:04 +08:00 |
James Chen
|
8141397bbd
|
closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
|
2014-01-27 16:30:20 +08:00 |
James Chen
|
31643adb99
|
Merge pull request #5252 from samuele3hu/developBug
issue #3837:Update the “HelloLua” test case to support on-device debugging
|
2014-01-26 23:05:18 -08:00 |
samuele3hu
|
9ddce1b4ba
|
issue #3837:Update the comment
|
2014-01-27 15:00:11 +08:00 |
James Chen
|
90c537928e
|
Merge pull request #5253 from boyu0/iss3401_lua_bit_fix
issue #3401: add bit operation for lua physics test
|
2014-01-26 22:11:49 -08:00 |
samuele3hu
|
73f272ec7c
|
issue #3837:Update the comment
|
2014-01-27 14:10:34 +08:00 |
boyu0
|
c0765c9a77
|
issue #3401: bug fix
|
2014-01-27 14:10:23 +08:00 |
samuele3hu
|
8e8e229888
|
issue #3837:Update the comment
|
2014-01-27 14:02:11 +08:00 |
boyu0
|
e68db23f7a
|
issue #3401: bug fix
|
2014-01-27 13:52:29 +08:00 |
boyu0
|
6239dadff6
|
issue #3401: add bit operation for lua physics test
|
2014-01-27 13:39:11 +08:00 |
samuele3hu
|
cea6a15903
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-27 12:00:35 +08:00 |
samuele3hu
|
13d2f2b97b
|
issue #3837:Update the “HelloLua” test case to support on-device debugging
|
2014-01-27 11:59:17 +08:00 |
James Chen
|
4712636783
|
Updates JS-Test: fix ArmatureTest/ChangeMounttest fails.
|
2014-01-27 11:22:19 +08:00 |
samuele3hu
|
d3824c9592
|
issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation
|
2014-01-26 22:27:37 +08:00 |
James Chen
|
413bfdb3c2
|
Reverts Application.mk.
|
2014-01-26 19:06:03 +08:00 |
James Chen
|
23c963cbdc
|
Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled.
|
2014-01-26 18:35:35 +08:00 |
James Chen
|
e89bde4fbe
|
Updates JS test.
|
2014-01-26 17:53:42 +08:00 |
James Chen
|
a4a010465c
|
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
|
2014-01-26 16:41:35 +08:00 |
boyu0
|
682a6819cb
|
issue #3401: change getContactData function return value back to pointer.
|
2014-01-26 12:02:42 +08:00 |
samuele3hu
|
48498f726e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
Conflicts:
cocos/scripting/lua/bindings/CCLuaStack.cpp
|
2014-01-26 11:59:54 +08:00 |
samuele3hu
|
9b514927f5
|
issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio
|
2014-01-26 11:55:02 +08:00 |
Dhilan007
|
c7e9cee835
|
updated vs project[Lua]:
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
|
2014-01-26 10:25:49 +08:00 |
minggo
|
cdae60b6c8
|
Merge pull request #5212 from samuele3hu/developBug
Add luasocket's support for lua
|
2014-01-24 02:00:15 -08:00 |
minggo
|
fc0c0ac571
|
Merge pull request #5214 from Dhilan007/develop_crash
fix save path not initialized.
|
2014-01-24 01:59:52 -08:00 |
lihex
|
99345698ea
|
reset to default texture format after running test case
|
2014-01-24 17:28:56 +08:00 |
samuele3hu
|
e2325924e4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-24 17:24:46 +08:00 |
samuele3hu
|
58eab72d26
|
issue:Add luasocket's support for lua
|
2014-01-24 17:24:10 +08:00 |
Dhilan007
|
7ad2b95e7b
|
fix save path not initialized.
|
2014-01-24 17:12:59 +08:00 |
minggo
|
87043a3bb6
|
Merge pull request #5211 from minggo/bug-fix
reset to default texture format after running test case
|
2014-01-24 00:54:52 -08:00 |
minggo
|
d1cf374459
|
reset to default texture format after running test case
|
2014-01-24 16:53:59 +08:00 |
minggo
|
aac068fc0e
|
Merge pull request #5206 from dabingnn/develop_hotFix
3.0 Beta2 HotFix: remove Camera Zoom Test temporarily.
|
2014-01-23 23:18:08 -08:00 |
Huabing.Xu
|
ac59d259a1
|
3.0 Beta2 HotFix: remove Camera Zoom Test temporarily.
|
2014-01-24 15:14:34 +08:00 |
James Chen
|
63d6dfff48
|
Merge pull request #5204 from Dhilan007/develop_label
update label test case.
|
2014-01-23 23:10:41 -08:00 |
Dhilan007
|
412e875446
|
update label test case.
|
2014-01-24 15:02:42 +08:00 |
minggo
|
66409a2a8b
|
Merge pull request #5202 from minggo/bug-fix
fix crash of PerformanceTest
|
2014-01-23 22:49:40 -08:00 |
minggo
|
0ec70678e0
|
fix crash of PerformanceTest
|
2014-01-24 14:48:07 +08:00 |
minggo
|
f1fa6b2af4
|
Merge pull request #5199 from minggo/bug-fix
pause schedule after 3 seconds
|
2014-01-23 22:28:16 -08:00 |
minggo
|
58f2f19008
|
pause schedule after 3 seconds
|
2014-01-24 14:26:35 +08:00 |
James Chen
|
2e75a86431
|
Merge pull request #5185 from hanjukim/develop
closed #3832: color and opacity settings are invalid when alignText.
|
2014-01-23 19:56:45 -08:00 |
samuele3hu
|
1ff51b67f0
|
issue #3822:Update the hellolua using the `EventListenerTouchOneByOne`
|
2014-01-24 09:48:39 +08:00 |
samuele3hu
|
402d0cf7b1
|
issue #3822:Update the test cases which are related with touch using the `EventListenerTouchAllAtOnce` or `EventListenerTouchOneByOne`
|
2014-01-23 22:26:14 +08:00 |
Hanju Kim
|
1a34a6ff84
|
remove unused header
remove CC Prefix
|
2014-01-23 18:55:51 +09:00 |
Hanju Kim
|
977c84392c
|
Tab to space
|
2014-01-23 18:11:40 +09:00 |
Hanju Kim
|
d62f711884
|
New and old label comparison
|
2014-01-23 17:27:50 +09:00 |
samuele3hu
|
a91d9161c7
|
issue #3822:Update the KeypadTest using the new event-dispatcher
|
2014-01-23 16:17:24 +08:00 |
Hanju Kim
|
44b2d5d3b8
|
Old / New label test
|
2014-01-23 17:16:30 +09:00 |
samuele3hu
|
45f353d65f
|
issue #3822:Update the accelerometerTest by the new event-dispatcher
|
2014-01-23 15:00:03 +08:00 |
James Chen
|
9292d92f63
|
Merge pull request #5143 from pandamicro/develop
closed #3806: SAXParser was supported with manual binding in JSB
|
2014-01-22 19:50:15 -08:00 |
minggo
|
a1729fa1b4
|
Merge pull request #5159 from natural-law/develop
Add test case for issue 2572
|
2014-01-22 17:49:56 -08:00 |