James Chen
b6e37c5855
Merge pull request #1703 from dumganhar/gles20
...
fix MenuTest crash after merging the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
2012-12-03 18:40:45 -08:00
James Chen
609fce7e2f
fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
2012-12-04 10:36:13 +08:00
minggo
c21ad515bd
Merge pull request #1693 from dualface/add_tolua_isnull
...
add tolua.isnull()
2012-12-03 18:08:21 -08:00
minggo
7ad2484a91
Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support
2012-12-04 09:50:01 +08:00
minggo
06465e4c58
Merge pull request #1702 from folecr/releasebuilds
...
Remove hardcoded android:debuggable property in all samples
2012-12-03 17:45:53 -08:00
folecr
58e6c80078
Remove hardcoded android:debuggable property
2012-12-03 13:34:55 -08:00
James Chen
c233d704fd
Merge pull request #1701 from dumganhar/iss1550-jsb-memoryleak
...
issue #1550 : fixed a memory leak in jsbinding.
2012-12-03 06:21:56 -08:00
James Chen
7c074d4ced
issue #1550 : fixed a memory leak in jsbinding.
2012-12-03 22:17:53 +08:00
fape
2eaa5188bf
add missing Box2d to TestLua marmalade project
2012-12-03 13:13:16 +01:00
James Chen
55417ffe73
Merge pull request #1700 from dumganhar/gles20
...
fixed #1589 : Added CCBReader::setCCBRootPath.
2012-12-03 03:19:00 -08:00
James Chen
27bc5094c2
Updated the submodule reference of cocos2d-js-tests.
2012-12-03 19:16:33 +08:00
James Chen
9224b12a9c
Updated the submodule reference of cocos2d-js-tests.
2012-12-03 18:30:43 +08:00
James Chen
478791a472
Added CCBReader::setCCBRootPath.
2012-12-03 18:27:50 +08:00
James Chen
a1d113f84b
Merge pull request #1699 from dumganhar/gles20
...
fixed #1588 : Get the right js callback function in js_CCScheduler_schedule.
2012-12-03 00:00:40 -08:00
James Chen
f6185844a9
fixed #1588 : Get the right js callback function in js_CCScheduler_schedule.
2012-12-03 15:59:29 +08:00
James Chen
1e0fcbb9fa
Merge pull request #1698 from dumganhar/gles20
...
fixed #1588 : RescheduleCallback support for JSBinding.
2012-12-02 23:37:38 -08:00
James Chen
1d07752fd3
Updated SchedulerTest for TestCpp project.
2012-12-03 15:33:37 +08:00
James Chen
d97dfe162a
fixed #1588 : RescheduleCallback support for JSBinding.
2012-12-03 15:33:36 +08:00
James Chen
c546a291a5
Merge pull request #1697 from dumganhar/gles20
...
issue #1583 : Updated the project configurations of TestJavascript for all supported platforms. Updated the submodule reference of cocos2d-js-tests.
2012-12-02 19:12:35 -08:00
James Chen
ab45c10d52
Merge pull request #7 from minggo/iss1583-update-js
...
TestJavascript works ok on iOS
2012-12-02 19:10:37 -08:00
minggo
180bd8b3a7
issue #1583:TestJavascript work ok on iOS
2012-12-03 11:07:22 +08:00
minggo
2cf49da2bc
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into iss1583-update-js
2012-12-03 10:31:22 +08:00
minggo
b805c31dc2
add execute permission of build_native.sh
2012-12-03 10:30:48 +08:00
James Chen
987e898807
issue #1583 : Updated the project configurations of TestJavascript for android and win32. Updated the submodule reference of cocos2d-js-tests.
2012-12-03 10:28:44 +08:00
minggo
af530878fd
Merge pull request #1690 from dualface/fix_CCCallFunc_script_support
...
Fix cc call func script support
2012-12-02 18:26:05 -08:00
fape
ccf134864e
update AUTHORS
2012-12-02 17:28:16 +01:00
fape
bbccab8f6b
TestLua marmalade project
2012-12-02 15:30:22 +01:00
fape
aac98975da
update lua marmalade project
2012-12-02 15:29:10 +01:00
fape
ec72d16276
ignore marmalade vs10 project directories
2012-12-02 15:10:38 +01:00
dualface
0e65257bc2
[luabinding] remove duplicate ccLanguageType
2012-12-02 16:17:17 +08:00
James Chen
2bd693467c
Merge pull request #1691 from dumganhar/gles20
...
issue #1583 : Made WatermelonWithMe works all platforms(iOS,android and win32). Updated the submodule reference of cocos2d-js-tests.
2012-12-02 00:15:19 -08:00
James Chen
005bc31499
Made WatermelonWithMe works on iOS.
2012-12-02 16:13:22 +08:00
dualface
7db170cde4
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-12-02 15:58:23 +08:00
dualface
5bc95780c0
update luabinding
2012-12-02 15:48:15 +08:00
dualface
308a01e629
[luabinding] add tolua.isnull()
2012-12-02 15:29:00 +08:00
James Chen
071f8cdbb4
issue #1583 : Updated the submodule reference of cocos2d-js-tests.
2012-12-02 15:18:50 +08:00
dualface
e0ee27cb17
[luabinding] fix CCLayer:getScriptTOuchHandlerEntry()
...
[luabinding] add CCLayer keypad, accelerometer support
2012-12-02 15:17:34 +08:00
James Chen
a96b946f67
Updated the submodule reference of cocos2d-js-tests.
...
Made WatermelonWithMe works on win32 and android.
2012-12-02 15:13:40 +08:00
dualface
030f5e7079
[luabinding] cleanup script handler when release CCCallFunc
2012-12-02 15:01:12 +08:00
dualface
393ce26330
rollback commit
2012-12-02 14:56:44 +08:00
minggo
c2729c4e45
Merge pull request #1686 from folecr/android_particle_quickfix
...
Quick fix to resolve a crash on some Android devices
2012-12-01 18:29:08 -08:00
dualface
d929fe2893
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-12-01 22:20:08 +08:00
dualface
058b6e9f65
fix CCCallFunc for script
2012-12-01 22:19:54 +08:00
James Chen
61990a9edc
Merge pull request #1688 from dumganhar/gles20
...
fixed #1586 : Some fixes for jsbinding.
Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined.
Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits.
Native object( CCPhysicsSprite and CCPhysicsDebugNode ) need to be an autorelease object.
2012-11-30 19:47:23 -08:00
James Chen
399fb53452
fixed #1586 : Native object need to be an autorelease object.
2012-12-01 11:41:51 +08:00
James Chen
e3615e2fb1
fixed #1586 : Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits.
2012-12-01 11:41:50 +08:00
James Chen
36bc0ab0bb
Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined.
2012-12-01 11:41:50 +08:00
James Chen
590bd336d6
Merge pull request #1687 from rohankuruvilla/gles20
...
fixed #1586 : Fixes for CocosDragonJS and WatermelonWithMe
2012-11-30 19:32:17 -08:00
Rohan Kuruvilla
4b1d5edbc6
Updating CocosDragonJS Android view settings to look like iPhone
2012-11-30 16:08:19 -08:00
Rohan Kuruvilla
745392ad6c
Changing chipmunk manual bindings to fix GC issues
2012-11-30 16:08:19 -08:00