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

3992 Commits

Author SHA1 Message Date
James Chen 7d073c4807 Merge pull request #794 from dumganhar/gles20 
issue #1056: Fixed a bug about double free memory and glDrawElements caused crash.
 2012-03-21 07:00:57 -07:00
James Chen 35d93328b9 issue #1056: 1.Fixed a bug of double delete TouchDispatcher. 
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
 2012-03-21 21:53:03 +08:00
James Chen ad96cd86e0 Merge pull request #792 from dumganhar/gles20 
issue #1056: Moved some singletons to CCDirector. It is more easily managed by CCDirector.
 2012-03-21 02:40:04 -07:00
James Chen 6f4a01f454 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 17:35:39 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
minggo 3a544810c5 Merge pull request #791 from minggo/ShaderTest 
implement ShaderTest
 2012-03-21 02:30:15 -07:00
minggo e75e35b23f issue #1506: add ShaderTest source code 2012-03-21 17:27:13 +08:00
minggo 6242656049 issue #1506: fix a confict 2012-03-21 17:23:33 +08:00
minggo 92c30a328e issue #1506: implement ShaderTest 2012-03-21 17:02:52 +08:00
James Chen 4f0ad1eb80 Merge pull request #789 from dumganhar/gles20 
issue #1056: Added Box2D and Chipmunk support.
1.Removed ChipmunkTest, added ChipmunkAccelTouchTest.
2.Added Box2DTest and Box2DTestBed.
3.Update Box2dTest and ChipmunkAccelTouchTest.
4.Update Chipmunk to 6.0.3 version.
 2012-03-21 01:17:33 -07:00
James Chen 159b677dc0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 16:09:26 +08:00
James Chen 8ad598241f issue #1056: Update Tests project for ios platform. 2012-03-21 16:05:24 +08:00
James Chen 9b4a42c494 issue #1056: Update Box2dTest and ChipmunkAccelTouchTest. 2012-03-21 15:54:48 +08:00
James Chen 2ac2da9c97 issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. 
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
 2012-03-21 15:43:35 +08:00
James Chen 0c91539c95 issue #1056: Update Chipmunk to 6.0.3 version. 2012-03-21 14:53:57 +08:00
minggo e8861f80bf Merge pull request #788 from minggo/NodeTest 
rename CocosNodeTest to NodeTest and SC
 2012-03-20 22:53:43 -07:00
minggo bb908f5a5e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest 2012-03-21 13:36:51 +08:00
minggo f6c113993a issue #1506: rename CocosNodeTest to NodeTest and SC 2012-03-21 13:36:24 +08:00
James Chen 980fe4dca6 Merge pull request #787 from dumganhar/gles20 
issue #1056: Added gles2.0 support for ios platform.
 2012-03-20 20:12:55 -07:00
James Chen 8ef5e4ae3b issue #1056: Update the configuration of ios project.Sort the the project folder. 2012-03-21 11:07:31 +08:00
James Chen 00a81f5bd0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-03-21 10:43:54 +08:00
James Chen 02ae04c1d6 issue #1056: Modified the configuration of ios project. 2012-03-21 10:41:21 +08:00
James Chen bb4d7c2f88 issue #1056: Updated some files for ios platform. Added some 'TODO'. 2012-03-21 10:36:20 +08:00
James Chen 321771a7ea issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +08:00
James Chen 7c0af610ff issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +08:00
James Chen 7f6f18322e Merge pull request #784 from dumganhar/iss1056_fix_crash 
issue #1056: Fixed some bugs as follows:
1.Fixed a bug in CCTouchDispatcher which will cause crash when app exit.
2.Fixed some memory leaks.
3.Removed old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
4.Updated implementation of CCDICT_FOREACH.
 2012-03-20 06:14:03 -07:00
James Chen 15e03f8b14 issue #1056: Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project. 
Update CCDICT_FOREACH implementation.
 2012-03-20 21:08:52 +08:00
James Chen b5fca2f5f3 issue #1056: Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks. 2012-03-20 21:04:29 +08:00
minggo 6a39dd21ab Merge pull request #783 from minggo/ActionsEaseTest 
rename EaseTatinosTest to ActionsEaseTest and SC
 2012-03-20 03:10:38 -07:00
minggo a3441a39e7 issue #1056: rename EaseTatinosTest to ActionsEaseTest and SC 2012-03-20 18:07:42 +08:00
minggo 272fa58b81 Merge pull request #781 from minggo/android_gles20 
set up gles2.0 environment on Android
 2012-03-20 02:31:22 -07:00
minggo 382e4e7eb8 issue #1056: modify code according new code after pull 2012-03-20 17:27:06 +08:00
minggo 7ccb38556e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20 2012-03-20 16:10:53 +08:00
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen ae2b3307fa Merge pull request #779 from dumganhar/iss1056_CCDict 
issue #1056: Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
 2012-03-20 00:07:58 -07:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
minggo 910a937732 Merge pull request #778 from minggo/gles20 
implement ActionsProgressTest and run ok on win32
 2012-03-19 03:56:11 -07:00
minggo 39738e4270 issue #1056: implement ActionsProgressTest and run ok on win32 2012-03-19 18:20:32 +08:00
James Chen 9203b60fb0 add CCDictionary based on UTHASH, improve the performance. 2012-03-19 14:53:44 +08:00
minggo 68809fd5ed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-19 13:54:34 +08:00
James Chen f67ac20639 Merge pull request #775 from dumganhar/gles20-dev 
issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files.
 2012-03-16 02:59:21 -07:00
James Chen e021ae9821 #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +08:00
James Chen 86a1acc0d8 Merge pull request #774 from dumganhar/gles20-dev 
issue #1056: synchronise cocos2d-iphone-2.0-rc0a
 2012-03-15 22:45:20 -07:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
Rolando Abarca 0314fd51f4 adds the new spidermonkey repo as submodule 2012-03-15 11:17:00 -07:00
Rolando Abarca 4ea4c4d776 updates gitignore 2012-03-15 11:15:31 -07:00
Rolando Abarca 4d08d473f0 removes old spidermonkey 2012-03-15 11:14:52 -07:00
Rolando Abarca 3a747d38e3 removes old spider monkey 2012-03-15 11:14:11 -07:00
James Chen 303818ef6d issue #1056: Update CCGLProgram. 2012-03-15 10:54:07 +08:00
James Chen 9e89171557 issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class. 2012-03-15 10:42:22 +08:00