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

4805 Commits

Author SHA1 Message Date
James Chen f6026d2ba3 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-26 12:09:48 +08:00
James Chen 95a2696b6b fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin. 2012-06-26 12:09:23 +08:00
minggo e4608df89d Merge pull request #1059 from minggo/gles20 
enable depth test when running test case:Bug-1159
 2012-06-25 20:10:26 -07:00
minggo 765da0c80a enable depth test when running test case:Bug-1159 2012-06-26 11:09:37 +08:00
minggo 1fe64da7de Merge pull request #1058 from minggo/gles20 
fixed #1364:add paused state
 2012-06-25 20:03:57 -07:00
minggo 16310cb544 fixed #1364:add paused state 2012-06-26 11:02:19 +08:00
James Chen ec5ba08a97 Merge pull request #1057 from dumganhar/gles20 
fixed #1344: win32 template cannot work after synchronizing to rc2
 2012-06-24 21:11:54 -07:00
James Chen 04a155fd9c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-25 11:55:52 +08:00
James Chen 28ba42db87 fixed #1344: win32 template cannot work after synchronizing to rc2 2012-06-25 11:55:12 +08:00
minggo 13f066f942 Merge pull request #1055 from minggo/iss1343_xcode 
fixed #1343: make xcode template work ok
 2012-06-21 21:01:24 -07:00
minggo 55eca9f516 fixed #1343: make xcode template work ok 2012-06-22 12:00:27 +08:00
Walzer 95707e9884 Update gles20 2012-06-21 14:04:04 +08:00
James Chen 8cb4252354 Merge pull request #1053 from dumganhar/gles20 
Removed virtual attribute for callback functions in HelloWorldScene.h. And updated templates.
 2012-06-20 22:59:39 -07:00
James Chen 1d0b7c40e4 Removed virtual attribute for callback functions in HelloWorldScene.h. 
Updated templates.
 2012-06-21 13:56:56 +08:00
James Chen b7c1e24112 Merge pull request #1052 from dumganhar/gles20 
fixed a typo in CCScene.h.
 2012-06-20 22:50:05 -07:00
James Chen 5274fc378d fixed a typo in CCScene.h. 2012-06-21 13:48:57 +08:00
minggo d849ff1860 Merge pull request #1051 from ngocdaothanh/patch-1 
"node" -> "create"
 2012-06-20 22:42:20 -07:00
Ngoc Dao 28cc77008d "node" -> "create" 2012-06-21 14:33:27 +09:00
minggo 5b701e1d3d Merge pull request #1050 from minggo/iss1338_cocosdenshion 
fix a crash bug
 2012-06-20 20:44:44 -07:00
minggo 5cc1f7d230 fixed #1338:stop animation when entering background and start animation when comming to foreground 2012-06-21 11:42:49 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
Walzer d7162fcfc5 Add groups in all classes for doxygen. Upgrade doxygen to 0.8.1 2012-06-20 18:07:27 +08:00
James Chen 0960c4988a Merge pull request #1049 from dumganhar/gles20 
fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify
 2012-06-19 23:39:18 -07:00
James Chen f8ebbccb98 fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify 2012-06-20 14:38:13 +08:00
James Chen d3b73b3df4 Merge pull request #1048 from dumganhar/gles20 
fixed #1336: Updated comment information for deprecated apis.
 2012-06-19 23:34:07 -07:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen 940ae5b05b Merge pull request #1047 from dumganhar/gles20 
fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
 2012-06-19 22:56:48 -07:00
James Chen f748b87268 fixed #1336: Updated HelloWorldScene.cpp 2012-06-20 13:56:09 +08:00
James Chen 2af75ecd65 fixed #1336: HelloCocosBuilder/HelloCocosBuilderLayer.cpp 2012-06-20 12:08:34 +08:00
James Chen d3d3288e09 fixed #1336: Updated CCScene.h. 2012-06-20 12:03:50 +08:00
James Chen 411ae21cee fixed #1336: Updated lua bindings. 2012-06-20 11:59:35 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen 6f9c124277 Merge pull request #1046 from dumganhar/gles20-ccbi 
fixed #1335: Memory leaks in cocos2dx and CCBReader.
 2012-06-19 02:41:35 -07:00
James Chen 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
James Chen c41f01dd3e Merge pull request #1045 from dumganhar/gles20 
merge PR #1044.
 2012-06-19 02:27:49 -07:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
James Chen 591566b43a fixed #1335: Memory leaks in cocos2dx and CCBReader. 2012-06-19 16:31:26 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 2666df9472 issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen a602c5cb14 Merge pull request #1043 from dumganhar/gles20-ccbi 
Fixed CCScrollView (since it was behaving differently compared to the cocos2d-iphone version).
 2012-06-18 19:58:37 -07:00
James Chen c1883c1237 fixed #1334: Updated CCScrollView.h 2012-06-19 10:55:52 +08:00
James Chen da85a36cd1 Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi 
Conflicts:
	cocos2dx/extensions/CCScrollView/CCScrollView.h
 2012-06-19 10:51:40 +08:00
James Chen d096ef3c50 Merge pull request #1042 from dumganhar/gles20-ccbi 
fixed #1334: Add ScrollViewTest to CocosBuilderTest.
 2012-06-18 19:46:27 -07:00
James Chen 9fa74721a7 fixed #1334: Add ScrollViewTest to CocosBuilderTest. 2012-06-19 10:34:15 +08:00
Nicolas Gramlich ac4a56a38c Fixed CCScrollView (since it was behaving differently compared to the cocos2d-iphone version). 2012-06-18 18:43:53 -07:00
James Chen a5039fb23b Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi 
Conflicts:
	cocos2dx/Android.mk
 2012-06-19 09:38:46 +08:00
Nicolas Gramlich 6f26ea7a56 Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest. 2012-06-18 13:59:45 -07:00
Nicolas Gramlich fea4401681 CCBReader: Named a whole bunch of parameters in the CCNodeLoader headers. 2012-06-18 13:41:48 -07:00
Nicolas Gramlich 227683bfa4 Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files. 2012-06-18 13:33:19 -07:00