Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,437 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

8437 Commits

Author SHA1 Message Date
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
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
minggo 901220b126 Merge pull request #1961 from dumganhar/iss1770-webp 
issue #1770: Adding Webp  support
 2013-02-06 00:17:35 -08:00
James Chen 8c261c1789 issue #1770: Updating linux makefile. 2013-02-06 15:59:29 +08:00
James Chen 561f6ca435 issue #1770: Adding webp image format support for linux 64bit. 2013-02-06 15:47:23 +08:00
minggo e05877515a issue #1703: remove dependence of libxml2 for vs project 2013-02-06 14:20:43 +08:00
minggo 396230bb77 issue #1703:remove dependence of libxml2 for marmalade and linux 2013-02-06 14:16:06 +08:00
minggo 9a7cca5ed4 issue #1703:remove dependence of libxml2 2013-02-06 14:12:52 +08:00
minggo fcc6ed89ae add tinyxml2 to mac and marmalade project 2013-02-06 13:57:16 +08:00
minggo 3d9a0dc99d issue #1703:add tinyxml2 codes into vs project 2013-02-06 13:49:35 +08:00
James Chen c7fdb1e637 Merge branch 'iss1770-webp' of https://github.com/dumganhar/cocos2d-x into iss1770-webp 2013-02-06 13:07:22 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
minggo e136476fb3 issue #1703:add tinyxml2 in makefile 2013-02-06 11:55:36 +08:00
minggo 682910b5f8 Merge https://github.com/cocos2d/cocos2d-x into tinyxml 2013-02-06 11:53:58 +08:00
James Chen 95dc349b77 issue #1770: Adding webp support for win32. 2013-02-06 11:23:10 +08:00
minggo 7d02925d7e issue #1703:include tinyxml2 files in android/iOS project 2013-02-06 11:15:54 +08:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
minggo 6e3409a30c issue #1703:move tinyxml2 to cocos2dx/support 2013-02-06 10:18:31 +08:00
James Chen a94e1b2a9d issue #1770: Webp works ok on Android and iOS. 2013-02-05 18:18:53 +08:00
James Chen 64248386a2 issue #1770: Updating iOS project configuration and adding WEBP test demo. 2013-02-05 11:37:13 +08:00