axmol/cocos2dx
Donald Alan Morrison 3ee17b1a23 Merge with c9674e85e8. The diff revealed
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
2012-08-23 22:32:33 -07:00
..
actions Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:26:35 -07:00
base_nodes fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
cocoa Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
effects fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
include fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
kazmath Merge with c9674e85e8. The diff revealed 2012-08-23 22:32:33 -07:00
keypad_dispatcher add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
label_nodes Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.) 2012-08-20 14:30:37 -07:00
layers_scenes_transitions_nodes Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381 2012-07-27 18:29:57 +08:00
menu_nodes Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
misc_nodes Plugged potential memory leak found by LLVM Static Analyzer. 2012-08-20 16:40:26 -07:00
particle_nodes fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
platform Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method. 2012-08-23 13:41:54 -07:00
proj.blackberry fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
proj.ios For Release Builds: 2012-08-20 16:11:11 -07:00
proj.linux fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +08:00
proj.mac fixed #1417:add header search path and add CCTouch.cpp into mac project 2012-08-06 11:08:06 +08:00
proj.win32 add CCTouch.cpp into proj.win32, android.mk, xcode4 template. 2012-07-31 23:32:19 +08:00
script_support add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
shaders Fixes a few Xcode 4.5-specific error messages. 2012-07-08 22:37:19 -07:00
sprite_nodes Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:33:34 -07:00
support Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.) 2012-08-20 14:54:12 -07:00
text_input_node change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs 2012-08-01 13:24:23 +08:00
textures Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
tilemap_parallax_nodes fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android 2012-08-20 14:06:29 +08:00
touch_dispatcher fixed #1413, add CCTouch::getLocation(), getDelta() method 2012-07-31 17:41:53 +08:00
Android.mk issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
CCCamera.cpp issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
CCCamera.h add groups to all classes for doxygen 2012-06-20 18:09:11 +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 remove some unneeded codes 2012-08-16 14:51:58 +08:00
CCDirector.h remove some unneeded codes 2012-08-16 14:51:58 +08:00
CCDrawingPrimitives.cpp fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
CCDrawingPrimitives.h fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
CCScheduler.cpp fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
CCScheduler.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
cocos2d.cpp modify cocos2d-x version 2012-06-26 15:37:47 +08:00