axmol/cocos2dx
minggo 8e78f8a7eb Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection 2013-05-08 10:32:26 +08:00
..
actions More verbose logging in removeChildByTag and getActionByTag 2013-04-27 23:15:00 +04:00
base_nodes Merge pull request #2430 from imbahom/master 2013-05-07 01:48:31 -07:00
cocoa resolve conflict for #2505 2013-05-07 14:31:00 +08:00
draw_nodes Implement primitive drawing methods for Emscripten 2013-05-06 21:29:44 -07:00
effects Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 20:59:48 -07:00
include Add #defines for Emscripten platform 2013-05-06 20:58:43 -07:00
kazmath Add new port: Native Client 2013-03-02 12:15:24 -08:00
keypad_dispatcher Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
label_nodes Added CC_FORMAT_PRINTF to CCString 2013-04-19 14:00:16 +04:00
layers_scenes_transitions_nodes Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 20:59:48 -07:00
menu_nodes Fixing compilation errors. 2013-05-07 15:51:58 +08:00
misc_nodes Merge pull request #2521 from minggo/emscriptenate 2013-05-06 23:51:38 -07:00
particle_nodes Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x 2013-03-25 11:46:02 +08:00
platform Merge pull request #2422 from brawsome/master 2013-05-07 01:40:57 -07:00
proj.blackberry Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
proj.emscripten Simplify Emscripten makefile a little. 2013-05-06 21:30:03 -07:00
proj.ios updates Xcode project to detect more warnings 2013-05-03 11:59:44 -07:00
proj.linux fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1, 2013-04-17 12:49:25 +08:00
proj.mac - changed cocos2d mac project to support universal build and x86 2013-03-23 16:04:51 +00:00
proj.marmalade issue #1529:modify marmalade and native client project configuration 2013-03-07 09:51:26 +08:00
proj.nacl fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1, 2013-04-17 12:49:25 +08:00
proj.win32 issue #1529:add user_default into vs2010 project 2013-03-07 10:31:01 +08:00
script_support add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
shaders Added CC_FORMAT_PRINTF to CCString 2013-04-19 14:00:16 +04:00
sprite_nodes Remove debug print statement 2013-05-06 21:29:44 -07:00
support Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection 2013-05-08 10:32:26 +08:00
text_input_node Fixed GCC warning on narrowing conversion 2013-04-19 12:09:26 +04:00
textures Merge pull request #2521 from minggo/emscriptenate 2013-05-06 23:51:38 -07:00
tilemap_parallax_nodes Fix compilation errors for linux port. 2013-05-07 14:36:01 +08:00
touch_dispatcher add getStartLocation() and getStartLocationInView() to CCTouch to access the start point of a touch 2013-03-04 13:08:19 +01:00
Android.mk Clean up linked libraries 2013-04-08 22:46:25 -07: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 Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
CCConfiguration.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCDirector.cpp Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-05-06 20:59:49 -07:00
CCDirector.h Add CCDirector::popToSceneStackLevel(int level) 2013-04-30 23:33:22 +01:00
CCScheduler.cpp fixed potential crash in CCScheduler::removeHashElement 2013-03-26 22:55:26 +01: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 update version 2013-04-28 13:48:18 +08:00