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

5141 Commits

Author SHA1 Message Date
YuLei 6115769044 restore CCApplicationProtocol.h and CCFileUtils.h 2012-09-05 13:36:27 +08:00
dualface 1dc7c48cf6 [Win32] add CC_DISABLE_ASSERT check 2012-09-04 11:34:55 +08:00
dualface 3befb0ffdc Merge remote-tracking branch 'origin/gles20' into gles20 2012-09-04 11:20:33 +08:00
YuLei 39b019b2cb [Mac] fix CC_ASSERT error 
[Mac] add CC_DISABLE_ASSERT check

[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
 2012-09-04 11:16:59 +08:00
YuLei dcc8733a53 update tolua++ for mac 2012-09-04 09:56:55 +08:00
YuLei 57566d0364 revert main.js 2012-09-04 09:53:58 +08:00
dualface 9fa8d87bc0 Merge remote-tracking branch 'origin/gles20' into gles20 2012-09-04 02:41:46 +08:00
dualface 2160e56cb1 [Win32] fix CCFileUtils:fullPathFromRelativePath() check m_isWorkingDirectory 2012-09-04 02:41:16 +08:00
YuLei 539a524627 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-04 02:16:35 +08:00
YuLei 09b0d9c843 [Mac] fix memory leaks 2012-09-04 02:06:04 +08:00
YuLei a25b1b3f2f [Mac] fix memory leaks 2012-09-04 01:22:06 +08:00
YuLei 39f672e5bf fix: cleanup scheduler after call CCDirector::end() 2012-09-04 01:21:32 +08:00
YuLei 03374fa83b add CCApplicationProtocol:setStartupScriptFilename(), getStartupScriptFilename() 
CCFileUtils:setResourceDirectory() add isWorkdingDir argument
 2012-09-03 18:05:59 +08:00
minggo 3ba5f16088 Merge pull request #1281 from minggo/merge_texparams 
Merge pull request
 2012-09-03 01:49:19 -07:00
minggo 56c329cf0e reset texture parameter when coming to foreground on android 2012-09-03 16:47:18 +08:00
minggo 1a2dd6ae35 Merge branch 'gles20' of https://github.com/MartinSherburn/cocos2d-x into merge_texparams 2012-09-03 16:04:41 +08:00
YuLei e490035e2e Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-03 15:24:40 +08:00
dualface 9809798280 [Win32] add menubar to window 
[Win32] set custom window message proc
[Win32] resize window
 2012-09-03 00:58:42 +08:00
James Chen f11c849cfe Merge pull request #1278 from edbartley/gles20 
fixed #1456: Remove code signing from MAC TestCpp project.
 2012-09-02 07:49:12 -07:00
YuLei Liao c1beb9d3bf [Win32] CCLog() print to STDOUT 2012-09-02 13:21:30 +08:00
fish 8c29e9b1e2 Remove code signing from MAC TestCpp project. 2012-09-01 18:06:30 -04:00
YuLei Liao d4c53d43b9 [Win32] add custom menu and custom windows message proc 2012-09-02 04:38:52 +08:00
YuLei c86595ddde [Lua] remove glLineWidth() 2012-09-02 01:18:28 +08:00
YuLei 135f2fdabd remove unused files 2012-09-02 01:13:52 +08:00
YuLei 6f3833af73 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:56:27 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
James Chen 35f6f937c9 Merge pull request #1271 from mustime/testlua 
issue #1425: add NodeTest to TestLua.
 2012-09-01 01:52:42 -07:00
James Chen 45a712e932 Merge pull request #1276 from dumganhar/gles20 
fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla.
 2012-08-31 19:51:43 -07:00
James Chen 382b08a947 fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla . 2012-09-01 10:49:15 +08:00
Rohan Kuruvilla 374232ac88 Adding xcode template for cocos2dx-js 2012-08-31 12:07:58 -07:00
James Chen 1deabca65b Merge pull request #1274 from dumganhar/iss1454_javascript 
issue #1454: fixed bugs in test-particles.js.
 2012-08-31 08:30:46 -07:00
James Chen 8e290cad6e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript 2012-08-31 23:29:02 +08:00
James Chen 94a1aa6123 issue #1454: fixed bugs in test-particles.js. 2012-08-31 23:28:43 +08:00
minggo 362cba4e79 Merge pull request #1273 from minggo/iss1454_javascript 
issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh
 2012-08-31 08:17:56 -07:00
minggo dacf1704fc issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh 2012-08-31 23:16:36 +08:00
James Chen ef272e8ac6 Merge pull request #1272 from dumganhar/iss1454_javascript 
issue #1454: Removed COCOS2D_JAVASCRIPT macro.
 2012-08-31 07:35:02 -07:00
James Chen fde8473415 Merge branch 'iss1454_javascript' of https://github.com/dumganhar/cocos2d-x into iss1454_javascript 2012-08-31 22:33:34 +08:00
James Chen 0f213beae2 issue #1454: Fixed a bug in CCMenuItem::activate. 2012-08-31 22:33:14 +08:00
James Chen f5a46d1d23 Merge pull request #1 from minggo/iss1454_javascript 
issue #1454:modify ios project resources
 2012-08-31 07:29:11 -07:00
minggo 1ea039d21d issue #1454:modify ios project resources 2012-08-31 22:23:30 +08:00
James Chen 0d2c2b3bf8 issue #1454: Updated win32 project configuration and some .plist files. 
Removed old binding files.
 2012-08-31 22:01:57 +08:00
James Chen e7e954045a issue #1454: Updated TestJavascript/proj.android/build_native.sh. 2012-08-31 21:30:58 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
James Chen 458bb2c343 Moved Default.png to proj.ios, added ForestFire.plist. 2012-08-31 19:51:22 +08:00
James Chen dd8c993581 issue #1454: Removed some duplicated resources files. 2012-08-31 19:50:20 +08:00
James Chen 9d75f33b7e Merge branch 'iss1454_javascript' of https://github.com/minggo/cocos2d-x into iss1454_javascript 2012-08-31 19:33:23 +08:00
mustime 31655bb6ca issue #1425: add NodeTest to TestLua 2012-08-31 18:40:21 +08:00
mustime f5506d58e1 issue #1425: update pkg files and recreate binding 2012-08-31 18:29:44 +08:00
mustime f070864429 issue #1425: add NodeTest to TestLua 2012-08-31 18:26:27 +08:00
mustime 680e189365 issue #1425: update lua script 2012-08-31 18:25:28 +08:00