Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/textures/CCTexture2D.h
	samples/Javascript/Shared
 		2013-07-19 16:04:23 -07:00
..
actions More best practices fixes 2013-07-18 16:30:19 -07:00
base_nodes issue #2407: more best practices fixes, more getter and const.. 2013-07-19 14:57:54 +08:00
cocoa issue #2404: return nullptr in Clonable::copy(). 2013-07-19 11:56:01 +08:00
draw_nodes more best practices fixes 2013-07-17 16:56:19 -07:00
effects more best practices fixes 2013-07-17 16:56:19 -07:00
include Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
kazmath Support Tizen device. 2013-06-12 10:20:18 +09:00
keyboard_dispatcher fixed issues on win32 and mac keyboard 2013-07-02 11:39:18 +02:00
keypad_dispatcher issue #2387: Using static_cast instead of C style cast in iteration of CCArray. 2013-07-09 14:29:51 +08:00
label_nodes Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
layers_scenes_transitions_nodes Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes 2013-07-18 15:46:14 +08:00
menu_nodes More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize 2013-07-19 11:08:47 +08:00
misc_nodes more best practices fixes 2013-07-17 16:56:19 -07:00
particle_nodes more best practices fixes 2013-07-17 16:56:19 -07:00
platform Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
proj.blackberry Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
proj.emscripten issue #2379: Removing CCZone.cpp for Makefile. 2013-07-09 15:31:28 +08:00
proj.linux issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
proj.marmalade issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too. 2013-07-01 17:35:51 +08:00
proj.nacl issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
proj.tizen Support Tizen 2.2 SDK. 2013-07-10 13:04:08 +09:00
proj.win32 issue #2404:remove unneeded files 2013-07-15 17:18:30 +08:00
script_support more best practices fixes 2013-07-17 16:56:19 -07:00
shaders closed #2410: Fixing a bug that loading a wrong texture in ShaderCache::loadDefaultShaders. This could fix DrawNode displays nothing when resume. 2013-07-17 12:55:27 +08:00
sprite_nodes more best practices fixes 2013-07-17 16:56:19 -07:00
support issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr 2013-07-16 12:47:40 +08:00
text_input_node getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
textures Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
tilemap_parallax_nodes issue #2407: Minor fix in CCTMXLayer.h 2013-07-19 15:03:28 +08:00
touch_dispatcher closed #2413: Warning fixes for overload virtual functions. 2013-07-17 16:25:13 +08:00
Android.mk issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
CCCamera.cpp Adds const to more getters 2013-07-06 22:01:21 -07:00
CCCamera.h Adds more readability to the class internals. 2013-07-15 12:43:22 -07:00
CCConfiguration.cpp getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCConfiguration.h getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCDirector.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCDirector.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCScheduler.cpp More best practices fixes 2013-07-18 16:30:19 -07:00
CCScheduler.h More best practices fixes 2013-07-18 16:30:19 -07:00
ccFPSImages.c issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
ccFPSImages.h issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
ccTypes.cpp issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
cocos2d.cpp MenuItemToggle is fixed 2013-06-05 17:51:40 -07:00
cocos2dx-Prefix.pch issue #2371: Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder. 2013-07-05 10:52:46 +08:00