James Chen
1cb0a37034
Merge pull request #1257 from mustime/testlua
...
issue #1425 : fix a problem that missing "MainMenu"
2012-08-29 03:19:43 -07:00
mustime
289eb65dde
issue #1425 : fix a problem that missing "MainMenu"
2012-08-29 18:16:59 +08:00
James Chen
5ba6a4c0b7
Merge pull request #1256 from dumganhar/gles20
...
Updated cocos2d_generated.cpp.
2012-08-29 03:08:16 -07:00
James Chen
bff1615dbb
Merge pull request #1255 from mustime/testlua
...
issue #1425 : add ParticleTest to TestLua.
2012-08-29 03:06:42 -07:00
James Chen
0fe9d12eaa
Updated cocos2d_generated.cpp.
2012-08-29 18:03:34 +08:00
YuLei
64c8ed3398
[Lua] update CCNode:isVisible() and CCNode:setVisible()
2012-08-29 17:51:42 +08:00
YuLei
66b221dc79
[Lua] update luabinding
2012-08-29 17:32:47 +08:00
mustime
c15c96ac28
Merge https://github.com/cocos2d/cocos2d-x into testlua
2012-08-29 17:29:33 +08:00
mustime
cc4573c3e4
issue #1425 : add ParticleTest to TestLua
2012-08-29 17:17:36 +08:00
mustime
7172e71e1a
issue #1425 : recreate LuaCocos2d.cpp for tolua++ binding
2012-08-29 17:14:16 +08:00
mustime
df25d56cc3
issue #1425 : update pkg for tolua++ binding
2012-08-29 17:10:06 +08:00
James Chen
3647537db2
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-29 17:03:37 +08:00
folecr
143cd39269
-DCOCOS2D_JAVASCRIPT added to APP_FLAGS in Application.mk. Applied to all files.
2012-08-28 19:07:50 -07:00
folecr
ada0004dac
Run samples/TestJavascript on Android
...
* Merge remote-tracking branch 'origin/run_js_android' into js
2012-08-28 18:02:51 -07:00
folecr
d2c1286773
Run samples/TestJavascript on iOS
...
* Merge 'origin/run_js' into js
2012-08-28 18:01:29 -07:00
folecr
122dab03d2
Remove iOS specific code
2012-08-28 17:56:01 -07:00
folecr
3c11684bf7
Remove commented code
2012-08-28 17:56:01 -07:00
folecr
51911d066d
Add flags : COCOS2D_JAVASCRIPT and COCOS2D_DEBUG=2
2012-08-28 17:44:01 -07:00
folecr
6f7cb44c62
Build script magic to deal with Image and Fonts on Android.
...
* Copy Images/* and Fonts/* into assets
* Ignore assets/Images and assets/Fonts directories when packaging
2012-08-28 17:44:01 -07:00
folecr
6c604f02d3
Fix typo and add logs
2012-08-28 17:44:01 -07:00
folecr
9fa24f07f5
Excluded *.pvr.gz from packaging
2012-08-28 17:44:00 -07:00
folecr
e00240c8aa
Rename Resources/JS to Resources/oldjs to avoid conflict with js
2012-08-28 17:44:00 -07:00
folecr
ab80fdd908
Add library reference to Cocos Android Java code
2012-08-28 17:44:00 -07:00
folecr
a03dc1f7e8
Generate an Android build.xml
2012-08-28 17:44:00 -07:00
folecr
148b67d374
Disable use of chipmunk
2012-08-28 17:44:00 -07:00
folecr
1902cdda05
Chipmunk bindings : clean up code
...
* Remove dead code
* Use generic float instead of platform-specific CGFloat
2012-08-28 17:44:00 -07:00
folecr
7636758f94
Add chipmunk library reference to build
2012-08-28 17:43:59 -07:00
folecr
c2f908cf8f
Hardcoded modification to generated file to work platform-specific code
...
* addPVRTCImage() is not supported on Android
2012-08-28 17:43:59 -07:00
James Chen
71b147ce2f
Use CCFileUtils and CCString to load file contents
2012-08-28 17:43:59 -07:00
James Chen
60dae250f2
Use CCLOG to implement js_log
2012-08-28 17:43:59 -07:00
folecr
4256dc6830
Update makefiles
2012-08-28 17:43:58 -07:00
folecr
304923eee0
Copy prebuilt spidermonkey from Firefox14.0.1
2012-08-28 17:43:58 -07:00
folecr
f0426c87f9
Remove spidermonkey-android
2012-08-28 17:43:57 -07:00
folecr
421d60e4f2
Package the js directory
2012-08-28 17:43:57 -07:00
folecr
d4948939b6
Remove spidermonkey bindings from the CocosDenshion and cocos2dx module makefiles
...
* ... they should only be included by cocos+JavaScript applications
2012-08-28 17:43:57 -07:00
folecr
f09bddd0f7
Add refernence to chipmunk static library
2012-08-28 17:43:56 -07:00
folecr
7017f772b2
Remove editor backup file
2012-08-28 17:43:56 -07:00
Rohan Kuruvilla
c62462d997
Including callback support for onEnterTransitionDidFinish and onExitTransitionDidStart
2012-08-28 17:43:35 -07:00
Rohan Kuruvilla
6c8d2ea75b
Fixing GC crash issue. Forcing the GC from Javascript at any time, doesn't crash the app
...
Fixing GC crash issue. Bug in bind_menu_item. There is no more problem with GC, including force_GC
Updating generated bindings to remove std::string scoping bug
2012-08-28 17:29:25 -07:00
YuLei
8a680c4c06
[Lua] add CCFileUtils:setResourceDirectory()
2012-08-28 18:14:00 +08:00
YuLei
2ce08cdcda
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 18:04:53 +08:00
minggo
f0068209f3
Merge pull request #1252 from mustime/testlua
...
issue #1425 : add EffectTest to TestLua
2012-08-28 01:05:50 -07:00
YuLei
d7881b7c3a
[Lua] update luabinding
2012-08-28 15:54:19 +08:00
mustime
22cf904038
issue #1425 : add EffectTest to TestLua
2012-08-28 15:44:09 +08:00
YuLei
f6a17f69f7
update tolua++ pkg files
...
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:53:52 +08:00
minggo
f7993b9954
Merge pull request #1250 from mustime/testlua
...
issue #1425 : remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
2012-08-27 23:35:55 -07:00
minggo
1e11ac5d27
Merge pull request #1251 from minggo/gles20
...
issue #1425 : add icons for testlua
2012-08-27 23:35:09 -07:00
minggo
ff34cb7b39
issue #1425 : add icons for testlua
2012-08-28 14:34:22 +08:00
mustime
69679ff545
issue #1425 : remove endToLua interface in CCDirector.h, use renaming
...
feature in tolua++ instead.
2012-08-28 14:28:33 +08:00
YuLei
b411c00f38
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:23:31 +08:00