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

5273 Commits

Author SHA1 Message Date
James Chen 8bd11f9420 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-06 15:24:57 +08:00
moadib a574d17bed Added comment as minggo requested 2012-09-06 10:09:29 +04:00
minggo 10069f8b99 Merge pull request #1287 from ivzave/gles20 
remove delete this from init methods
 2012-09-05 19:16:15 -07:00
YuLei 3679f742cb Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20 2012-09-06 09:50:52 +08:00
dualface eae5f7368e [Win32] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory 2012-09-06 09:49:38 +08:00
YuLei 7ba88dca4c [Mac] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory 2012-09-06 09:44:40 +08:00
ivzave cf67922ee0 remove delete this from init methods 2012-09-05 22:30:44 +04:00
YuLei a5e34ee754 [Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename() 2012-09-05 16:15:09 +08:00
moadib 1b51b709ee Fixed crash with CCLabelBMFont when center- or right-aligned text have line breaks each other 2012-09-05 11:36:34 +04:00
YuLei 9d2b0b04f2 [Lua] update luabinding for CCPoint, CCSize, CCRect 2012-09-05 14:49:26 +08:00
dualface affcb70ecc add CCApplication::setResourceRootPath() 
add CCApplication::setStartupScriptFilename()
 2012-09-05 14:38:39 +08:00
minggo ecc4e769dc Merge pull request #1285 from ThePickleMan/gles20 
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCCon...
 2012-09-04 22:46:06 -07:00
YuLei 6115769044 restore CCApplicationProtocol.h and CCFileUtils.h 2012-09-05 13:36:27 +08:00
ThePickleMan 469584e8b8 Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp 2012-09-04 23:53:17 -05:00
ThePickleMan ea87d6304d Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp 
Made the lower slider's value display too.
 2012-09-04 23:52:18 -05:00
ThePickleMan 5cf699f668 Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp 
Added a test for the restricted slider
 2012-09-04 22:32:29 -05:00
minggo d53c65e27b Merge pull request #1279 from ThePickleMan/gles20 
min/max allowed value for CCControlSlider
 2012-09-04 19:17:36 -07:00
ThePickleMan 0a96915da2 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Removed meaningless setter...the macro already makes one...
 2012-09-04 20:54:34 -05:00
ThePickleMan 423abc6f10 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Removed meaningless setter...the macro already makes one...
 2012-09-04 20:54:17 -05:00
ThePickleMan f6f370ffea Update extensions/GUI/CCControlExtension/CCControlSlider.h 
changed CC_SYNTHESIZE_READONLY to CC_SYNTHESIZE
 2012-09-04 20:48:04 -05:00
trentm 856763e1d6 Change 2012 solution version number. 2012-09-04 10:55:00 -06: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
yodesoft 95f204cd17 Add font table to handler font info, eg. family_name, style_name, filename 2012-09-04 10:48:02 +08:00
James Chen 45f95da30d Merge pull request #1277 from trentmillar/gles20 
fixed #1457: Adding VC2012 sln file and VS2012 changes to build-win32.bat & install-templates.msvc.bat
 2012-09-03 19:23:49 -07:00
James Chen 5320fd9e9d Merge branch 'gles20' of https://github.com/trentmillar/cocos2d-x into gles20 2012-09-04 09:58:39 +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
Trent Millar f67839705f Had wrong version in 2012 sln file. Adding clean /m to build 2012-09-03 13:22:52 -06: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
ThePickleMan a4d2d317b5 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 2012-09-03 09:46:55 -05: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
yodesoft b0d7ecec42 Supported display Unicode chars. 2012-09-03 12:38:29 +08:00
ThePickleMan da819e1109 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Added default values for max/min allowed values
 2012-09-02 16:31:12 -05:00
ThePickleMan e07320f6a8 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Added minimum/maximum allowed values
 2012-09-02 16:10:25 -05:00
ThePickleMan 82ea6fbb99 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Added fields and methods for setting the maximum allowed value.
 2012-09-02 16:08:13 -05:00
trentmillar 1d2b7c5b33 Comment in VS2012 sln file. changed to 2012 2012-09-02 13:23:50 -06: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