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

7594 Commits

Author SHA1 Message Date
James Chen 9931bc6eaf fixed #1724: Renamed libhellojavascript to libcocos2djs. 2013-02-18 21:53:28 +08:00
James Chen ed19b66f48 Update AUTHORS 2013-02-18 18:22:54 +08:00
James Chen 1c798d111b Merge pull request #1991 from SevInf/patch-1 
fixed #1729: Making ScriptingCore.cpp compiled fine with C++11 on iOS
 2013-02-18 02:18:39 -08:00
James Chen dbe4cc05e8 Merge pull request #1993 from dumganhar/master 
fixed #1726: JSB application crashs on android device with armv6 architecture
 2013-02-18 02:06:12 -08:00
James Chen 1415c90bd4 webp lib depends on the module of cpufeatures when compiling with "APP_ABI := armeabi-v7a". 2013-02-18 17:52:13 +08:00
James Chen 7c6a2e47ce fixed #1726: JSB application crashs on android device with armv6 architecture 2013-02-18 17:50:43 +08:00
James Chen cb25e65a9c Merge pull request #1992 from dumganhar/iss1724-hellojs 
fixed #1724: Moved HelloJavascript to template folder and renamed it to "multi-platform-is".
 2013-02-18 00:49:37 -08:00
James Chen c9706386c5 issue #1724: Reverted vs solution. 2013-02-18 16:47:35 +08:00
James Chen 151b38922e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1724-hellojs 
Conflicts:
	template/multi-platform-js/proj.win32/HelloJavascript.vcxproj
 2013-02-18 16:32:54 +08:00
James Chen 1d9e9e48bc fixed #1724: Moved HelloJavascript to template folder and renamed it with "multi-platform-is". 2013-02-18 16:25:21 +08:00
Sergej Tatarincev 0b8713c80c Make ScriptingCore.cpp compile with C++11 on iOS 
When compiling with clang -stdlib=libc++ -std=c++11, write, read, and close functions are part of the unistd.h header file.
 2013-02-18 09:12:39 +02:00
James Chen 28aefc87bd Merge pull request #1990 from dumganhar/iss1724-hellojs 
fixed #1724: Register CCBReader for HelloJavascript.
 2013-02-17 23:12:01 -08:00
James Chen 9add1d1b18 fixed #1724: Register CCBReader for HelloJavascript. 2013-02-18 15:10:32 +08:00
James Chen 640dbf41ea Merge pull request #1988 from dumganhar/iss1724-hellojs 
fixed #1724: Adding HelloJavascript project.
 2013-02-17 23:05:13 -08:00
James Chen 067b07953b fixed #1724: Updated project dependence for HelloJavascript project. 2013-02-18 15:02:47 +08:00
James Chen 3016c20f19 fixed #1724: Adding HelloJavascript for VS2012 solution. 2013-02-18 14:59:40 +08:00
James Chen 7a902b494c issue #1724: fixed errors for HelloJavascript of win32 port. 2013-02-18 14:51:36 +08:00
James Chen c93758a785 issue #1724: Adding HelloJavascript project. 2013-02-18 14:38:00 +08:00
James Chen 05c19fd49a Merge pull request #1987 from dumganhar/iss1712-dpi 
fixed #1712: Adding a class named "CCDevice" and getting DPI suport for Android, iOS, Win32, Linux, Blackberry.
 2013-02-17 22:03:07 -08:00
James Chen 3452d44329 issue #1712: Removed importing some unused packages in Cocos2dxActivity. 2013-02-18 14:00:57 +08:00
James Chen c6d874ab39 fixed #1712: Updated iOS template. 2013-02-18 13:57:29 +08:00
James Chen 6b5a5c5317 issue #1712: Moving getDPI from Cocos2dxActivity to Cocos2dxHelper. 2013-02-18 13:51:16 +08:00
James Chen 9c906bbe30 fixed #1712: fix an issue of lacking table view cells after touch ended. 2013-02-18 09:45:01 +08:00
James Chen 505577239c jfloat --> jint. 2013-02-17 17:21:11 +08:00
James Chen f219f480cc issue #1712: DPI return integer on android. 2013-02-17 17:18:38 +08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
James Chen 541dd357fa issue #1712: Getting DPI support for Linux. 2013-02-17 16:54:45 +08:00
James Chen edfe4c2a0c issue #1712: Adding empty CCDevice.cpp for linux, mac and marmalade. 2013-02-17 16:26:59 +08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
James Chen 2b8ea8145a issue #1712: Getting DPI support for Blackberry. 2013-02-17 16:25:15 +08:00
James Chen 3dd792475f issue #1712: Moved CCDevice.cpp to platform/win32. 2013-02-17 11:52:30 +08:00
James Chen 9f6df60be0 issue #1712: Adding win32 support. 2013-02-17 11:34:55 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
James Chen a170f3b0d8 Merge pull request #1986 from dumganhar/ztoky-master 
fixed #1711: Wrong clipping rectangle of CCScrollView when the scale of its ancestors isn't equal to 1.
 2013-02-15 22:20:30 -08:00
James Chen 0a9a952edc fixed #1711: Wrong clipping rectangle of CCScrollView when the scale of its ancestors isn't equal to 1. 2013-02-16 14:18:13 +08:00
James Chen 36e5da29b0 Merge branch 'master' of https://github.com/ztoky/cocos2d-x into ztoky-master 2013-02-16 13:48:35 +08:00
James Chen 373706d3b3 Merge pull request #1977 from moadib/master 
Added window_group creation to CCEGLView for blackberry.
 2013-02-15 19:59:09 -08:00
James Chen 87f5e51621 Update AUTHORS 2013-02-16 11:50:57 +08:00
James Chen fd5fcf6726 Merge pull request #1974 from folecr/s9sprite 
fixed #1710: Simpler, correct handling of spritesheet sources for CCScale9Sprite.
 2013-02-15 19:50:02 -08:00
James Chen dd9df39389 Merge pull request #1985 from CocosRobot/updategeneratedsubmodule_1360984850 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-15 19:23:10 -08:00
CocosRobot 9f9d69b14f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-16 11:21:03 +08:00
billy1380 a1753113b5 CCLens3d can be concave 
added boolean operator to enable the lens to be concave as well as
convex
 2013-02-16 03:12:12 +00:00
James Chen 2c0eab24a9 Update AUTHORS 2013-02-16 11:09:25 +08:00
James Chen c7d89ef9b1 Merge pull request #1983 from dumganhar/master 
fixed #1703: fixed compilation errors for BlackBerry.
 2013-02-15 19:06:30 -08:00
James Chen ad61fa3e9b fixed #1703: fixed compilation errors for BlackBerry. 2013-02-16 11:05:30 +08:00
James Chen f392fe2ea0 Merge pull request #1978 from moadib/bb_cocosdenshion_background_music 
fixed #1709: Added support for multiple background music sources to CocosDenshion for BB.
 2013-02-15 19:01:57 -08:00
minggo 3949f0c70f Merge pull request #1972 from theGoodEvil/fix_texparams_js 
Use correct arg type for ccTexParams
 2013-02-15 18:01:20 -08:00
minggo d2f6d1198d Update AUTHORS 2013-02-16 09:57:30 +08:00
minggo fcbdac0681 Merge pull request #1973 from benjamesward/gles20 
Adding Portuguese and Arabic language support
 2013-02-15 17:54:12 -08:00
Heewon Song e56f2f0a2c Revert "CCBMFontConfiguration::parseConfigFile performance improve" 
This reverts commit ecf9733ab8.
 2013-02-14 19:17:02 +09:00