dualface
93b669b936
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-20 09:27:45 +08:00
folecr
c6f06ddced
Refer to cocos2dx.cpp from the generated subdirectory
2012-09-18 17:02:21 -07:00
folecr
60fd3c5b9c
Remove generated files...
...
* ... in favour of automatically generated bindings
* ... in the generated/ subfolder.
2012-09-18 17:02:21 -07:00
dualface
eba97a9b1e
[Lua] fix luabinding overloaded functions
2012-09-17 14:40:42 +08:00
dualface
515ec3c482
ccDrawCircle() add scaleX and scaleY
2012-09-14 18:00:11 +08:00
YuLei
9de34c4f07
[Lua] remove unused codes
2012-09-11 17:13:45 +08:00
YuLei
214d4e7623
[Lua] remove CCLuaEngine::purgeDefaultEngine()
2012-09-11 16:11:42 +08:00
YuLei
fc3a55a065
[Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h
2012-09-11 15:44:33 +08:00
YuLei
a2259ab0dd
[Lua] update CCLuaEngine for new script binding protocol
2012-09-11 15:24:25 +08:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03:33 +08:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
James Chen
2572823b1a
Merge pull request #1301 from folecr/fix_android_module_location
...
fixed #1476 : Update location of spidermonkey-android makefile.
2012-09-10 18:53:02 -07:00
folecr
991d63eaad
Update location of spidermonkey-android makefile
2012-09-10 16:12:48 -07:00
YuLei
a22122d0ed
[Lua] fix: CCCallFunc : public CCActionInstant declare typo error
2012-09-07 19:19:50 +08:00
YuLei
9d2b0b04f2
[Lua] update luabinding for CCPoint, CCSize, CCRect
2012-09-05 14:49:26 +08:00
YuLei
39b019b2cb
[Mac] fix CC_ASSERT error
...
[Mac] add CC_DISABLE_ASSERT check
[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
2012-09-04 11:16:59 +08:00
YuLei
c86595ddde
[Lua] remove glLineWidth()
2012-09-02 01:18:28 +08:00
YuLei
6f3833af73
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:56:27 +08:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
35f6f937c9
Merge pull request #1271 from mustime/testlua
...
issue #1425 : add NodeTest to TestLua.
2012-09-01 01:52:42 -07:00
James Chen
0d2c2b3bf8
issue #1454 : Updated win32 project configuration and some .plist files.
...
Removed old binding files.
2012-08-31 22:01:57 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
mustime
f5506d58e1
issue #1425 : update pkg files and recreate binding
2012-08-31 18:29:44 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
YuLei
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
mustime
55a9444186
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
2012-08-30 16:45:40 +08:00
mustime
5ed3ec14e9
issue #1425 : update pkg and recreate LuaCococs2d.cpp
2012-08-30 15:33:54 +08:00
Rohan Kuruvilla
743478570c
Chipmunk support
...
* Changing CGPoint to cpVect
* Fix build and test code
2012-08-29 16:35:30 -07:00
James Chen
68e9210434
Modified the implementation of ScriptingCore::getInstance by using new operator.
...
Some implemented method should return default value.
2012-08-29 14:49:03 -07:00
James Chen
2dd0b9e0d3
Using '#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)' instead of '#ifdef ANDROID' to make it compiled successfully on win32.
2012-08-29 14:49:03 -07:00
James Chen
708be4e474
Remove 'readFileInMemory' to make it compile ok on win32, initialized the member variables for ScriptingCore class.
2012-08-29 14:49:03 -07:00
James Chen
a2b5916301
Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.
...
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
2012-08-29 14:49:03 -07:00
James Chen
bbf3c4843a
Updated spidermonkey-win32 to FF14.0.1.
2012-08-29 14:48:41 -07: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
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
7172e71e1a
issue #1425 : recreate LuaCocos2d.cpp for tolua++ binding
2012-08-29 17:14:16 +08: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
6c604f02d3
Fix typo and add logs
2012-08-28 17:44:01 -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