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

652 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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 0fe9d12eaa Updated cocos2d_generated.cpp. 2012-08-29 18:03:34 +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
Rohan Kuruvilla a572a5c87a Adding spidermonkey 2012-08-27 10:12:15 -07:00
folecr dfec428288 Remove spidermonkey-ios 2012-08-27 10:12:11 -07:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
Rohan Kuruvilla ccd5e0a066 Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x. 2012-08-27 10:02:19 -07:00
folecr 51708123a1 remove scripting/javascript/bindings 2012-08-27 10:01:21 -07:00
Donald Alan Morrison e4f6e48bf5 Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 12:01:26 -07:00
Donald Alan Morrison 2b4bab18af Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 09:00:57 -07:00
Donald Alan Morrison eaf0e71e57 Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 08:35:48 -07:00
Donald Alan Morrison 5ba3ff4d9a Fixed VS2010 Warning C4065: switch statement contains 'default' but no 'case' labels. 2012-08-24 01:33:28 -07:00
Donald Alan Morrison 3c7846e32f Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch 2012-08-23 23:35:25 -07:00
James Chen 848381ef0f Fixed a compile in cocos2d_generated.cpp. 2012-08-03 10:44:48 +08:00
pengfei tong a37fd743e0 [FIX] testjs 2012-08-02 16:23:31 +08:00
pengfei tong b93d0b5ebf [LOG] add linux port 2012-08-02 13:02:59 +08:00
James Chen 1efe20e4c3 Fix a compile error in TestJavascript project. 2012-07-27 14:16:23 +08:00
James Chen 557f654cf3 Built successfully on android. 2012-07-20 17:06:00 +08:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00