Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
natural-law 1991a65b0b Merge branch 'master' into iss391 
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
 		2011-03-29 10:20:57 +08:00
..
actions issue #148, add copyright 2011-03-19 10:34:26 +08:00
base_nodes fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
cocoa Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00
effects issue #148, add copyright 2011-03-19 10:34:26 +08:00
event_dispatcher issue #148, add copyright 2011-03-19 10:34:26 +08:00
include issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
keypad_dispatcher issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
label_nodes Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396 2011-03-28 21:08:56 +08:00
layers_scenes_transitions_nodes fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
menu_nodes fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
misc_nodes fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
particle_nodes issue #418 add copyright of original authors to particle module 2011-03-19 10:07:16 +08:00
platform Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00
proj.win32 Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00
proj.wophone Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00
sprite_nodes issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString. 2011-03-24 10:38:08 +08:00
support Merge branch 'master' into iss434 2011-03-28 17:06:32 +08:00
textures Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396 2011-03-28 21:08:56 +08:00
tileMap_parallax_nodes Merge branch 'master' into iss434 2011-03-28 17:06:32 +08:00
touch_dispatcher fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
Android.mk Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00
CCCamera.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCConfiguration.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCConfiguration.h fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCDrawingPrimitives.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCScheduler.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
cocos2d.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00