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

4334 Commits

Author SHA1 Message Date
James Chen 7115a7f3c9 issue #1275: Memory leaks in CCBReader and ActionsTest. 2012-05-30 16:09:19 +08:00
minggo 80389d0611 Merge pull request #941 from minggo/gles20 
fix some bugs
 2012-05-30 00:44:22 -07:00
minggo 4428810fd5 fixed some bugs 2012-05-30 15:42:29 +08:00
James Chen b662784730 Merge pull request #940 from dumganhar/gles20 
fixed #1273: Crash appears after clicking closed button in TextureCacheTest.
 2012-05-29 23:31:36 -07:00
James Chen 265cb135ad fixed #1273: Passed 'this' to unscheduleSelector rather than 'g_sharedTextureCache'. 2012-05-30 14:27:30 +08:00
James Chen 895de701ba fixed #1273: Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat. 2012-05-30 14:24:59 +08:00
minggo 8203cf00ba use fonts/fps_images.png 2012-05-30 13:37:36 +08:00
minggo 378091823b Merge pull request #939 from minggo/gles20 
fixed #1266: use flag O_CREAT when creating named semaphore
 2012-05-29 20:22:36 -07:00
minggo 07c46bb445 fixed #1266: use flag O_CREAT when creating named semaphore 2012-05-30 11:21:36 +08:00
James Chen 45ff7e5e5f Merge pull request #937 from dumganhar/gles20 
fixed #1240: Updated vs2008 project setting (release target).
 2012-05-29 03:31:08 -07:00
James Chen ff0dde984c fixed #1240: Updated vs2008 project setting (release target). 2012-05-29 18:29:56 +08:00
James Chen 1dee3632d7 Merge pull request #936 from dumganhar/gles20 
fixed #1240: Updated vs2010 project setting.
 2012-05-29 03:09:32 -07:00
James Chen b4fad0bb2b fixed #1240: Updated vs2010 project setting (release target). 2012-05-29 18:06:52 +08:00
James Chen 228bc1e044 fixed #1240: Updated vs2010 project setting. 2012-05-29 17:50:27 +08:00
James Chen d5ba86c845 Merge pull request #935 from dumganhar/iss1270_warning 
fixed #1270: Fixed some warning on win32.
 2012-05-29 02:30:09 -07:00
James Chen 4864640816 fixed #1270: Re-generated LuaCocos2d.cpp. 2012-05-29 17:25:18 +08:00
James Chen d44c193170 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1270_warning 2012-05-29 17:17:39 +08:00
James Chen 1075b05fa6 Merge pull request #934 from dumganhar/gles20 
fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
 2012-05-29 02:15:58 -07:00
James Chen 1ddb5d51b5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-29 17:13:21 +08:00
James Chen ec0b0d18c7 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1270_warning 2012-05-29 17:12:38 +08:00
James Chen ad50d6ee57 fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
minggo b2cf68194a Merge pull request #933 from minggo/gles20 
fixed #1177: modify project setting
 2012-05-29 01:26:48 -07:00
minggo a09bbbd0ba fixed #1177: modify project setting, because CCStd.h is moved into platform/ios 2012-05-29 16:23:57 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen e3df8eabb8 Merge pull request #932 from dumganhar/gles20 
fixed #1177: Updated Android.mk.
 2012-05-29 01:12:44 -07:00
James Chen c1cb8b0e24 fixed #1177: Updated Android.mk. 2012-05-29 15:56:08 +08:00
James Chen a8cee2d1af Merge pull request #931 from dumganhar/gles20 
fixed #1177: Moved CCStdC.h/.cpp to relevant platform folder.
 2012-05-29 00:54:11 -07:00
James Chen 6e2c257e43 fixed #1177: Updated win32 project configuration. 2012-05-29 15:52:38 +08:00
James Chen 5f5af82254 fixed #1177: Moved CCStdC.h/.cpp to relevant platform folder. 2012-05-29 15:51:13 +08:00
James Chen 0ad31693c5 Merge pull request #930 from dumganhar/gles20 
fixed #1268: Testjs will crash after clicking the close button on win32.
 2012-05-29 00:30:11 -07:00
James Chen a0228ce690 fixed #1268: use delete[] to destroy array. 2012-05-29 15:28:33 +08:00
James Chen 94701d9315 fixed #1268: Testjs will crash after clicking the close button on win32. 
Also, fixed a bug in CCTextureCache::~CCTextureCache().
 2012-05-29 15:23:16 +08:00
minggo a9e3931f47 Update AUTHORS 2012-05-29 10:34:15 +08:00
minggo 317d6a31b4 Merge pull request #917 from jreitman/rw_fixes 
fixed #1266: Fixed async texture cache not working on IOS
 2012-05-28 19:30:58 -07:00
minggo 7da819b699 Merge pull request #929 from diwu/gles20 
Added some detail in AUTHORS
 2012-05-28 18:34:23 -07:00
Di Wu 6e7a012f0e Added some detail in AUTHORS 2012-05-29 09:16:30 +08:00
Jeff Reitman 821c3933b4 Merge branch 'gles20' into rw_fixes 2012-05-28 07:27:36 -07:00
Jeff Reitman 6c5f309180 Revert "* add ability to disable denshion in lua mode" 
This reverts commit b7746882f7.
 2012-05-28 07:24:20 -07:00
James Chen 331b5ac8ca Merge pull request #927 from dumganhar/gles20 
fixed #1263: Removed some unused files.
 2012-05-28 02:39:23 -07:00
James Chen 05cc49a751 fixed #1263: Removed some unused files. 2012-05-28 17:33:32 +08:00
James Chen 3b94adb43a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-28 17:25:47 +08:00
minggo 2401e8593f Merge pull request #926 from minggo/iss1265_spidermonkey 
fixed #1265: add testjs.xml
 2012-05-28 02:25:19 -07:00
minggo 70443dfabb fixed #1265: add testjs.xml 2012-05-28 17:24:42 +08:00
minggo 1f4a972a70 Merge pull request #925 from minggo/iss1265_spidermonkey 
move js files into Resources
 2012-05-28 02:22:46 -07:00
minggo 0fdd9f3fd7 move js files into Resources 2012-05-28 17:21:42 +08:00
James Chen e944ff95bf Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-28 17:02:24 +08:00
minggo 8f03293403 Merge pull request #924 from minggo/iss1265_spidermonkey 
fixed #1265: js support for android
 2012-05-28 02:00:28 -07:00
minggo 770654de1a fixed #1265: js support for android 2012-05-28 16:58:16 +08:00
James Chen ae6d57ac8e Merge pull request #923 from dumganhar/gles20 
fixed #1246: Updated win32 templates. Copying fps_images.fnt and fps_images.png files.
 2012-05-28 01:27:20 -07:00
James Chen a7ca2cb3a0 fixed #1246: Updated win32 templates. Copying fps_images.fnt and fps_images.png files. 2012-05-28 16:25:32 +08:00