Commit Graph

98 Commits

Author SHA1 Message Date
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
James Chen dd8c993581 issue #1454: Removed some duplicated resources files. 2012-08-31 19:50:20 +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
James Chen e2629ef175 Fixed some compile errors on win32. 2012-08-30 23:10:09 +08:00
Rohan Kuruvilla 743478570c Chipmunk support
* Changing CGPoint to cpVect
 * Fix build and test code
2012-08-29 16:35:30 -07:00
folecr 4ebafb0ae3 Remove reference to Resources/JS. This code is not used in the test suite. 2012-08-29 15:59:48 -07:00
James Chen 21547fb96f Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp,
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
2012-08-29 14:49:04 -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
folecr 143cd39269 -DCOCOS2D_JAVASCRIPT added to APP_FLAGS in Application.mk. Applied to all files. 2012-08-28 19:07:50 -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 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 4256dc6830 Update makefiles 2012-08-28 17:43:58 -07:00
folecr 421d60e4f2 Package the js directory 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 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
James Chen dd26a2fcd8 Updated Makefiles for linux port. 2012-08-27 16:43:02 +08:00
minggo bcd691ad9f use absolute path in CCFileUtils 2012-08-24 17:55:29 +08:00
mingo ba4d75a60e issue #1445: fix compiling error of linux 2012-08-24 15:53:26 +08:00
James Chen 26a31b21b3 issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class. 2012-08-24 00:24:04 +08:00
James Chen 3eecc283d0 Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer 2012-08-21 16:57:41 +08:00
minggo ba2049d086 iss1438_android_template 2012-08-21 16:45:23 +08:00
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
minggo cfdc50fb60 issue #1437:make CCEGLView::sharedOpenGLView() return pointer 2012-08-21 14:58:31 +08:00
James Chen de2c00b7ae issue #1405: fixed some compile error on win32 and linux. 2012-08-16 11:30:25 +08:00
James Chen 0fce637ec7 issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest. 2012-08-15 14:33:56 +08:00
James Chen e9aa3743fa issue #1405: muti-resolution works ok on linux. 2012-08-03 13:56:18 +08:00
James Chen 826dfe4102 issue #1405: multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method. 2012-08-09 12:49:33 +08:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00
James Chen 9c26e38563 Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20 2012-08-03 10:10:33 +08:00
pengfei tong a37fd743e0 [FIX] testjs 2012-08-02 16:23:31 +08:00
pengfei tong c82c8412a8 [LOG] fix makefile 2012-08-02 13:19:40 +08:00
pengfei tong b93d0b5ebf [LOG] add linux port 2012-08-02 13:02:59 +08:00
folecr 4d3df6145b Cleaner build scripts 2012-07-31 22:56:18 -07:00
Walzer cc23d0667d unify Bundle ID for all xcodeprojects to "org.cocos2d-x.*", add icons for iphone/ipad * retina. 2012-07-23 15:23:26 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
James Chen 8291b7aef6 Reverted 'cocosdenshion' to 'CocosDenshion'. 2012-07-23 11:07:31 +08:00
James Chen 5e5b008742 issue #1399: Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System. 2012-07-21 13:49:20 +08:00
James Chen b2b0a0c3d5 Updated ios project settings and updated some files in CCBReader folder. 2012-07-20 18:02:18 +08:00
James Chen 755b29cb9d Updated ios project settings. 2012-07-20 17:38:21 +08:00
James Chen 5b6497b0e4 Updated test_actions.js. 'new cc.Sprite.create' --> 'cc.Sprite.create'. 2012-07-20 17:12:17 +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