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

7856 Commits

Author SHA1 Message Date
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
Darragh Coy 5902de93ce Committing a fix for a potential unaligned memory access crash in CCBReader::readFloat(), 
caused by incorrect compiler optimisations/assumptions surrounding the use of memcpy().
 2013-02-06 14:44:15 -08:00
fape 1ed9d643c5 prevent WEBP_USE_SSE2 2013-02-06 17:44:06 +01:00
fape 7e19a5464a Include missing header files to libwebp's marmalade project file. 2013-02-06 16:17:47 +01:00
fape 19c266ef47 include missing CCPlatformMacros.h 2013-02-06 16:16:40 +01:00
fape 05eb3a59f5 include missing CCPlatformMacros.h 2013-02-06 15:50:09 +01:00
fape 96b92e2bd7 Group tests under test "folder" 2013-02-06 14:52:18 +01:00
fape 2f5db30332 add missing defines doc file to marmalade project file 2013-02-06 14:51:10 +01:00
fape 948732d617 marmalade tinyxml2 fixes 2013-02-06 14:49:04 +01:00
fape b51102d234 marmalade webp fixes 2013-02-06 14:40:48 +01:00
minggo 404cdf1122 issue #1702:return documents for iOS 2013-02-06 18:11:27 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
James Chen f95279231e Merge pull request #1963 from dumganhar/master 
fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp.
 2013-02-06 01:22:33 -08:00
James Chen fb9ac31d08 fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp. 2013-02-06 17:20:54 +08:00
James Chen 564939ee16 Merge pull request #1962 from dumganhar/iss1770-webp 
fixed #1770: Adding the library of webp for linux 32bit.
 2013-02-06 00:49:03 -08:00
minggo 7672eaba58 Merge pull request #1959 from minggo/tinyxml 
use tinyxml2 instead of libxml2
 2013-02-06 00:43:00 -08:00
minggo 0a27d8a31d Merge branch 'tinyxml' of https://github.com/minggo/cocos2d-x into tinyxml 2013-02-06 16:42:01 +08:00
minggo 3e3f5b83aa fixed #1703:update xcode template 2013-02-06 16:41:44 +08:00
minggo ed332770c3 fixed #1703:remove depence of libxml2 for vs project 2013-02-06 16:37:20 +08:00
James Chen e547735730 fixed #1770: Adding the library of webp for linux 32bit. 2013-02-06 16:33:54 +08:00
minggo 22930fe303 issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:19:43 +08:00