| .. |
|
actions
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
base_nodes
|
issue #1686:synchronize CCSprite.cpp
|
2013-02-27 15:30:49 +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
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
effects
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
include
|
issue #1686:synchronize CCSprite.cpp
|
2013-02-27 15:30:49 +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
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
layers_scenes_transitions_nodes
|
Merge branch 'iss1686-sync-rc0a' of https://github.com/dumganhar/cocos2d-x into iss1686-synchronize
|
2013-02-27 14:25:24 +08: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 #1686:synchronize CCRenderTexture.cpp
|
2013-02-27 15:44:36 +08:00 |
|
particle_nodes
|
Merge pull request #1873 from ThePickleMan/master
|
2013-02-21 19:02:39 -08:00 |
|
platform
|
fixed #1637:fix mac retina display and labelttf
|
2013-02-27 11:10:42 +08:00 |
|
proj.blackberry
|
issue #1712: Updating project setting for blackberry.
|
2013-02-17 16:26:08 +08:00 |
|
proj.ios
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +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 #1489: ZEXPORT -> CC_DLL for unzip.h.
|
2013-02-25 18:35:18 +08:00 |
|
script_support
|
add CCLuaObjcBridge
|
2013-02-02 02:05:52 +08:00 |
|
shaders
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
sprite_nodes
|
issue #1686:synchronize CCSprite.cpp
|
2013-02-27 15:30:49 +08:00 |
|
support
|
fix a bug of CCUserDefault
|
2013-02-26 12:44:20 +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
|
issue #1686:synchronize CCTextureCache.cpp
|
2013-02-27 11:35:38 +08:00 |
|
tilemap_parallax_nodes
|
issue #1686:synchronize CCTexturePVR.cpp
|
2013-02-26 18:08:51 +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
|
Merge with gles20.
|
2012-06-11 10:43:07 -07:00 |
|
CCConfiguration.h
|
add groups to all classes for doxygen
|
2012-06-20 18:09:11 +08:00 |
|
CCDirector.cpp
|
issue #1686:synchronize CCRenderTexture.cpp
|
2013-02-27 15:44:36 +08:00 |
|
CCDirector.h
|
issue #1686:synchronize CCRenderTexture.cpp
|
2013-02-27 15:44:36 +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 |
|
ccFPSImages.c.REMOVED.git-id
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
ccFPSImages.h
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
|
cocos2d.cpp
|
issue #1686:synchronize cocos2d.cpp
|
2013-02-26 16:55:23 +08:00 |
088bc959f6