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

4405 Commits

Author SHA1 Message Date
minggo 138de3171f Merge pull request #912 from minggo/merge_nicolasgramlich 
Merge pull request by nicolasgramlich
 2012-05-23 19:56:05 -07:00
minggo 6d9e6b31ee issue #1246:remove unneeded files 2012-05-24 10:55:02 +08:00
Walzer 356c9cd82a Merge gles20 branch commit '688499b5c032a17dcee8db76aaaa36ec2358facb' into js-bindings 2012-05-24 10:49:40 +08:00
minggo 0ba62c3854 issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp 2012-05-24 10:48:39 +08:00
Walzer 688499b5c0 Merge commit 'aae5d881fc0ee1fca0d00683844c4cdaceba5bc5' into gles20 2012-05-24 10:37:13 +08:00
James Chen 6a37158100 issue #1240: Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format. 2012-05-23 18:20:51 +08:00
James Chen c2591f1e9e issue #1240: Added tiff support, run ok on win32. There is a 'FIXME' needed to be fixed. 2012-05-23 17:26:06 +08:00
James Chen aae5d881fc Merge pull request #910 from dumganhar/iss1253_purgeConfig 
fixed #1253: Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak.
 2012-05-22 21:47:17 -07:00
James Chen ea48413d2d fixed #1253: Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak. 2012-05-23 12:11:53 +08:00
James Chen a23d0b73d2 Merge pull request #909 from dumganhar/iss1252_getFrameSize 
fixed #1252: Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.
 2012-05-22 21:05:48 -07:00
James Chen c7359ba1a0 fixed #1252: Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device. 2012-05-23 11:57:43 +08:00
James Chen f01f48380c Merge pull request #908 from dumganhar/iss1251_project_setting 
fixed #1251: Added CocosBuilderTest to the test project for VS2008.
 2012-05-22 20:43:51 -07:00
James Chen a5b63d8f6c fixed #1251: Added CocosBuilderTest to the test project for VS2008. 2012-05-23 11:41:42 +08:00
James Chen 8c3094200b Merge pull request #907 from dumganhar/iss1244_particle_leak 
fixed #1244: Memory leak in CCParticleSystem::initWithDictionary().
 2012-05-22 20:31:11 -07:00
James Chen d5f52335d5 fixed #1224: Wrote some comments in CCParticleSystem. 2012-05-23 11:26:21 +08:00
James Chen f7ffdd757c fixed #1244: deleted unused method "release" of CCImage class. 2012-05-23 11:22:17 +08:00
James Chen d998b54269 fixed #1224: Memory leak in CCParticleSystem::initWithDictionary() 2012-05-23 11:18:04 +08:00
James Chen 4353b07aed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-23 11:05:47 +08:00
Nicolas Gramlich d69bc23894 Initial version of CCBReader reading ccbi format. (Only reads and checks the header so far). 2012-05-22 17:38:33 -07:00
Nicolas Gramlich 119abc6194 Fixed Xcode template to include fps_images.fnt/png (Problem: there is no way to add it as a folder reference.) 2012-05-22 14:06:56 -07:00
Nicolas Gramlich 5d3d744667 Added fps_images.fnt/png to HelloLua resources. 2012-05-22 13:27:59 -07:00
Nicolas Gramlich d516a61114 Merge branch 'gles20' of github.com:nicolasgramlich/cocos2d-x into gles20 2012-05-22 13:26:50 -07:00
Nicolas Gramlich a62e017977 Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png. 2012-05-22 13:26:20 -07:00
Nicolas Gramlich ddf9f24369 Added newline at end of fps_images.fnt. 2012-05-21 18:15:16 -07:00
Nicolas Gramlich 9883194d8e Update HelloWorld/Resources/fonts/fps_images.fnt 2012-05-21 17:59:47 -07:00
Nicolas Gramlich ff71f07ac3 Updated AUTHORS. 2012-05-21 17:38:36 -07:00
Nicolas Gramlich 15ef23bac8 Removed assert which prevented CCSpriteBatchNode from being used as a root node. (Discussed this with Ricardo Quesada) 2012-05-21 17:38:24 -07:00
Nicolas Gramlich 83ef3d828f Added fps_images.fnt/png to Microsoft Visual Studio template. 2012-05-21 17:31:06 -07:00
Nicolas Gramlich 51b9df5737 Added fps_images.fnt/png to xcode4 base ios template. 2012-05-21 17:29:27 -07:00
Nicolas Gramlich 320b181dbf CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF. 2012-05-21 17:20:47 -07:00
Rolando Abarca bed6efa3cd adds "require" to the global namespace 2012-05-21 16:08:34 -07:00
Rolando Abarca 8196324e38 updates readme 2012-05-21 13:14:00 -07:00
Rolando Abarca 68ce2bd70c adds more bindings 
adds CCApplication, CCUserDefault and fixes a few
things in addChild
 2012-05-21 13:09:46 -07:00
Walzer 9ee1b32c26 Merge pull request #903 from walzer/gles20 
add CCBReader_v2.cpp in vcproj & vcxproj
 2012-05-21 02:58:59 -07:00
Walzer 9ac0b68981 modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj. 2012-05-21 17:56:09 +08:00
Rolando Abarca 1dcce90b6d adds test for enums on native class 2012-05-18 15:21:24 -07:00
minggo ce3aab085c Merge pull request #901 from minggo/iss1236_JniHelper 
Iss1236 jni helper
 2012-05-15 23:19:26 -07:00
minggo 683c91bbfa fixed #1236: return empty string when parameter is null 2012-05-16 14:17:37 +08:00
minggo 08430a6dbd Merge pull request #900 from minggo/iss1237_line_number 
Iss1237 line number
 2012-05-15 23:13:39 -07:00
minggo 1d18c6607a fixed #1237: correct line number output by CCAssert 2012-05-16 14:10:27 +08:00
Rolando Abarca 07d8c781f7 updates readme 2012-05-14 16:55:16 -07:00
Rolando Abarca fb146129c1 adds TMX support for bindings 2012-05-14 15:55:27 -07:00
Rolando Abarca 57b3a9bdb5 adds simple transition test 2012-05-14 15:13:01 -07:00
Rolando Abarca 43387176b8 adds more bindings 2012-05-14 15:06:22 -07:00
Rolando Abarca 025da69340 more bindings 2012-05-14 12:57:14 -07:00
Rolando Abarca 5763726bb3 fixes broken Xcode project 2012-05-14 12:57:04 -07:00
Rolando Abarca 326e1752fb updates readme 2012-05-11 12:07:10 -07:00
Rolando Abarca 5f57e72eae adds the files for the bindings example 2012-05-11 12:03:32 -07:00
Walzer a3bd26a52b modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk 2012-05-11 22:40:31 +08:00
Walzer 7dadd8128c rename tests/Resource/CocosBuilder to CocosBuilder_v1 2012-05-11 21:22:50 +08:00