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

7326 Commits

Author SHA1 Message Date
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
Heewon Song ecf9733ab8 CCBMFontConfiguration::parseConfigFile performance improve 2013-02-14 19:10:45 +09:00
Heewon Song 10375ae660 Fix for CCScrollView clipping bug 
fix : wrong cliping rect when ancestors scale is not 1
 2013-02-14 18:43:27 +09:00
moadib b5fd738ec5 s_backgroundMusics map value should be released when stopBackground called with bReleaseData=true 2013-02-13 11:38:50 +04:00
moadib f7996aa691 Added support for multiple background music sources to CocosDenshion for Blackberry 2013-02-12 19:06:26 +04:00
moadib fa1fee307a Added window_group creation to CCEGLView for blackberry 2013-02-12 19:00:02 +04:00
folecr b204e97ad2 Simpler, correct handling of spritesheet sources 
* bounds of insets are calculated relative to sprite
 * transformations are then applied to get the texture coordinates
 * handle sprites stored rotated in a spritesheet correctly
 2013-02-11 13:26:40 -08:00
Ben Ward 5f6ce9db92 Adding Portuguese and Arabic language support 2013-02-11 15:29:56 +00:00
Guido Lorenz 5f3a63e794 Use correct arg type for ccTexParams 
In the JavaScript bindings, ccTexParams was initialized with (signed) GLint
values, even though it consists of (unsigned) GLuint values.
 2013-02-11 11:09:35 +01:00
minggo ba8f26fed9 Merge pull request #1969 from minggo/iss1702-writablePath 
modify writable path for iOS and Android
 2013-02-06 22:16:46 -08:00
minggo 59c1f33ad5 fixed #1702:modify writable path to the return value of Context.getFilesDirectory() 2013-02-07 14:11:23 +08:00
James Chen 9d4117bbec Update AUTHORS 2013-02-07 11:26:21 +08:00
James Chen ca9cc14d5d Merge pull request #1965 from fape/marmalade_tinyxml2 
Marmalade tinyxml2 fixes
 2013-02-06 19:24:33 -08:00
James Chen 7e136b67a6 Merge pull request #1966 from fape/marmalade_cosmetics 
Marmalade cosmetics
 2013-02-06 19:21:46 -08:00
James Chen 3f0a5ab945 Merge pull request #1964 from fape/marmalade_webp 
Marmalade webp fixes
 2013-02-06 19:21:12 -08:00
James Chen 92c7e14257 Update AUTHORS 2013-02-07 11:19:25 +08:00
James Chen c1330464c9 Merge pull request #1968 from ivzave/linux-tinyxml-fix 
prevent unintentional tinyxml2.cpp deletion during make clean on linux
 2013-02-06 19:12:07 -08:00
James Chen a35303f464 Merge pull request #1967 from DarraghCoy/master 
fixed #1707: Unaligned memory access crash in CCBReader::readFloat().
 2013-02-06 19:01:21 -08:00
ivzave 165faf49df prevent unintentional tinyxml2.cpp deletion during make clean on linux 2013-02-07 05:17:46 +04:00