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

87 Commits

Author SHA1 Message Date
minggo 8b650794e6 Merge pull request #1445 from minggo/gles20 
make TestJavascript work on iOS
 2012-10-12 02:47:55 -07:00
James Chen 6fd24c469b Updated *.user for vs2010 & vs2008. 2012-10-12 15:45:57 +08:00
James Chen e876b997e7 Updated TestJavascript.vcproj 2012-10-12 15:42:00 +08:00
James Chen 3b0a989200 Updated TestJavascript project configuration for VS2008 & VS2010. 2012-10-12 15:14:47 +08:00
minggo 572460e60a make TestJavascript work on iOS 2012-10-12 12:00:36 +08:00
folecr 36f8b31efc Define some helper functions and comment out references to chipmunk 2012-10-11 17:56:44 -07:00
folecr fc59b2c962 Updated build script 
* merges js files from the cocos2d-html5-tests submodule into Android's assets folder
 * copies js helper files into Android's assets folder
 * copies the res from cocos2d-html5-tests into Android's assets folder
 2012-10-11 16:58:44 -07:00
folecr 336af23428 Helper files copied from cocos2d-iphone 2012-10-11 16:58:44 -07:00
folecr c63cf54256 Submodule for cocos2d-html5-tests 2012-10-11 16:37:22 -07:00
folecr 2e8aad611d Run tests-boot-jsb.js from the root directory 2012-10-11 16:35:17 -07:00
folecr a763e4242f Remove samples/TestJavascript/Resources 2012-10-11 14:25:48 -07:00
folecr 2cf579de6b NDK debugger script 2012-10-11 14:25:47 -07:00
folecr d8a26a8623 Use "-j8" flag to ndk-build when building TestJavaScript 
* If a "-p" for "parallel build" option is set
 2012-10-05 12:36:04 -07:00
walzer d18eecf247 UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets 2012-09-27 10:28:00 +08:00
walzer c9772c76ec fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums 2012-09-27 00:44:40 +08:00
minggo f3e2a385e1 modify xcode project to include correct files 2012-09-26 17:12:57 +08:00
minggo da97921099 fix compile errors of TestJavaScript 2012-09-25 16:21:28 +08:00
walzer caa67d1eed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5 
Conflicts:
	samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj
 2012-09-24 15:17:58 +08:00
minggo 48f9df7680 fix conflict 2012-09-24 15:01:24 +08:00
walzer 7088b19a1a add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution to different iPhone screens (HVGA, 3.5 inch retina, and 4.0 inch retina) 2012-09-24 13:59:16 +08:00
minggo e20b933f1a make TestJavaScript work and fix some warnings 2012-09-24 13:57:45 +08:00
Walzer 5c5544f823 Merge pull request #1363 from walzer/gles20 
fix ios6 orientation error, which is caused by ios6 api change.
 2012-09-23 21:00:30 -07: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
James Chen 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
walzer 5b3bb2a087 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts fixed:
	cocos2dx/platform/ios/FontLabel/FontLabel.m
	cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
	template/xcode4/lib_js.xctemplate/TemplateInfo.plist
 2012-09-24 11:03:26 +08:00
walzer c50a62be7a issue #1482, fix typos, mehod -> method. 2012-09-24 10:54:03 +08:00
Walzer 88b98faa88 fixed #1482, fix orientation problem caused by ios6 api change. 
AppDelegate.mm & RootViewController.mm are updated.
 2012-09-23 20:24:51 +08:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
folecr 5d816bfaf6 Verbose logging of build process 2012-09-18 17:08:37 -07:00
folecr f54566ac03 More robust script exits on errors and ... 
* Remove source build command (source repos for dependencies are not submodules)
 2012-09-18 17:02:01 -07:00
James Chen f4ddabb942 Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder. 2012-09-15 15:36:31 +08:00
folecr 991d63eaad Update location of spidermonkey-android makefile 2012-09-10 16:12:48 -07:00
James Chen 8e290cad6e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript 2012-08-31 23:29:02 +08:00
James Chen 94a1aa6123 issue #1454: fixed bugs in test-particles.js. 2012-08-31 23:28:43 +08:00
minggo dacf1704fc issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh 2012-08-31 23:16:36 +08:00
James Chen f5a46d1d23 Merge pull request #1 from minggo/iss1454_javascript 
issue #1454:modify ios project resources
 2012-08-31 07:29:11 -07:00
minggo 1ea039d21d issue #1454:modify ios project resources 2012-08-31 22:23:30 +08: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 e7e954045a issue #1454: Updated TestJavascript/proj.android/build_native.sh. 2012-08-31 21:30:58 +08:00
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