axmol/cocos2dx
minggo 33b857c3f7 Merge pull request #1984 from billy1380/master
CCLens3d can be concave
2013-02-21 18:08:47 -08:00
..
actions CCLens3d can be concave 2013-02-16 03:12:12 +00:00
base_nodes Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
cocoa issue #1687: Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class. 2013-02-01 18:48:44 +08:00
draw_nodes Make sure HelloCpp can be full screen. 2012-11-29 16:31:29 +08:00
effects Added stackable action support. Exchanged the order of action. 2012-12-26 18:59:31 +08:00
include issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
kazmath Marmalade Cocos2d-x Main Repo Changes 2012-10-19 16:38:58 +01:00
keypad_dispatcher Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
label_nodes Merge pull request #1937 from dumganhar/revert-ttf-update 2013-01-30 22:28:48 -08:00
layers_scenes_transitions_nodes repair CCTransitionSplitCols & CCTransitionSplitRows 2013-01-15 00:49:05 +04:00
menu_nodes Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int). 2013-01-23 14:00:23 -05:00
misc_nodes issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
particle_nodes Reverted this commit (be305f84b6) since i didn't find the crash. 2013-01-25 20:59:58 +08:00
platform Use CCLOG instead of CCMessageBox to report file system errors 2013-02-21 17:05:17 -08:00
proj.blackberry issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
proj.ios issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
proj.linux issue #1733: Updated cocos2dx/proj.linux/Makefile. 2013-02-19 18:08:58 +08:00
proj.mac fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
proj.marmalade issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
proj.win32 issue #1712: Moved CCDevice.cpp to platform/win32. 2013-02-17 11:52:30 +08:00
script_support add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
shaders Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
sprite_nodes Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
support fixed #1703: fixed compilation errors for BlackBerry. 2013-02-16 11:05:30 +08:00
text_input_node fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
textures Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp 2013-02-05 11:22:53 +08:00
tilemap_parallax_nodes Added TMX polygon parsing. 2013-01-29 14:45:41 -08:00
touch_dispatcher fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
Android.mk issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
CCCamera.cpp issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
CCCamera.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCConfiguration.cpp
CCConfiguration.h
CCDirector.cpp fix compile error for ios/mac c++11 2012-12-10 18:10:41 +08:00
CCDirector.h issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
CCScheduler.cpp fix a compilation error for android. 2013-01-03 19:56:34 +08:00
CCScheduler.h issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
cocos2d.cpp change version string 2013-01-28 15:24:13 +08:00