Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,910 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

194 Commits

Author SHA1 Message Date
James Chen 21491317c0 Fix compilation errors. 2012-10-12 15:41:45 +08:00
Rohan Kuruvilla eafd6ebf08 Fixing restart of context to not leak memory 2012-10-11 18:48:37 -07:00
Rohan Kuruvilla e7ac758b9f Updating bindings to match cocos2d-html5 2012-10-11 18:45:22 -07:00
Rohan Kuruvilla 0c1c5a432d Adding support to pass array of CCPoints from JS 2012-10-11 18:44:46 -07:00
folecr 4af5abbc56 Update submodule reference to point to latest auto-generated changes 2012-10-10 20:07:46 -07:00
James Chen 26a5f31f0e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors 2012-10-10 15:25:49 +08:00
James Chen 700b83f3b9 issue #1469: Added 'setBlendFunc' support for CCSprite, CCParticleSystem...etc. 2012-10-10 15:25:27 +08:00
James Chen 9f93b609e8 issue #1469: Added cc.config for js-bindings. 2012-10-10 15:24:20 +08:00
folecr 12d711a13e Update to latest generated JS bindings 2012-10-09 21:18:58 -07:00
Rohan Kuruvilla 12292afee6 Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini 2012-10-09 15:03:14 -07:00
johnangel ad7dacc281 Merge remote branch 'upstream/gles20' into gles20 2012-10-08 16:35:43 +02:00
walzer d6ba2b44c4 update javascript/bindings/generated/ submodule revision pointer 2012-09-28 10:29:21 +08:00
folecr 5859260b25 Update to latest generated bindings 2012-09-27 13:39:49 -07:00
folecr f1aff597a2 Update makefile to include CocosDenshion 2012-09-27 13:39:49 -07:00
James Chen b48b329517 Removed js185-1.0.1.tar.gz. 2012-09-26 15:28:32 +08:00
dualface 8d104b8244 [Lua] add CCApplication:getTargetPaltform() 2012-09-25 16:43:36 +08:00
dualface a2b468f2b3 [Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare 2012-09-25 16:27:54 +08:00
minggo e20b933f1a make TestJavaScript work and fix some warnings 2012-09-24 13:57:45 +08:00
James Chen 37825acfd0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-24 11:47:58 +08:00
James Chen e4cee68688 Added libExtensions.lib for TestJavascript vs2010 project. 
Removed some calling of 'USING_NS_CC;' in extensions.
 2012-09-24 11:47:33 +08:00
minggo 2ed7b9febe Merge pull request #1365 from dualface/luafix 
luabinding bugfix
 2012-09-23 20:17:23 -07:00
James Chen 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
folecr 78bfc2df62 Fix spurious file introduced into makefile 2012-09-21 12:09:26 -07:00
folecr 12e88ac514 Update bindings 2012-09-21 12:07:30 -07:00
folecr 2a78f8d176 Separate out cocos specific manual type conversions. 2012-09-21 11:38:19 -07:00
folecr 6730294dbe Generated bindings are a submodule pointing to a separate repository 
* This allows bindings to be generated by a build server
 * ... when the Cocos2D-X API changes
 2012-09-21 11:38:19 -07:00
minggo 29fad4d570 Merge branch 'gles20-android-refactoring' of https://github.com/nicolasgramlich/cocos2d-x into merge_nicolas 2012-09-21 11:05:31 +08:00
Rohan Kuruvilla 100a7a1883 Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla d097406f18 Modifying MenuItemToggle bindings to make it work 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla 9e1e64509b Copying changes previously made into cxx-generator/targets/spidermonkey/common 
1. Fixed memory leak while removing proxy objects
2. Fixed JS Context restart
3. Added JS conversion for CCArray
4. Updated generated bindings with some more classes
 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla dde8d50d15 Adding member function executeFunctionWithOwner to ScriptingCore 2012-09-20 14:45:35 -07:00
Rohan Kuruvilla 57680ec2d6 Adding CCBuilderReader JS bindings 2012-09-20 14:45:34 -07:00
dualface 46a8eb5491 [Lua] add ccTexParams, add new luabinding build script, update luabinding 2012-09-20 23:37:23 +08:00
dualface 1313398335 [Lua] fix lua function reference error 2012-09-20 23:22:45 +08:00
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
Nicolas Gramlich 48062e222d Reverted change in scripting/javascript/bindings/Android.mk. 2012-09-18 11:01:31 -07:00
dualface eba97a9b1e [Lua] fix luabinding overloaded functions 2012-09-17 14:40:42 +08:00
johnangel fdec1ba4b9 Fixing include paths to be able to compile cocos2d-x using 
external Visual Studio solution, without copying all files
 2012-09-15 16:34:31 +02:00
dualface 515ec3c482 ccDrawCircle() add scaleX and scaleY 2012-09-14 18:00:11 +08:00
Nicolas Gramlich c2a62875cf Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory. 2012-09-13 11:13:02 -07:00
Nicolas Gramlich 696cdbaa8c Minor build fix due to merge fail. 2012-09-12 16:55:56 -07:00
Nicolas Gramlich 675d0adce5 Merge with gles20-official. 2012-09-12 16:51:01 -07: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
Nicolas Gramlich 4c7705171a Android JAVA refactoring. Android JNI Cleanup. 2012-09-07 17:23:04 -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
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
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 d7881b7c3a [Lua] update luabinding 2012-08-28 15:54:19 +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
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