Commit Graph

354 Commits

Author SHA1 Message Date
James Chen 22fa5319a9 Wrong search path fix for CocoStudioTest/SceneTest 2014-01-06 14:49:32 +08:00
James Chen 7ae83848a9 Updates JS-Tests submodule. 2014-01-06 13:55:20 +08:00
James Chen bf19541330 Updates JS-test submodule after merging. 2014-01-06 10:45:14 +08:00
James Chen 26e10ff662 [develop] Updates JS-test submodule 2014-01-06 10:38:04 +08:00
James Chen 4699eb5751 Updates JS-Test submodule . 2014-01-05 10:10:51 +08:00
James Chen 5c77f7d035 Refactors search path setting for TestJavascript. 2014-01-04 14:24:25 +08:00
Dhilan007 8e2c51d31e update vs project for split spine binding. 2014-01-03 15:29:50 +08:00
James Chen 04760f2508 [Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module. 2014-01-03 10:30:55 +08:00
James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config
don't build spine module when build 2d module
2014-01-02 06:53:15 -08:00
minggo 22195a44d0 include spine dependence in testjavascript 2014-01-02 22:06:18 +08:00
James Chen e2887a2b64 Updates JS-Test submodule reference. 2014-01-02 14:22:22 +08:00
James Chen f793ff01b2 Updates JS-test submodule. 2013-12-31 18:15:47 +08:00
James Chen c8c37ac63c Updates JS-Test submodule 2013-12-31 17:25:14 +08:00
Dhilan007 5cc0297748 update describe for support translucency on android 2013-12-30 18:12:43 +08:00
Dhilan007 a5960c3252 recover java activity on android. 2013-12-30 15:58:04 +08:00
James Chen 856265950d Updates JS tests for SpineTest. 2013-12-25 11:24:02 +08:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen b08995ae67 Updates JS-tests to the latest version. 2013-12-23 21:14:55 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
James Chen 92ee688b73 Updates js tests to the latest version. 2013-12-23 20:26:13 +08:00
byeonggee.seo ef1709bc3d Add SpineTest to TestJavascript 1 2013-12-20 19:20:13 +09:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Dhilan007 a9e9dcbd9a updating js shared submodule reference 2013-11-18 22:32:53 +08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
Dhilan007 050a47c4eb issue #2854:Disable CDT Builder on Eclipse 2013-11-15 14:35:55 +08:00
minggo f6d82d21d2 closed #3108: add -fsigned-char to make char to signed as default 2013-11-04 10:48:45 +08:00
James Chen b751c41498 [Android] Updating Android.mk for JSB projects. 2013-11-01 18:27:47 +08:00
James Chen 69b0206018 issue #2826: Updating vs project to link mozjs-25.lib 2013-10-31 11:24:43 +08:00
minggo 9e5420c954 Merge pull request #4029 from minggo/iss2905-adjust_folder
use build/android-build to build android samples, and update readme
2013-10-30 03:30:03 -07:00
minggo da9f7c912b use build/android-build to build android samples, and update readme 2013-10-30 18:27:56 +08:00
Michael Contento fe180078f0 Android: add xlargeScreens="true" to supports-screens 2013-10-28 23:12:51 +01:00
Dhilan007 fd993e2fa2 issues #2905:split jsbinding module 2013-10-24 17:54:57 +08:00
minggo e81efb24c9 issue #2905: android samples run ok 2013-10-23 16:49:50 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
Ricardo Quesada 3cbeabc777 Icons for test projects 2013-10-16 11:55:14 -07:00
James Chen 00ee416006 issue #2905: [iOS Mac] All js games work now. 2013-10-16 16:21:55 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
minggo e90e975e3d Merge pull request #3911 from minggo/iss2905-adjust_folder
[ci skip]SimpleAudioEngine -> audio
2013-10-10 18:27:25 -07:00
James Chen 590d8d50e0 Merge pull request #3914 from Dhilan007/00001
fix copy resource error.
2013-10-10 03:09:20 -07:00
LinWenhai 83ab7128e7 fix incomplete copy 2013-10-10 18:07:36 +08:00
LinWenhai 8c6a481588 fix incomplete copy 2013-10-10 18:06:59 +08:00
LinWenhai f861d6d2fc fix incomplete copy 2013-10-10 18:03:15 +08:00
LinWenhai 312d761390 Update build_native.cmd 2013-10-10 18:01:45 +08:00
Dhilan007 e181f7a4d2 fix copy resource error. 2013-10-10 17:10:37 +08:00
James Chen 732233336b issue #2823: Updating build_native.sh for JSB projects. Copy all resources in scripting/javascript/bindings/js/* 2013-10-10 16:47:19 +08:00
James Chen 02f724cd23 issue #2823: Enabling JSB debugger in debug mode. Removing the definition of JSB_ENABLE_DEBUGGER. 2013-10-10 16:18:12 +08:00
James Chen 5f4b0d9a0e issue #2823: Removing unused debugger codes in MoonWarriors/Classes/AppDelegate.cpp. 2013-10-10 16:18:11 +08:00