Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 		2012-06-14 17:36:31 +08:00
..
actions issue #1324: Uncommented old interfaces. 2012-06-14 17:29:23 +08:00
base_nodes issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
cocoa Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
effects Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
extensions Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
include Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
kazmath fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
keypad_dispatcher issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
label_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
layers_scenes_transitions_nodes issue #1324: Uncommented old interfaces. 2012-06-14 17:29:23 +08:00
menu_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
misc_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
particle_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
platform Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
proj.ios issue #1188: Updated project configuration for ios platform. 2012-04-25 17:33:28 +08:00
proj.win32 issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
script_support issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
shaders issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
sprite_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
support issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
text_input_node issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
textures Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
tileMap_parallax_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
touch_dispatcher issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
Android.mk Added missiong cpp files in Android.mk. Android build now successful. 2012-06-13 16:05:31 -07:00
CCCamera.cpp issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
CCCamera.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
CCConfiguration.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCConfiguration.h Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files. 2012-06-13 14:26:28 -07:00
CCDirector.cpp Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work. 2012-06-13 14:19:13 -07:00
CCDirector.h fixed #1293:rename getFrames to getTotalFrames and return correct value 2012-06-14 10:49:53 +08:00
CCDrawingPrimitives.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCDrawingPrimitives.h Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files. 2012-06-13 14:26:28 -07:00
CCScheduler.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCScheduler.h Merge with gles20. 2012-06-13 15:56:52 -07:00
cocos2d.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00