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

4330 Commits

Author SHA1 Message Date
James Chen 3cdd48d00f Merge pull request #919 from dumganhar/iss1264_win_drawtext 
fixed #1264: CCLabelTTF: wrong string alignment when using utf-8 encoded text.
 2012-05-27 23:53:16 -07:00
James Chen 6e59d5eab4 fixed #1264: CCLabelTTF: wrong string alignment when using utf-8 encoded text. 2012-05-28 14:27:32 +08:00
James Chen 2dd9e75e88 Merge pull request #918 from dumganhar/gles20_win32_js 
fixed #1263: Build dynamic library of spidermonkey for win32. And add testjs project to solution.
 2012-05-27 23:23:42 -07:00
James Chen 99dcb4de86 issue #1263: Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments. 2012-05-28 14:14:19 +08:00
James Chen 1b7cc47a34 issue #1263: Removed unused files. Fixed an issue in uthash.h. 2012-05-28 13:59:18 +08:00
James Chen 8076082b8d issue #1263: Used release version library of spidermonkey. Added testjs.win32.vcproj.user. 2012-05-28 11:27:50 +08:00
Jeff Reitman 6c6fbeef8d * fix async texture cache not working on IOS due to sem_open requirement 
* allow semaphore to be unlinked and close no thread exit
* removed firstTry as it can now use s_pSem which is only set when the semaphore is successfully created.  Had to move target->retain() under thread creation so we don't leak memory if semaphore fails.
 2012-05-27 11:41:12 -07:00
Jeff Reitman b7746882f7 * add ability to disable denshion in lua mode 2012-05-27 11:03:45 -07:00
James Chen 330b019361 Added jstest project for vs2008. 2012-05-27 22:53:48 +08:00
James Chen 4d63b51102 Merge pull request #915 from dumganhar/iss1240_tiff 
fixed #1240: Added TIFF format support.
 2012-05-25 02:10:25 -07:00
James Chen a00db6e072 fixed #1240: Updated ios project configuration. 2012-05-25 17:00:33 +08:00
James Chen c902e884f4 fixed #1240: Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage. 2012-05-25 16:52:47 +08:00
minggo 71e333f312 fixed #1258: add fps png/fnt 2012-05-25 11:00:59 +08:00
James Chen 6477a02022 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff 2012-05-25 11:00:20 +08:00
James Chen 0b8a75e982 fixed #1240: Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest. 2012-05-25 10:58:28 +08:00
Walzer df98ed4792 Merge pull request #914 from walzer/gles20 
javascript binding!
 2012-05-24 03:48:14 -07:00
Walzer 075f9e1d36 remove .gitmodules 2012-05-24 18:45:37 +08:00
Walzer fecab7f3b1 fixed #1258, all js test cases passed. 2012-05-24 18:34:00 +08:00
Walzer 2187c88ab9 Merge jsbindings branch commit '680980005856d6dd8eb1627483d7596d0d237ecb' into gles20 2012-05-24 18:18:43 +08:00
Walzer 6809800058 remove spidermonkey submodule momentarily 2012-05-24 18:08:31 +08:00
minggo 7a0e2fb9ec Merge pull request #913 from minggo/iss1247_profiler 
fixed #1247: add profile lib
 2012-05-24 02:56:43 -07:00
Walzer 1e732930b7 fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works. 2012-05-24 17:48:05 +08:00
minggo c258e1e43a fixed #1247: add profile lib 2012-05-24 17:47:46 +08:00
Walzer 6c0fdf7421 Merge funkaster/test.js repo commit 'bed6efa3cd0d8822b7f132f52660b1d76d4851c1' into js-bindings 2012-05-24 17:34:21 +08:00
James Chen e5443d22c1 issue #1240: Added libtiff for android. 2012-05-24 12:00:06 +08:00
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