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 12d83f543b Merge pull request #2900 from dumganhar/flaming0-develop 
merge PR https://github.com/cocos2d/cocos2d-x/pull/2897
 		2013-06-15 20:22:28 -07:00
..
actions Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
base_nodes issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
cocoa Merge pull request #2884 from ricardoquesada/actions_clone_pattern 2013-06-13 23:19:04 -07:00
draw_nodes A problem of CCDrawNode::drawPolygon outline 2013-06-04 13:22:06 +08:00
effects Coordinates are already in terms of pixels -- no need to do content scaling 2013-05-17 17:08:46 -07:00
include issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
kazmath Support Tizen device. 2013-06-12 10:20:18 +09:00
keyboard_dispatcher check if delegate is not null when dispatching keyboard event 2013-06-10 00:54:31 +02:00
keypad_dispatcher Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
label_nodes issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
layers_scenes_transitions_nodes Adds CC prefix to CALLBACK() 2013-06-13 20:36:43 -07:00
menu_nodes issue #2284: initialize parameter as declared 2013-06-14 15:18:35 +08:00
misc_nodes Merge pull request #2521 from minggo/emscriptenate 2013-05-06 23:51:38 -07:00
particle_nodes Actions with clone() pattern 1/3 2013-06-13 17:25:14 -07:00
platform Merge pull request #2898 from pyrasis/tizen_2.1 2013-06-15 20:03:37 -07:00
proj.blackberry Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
proj.emscripten issue #2284: not treat using deprecated functions as error 2013-06-14 17:32:07 +08:00
proj.ios issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
proj.linux issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.mac issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
proj.marmalade 1. add Component struct. 2013-06-04 17:38:43 +08:00
proj.nacl issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.tizen Support Tizen device. 2013-06-12 10:20:18 +09:00
proj.win32 Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
script_support issue #2103 add cocosbuilder lua test sample 2013-06-05 15:51:29 +08:00
shaders on dealloc, log "this" with %p, not %x. 2013-06-05 18:21:05 -07:00
sprite_nodes Actions with clone() pattern 1/3 2013-06-13 17:25:14 -07:00
support Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
text_input_node Fixed GCC warning on narrowing conversion 2013-04-19 12:09:26 +04:00
textures Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-15 11:15:28 +08:00
tilemap_parallax_nodes issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +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 issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08: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 Adds setObject to CCConfiguration 2013-06-05 09:46:56 +08:00
CCConfiguration.h Adds setObject to CCConfiguration 2013-06-05 09:46:56 +08:00
CCDirector.cpp Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
CCDirector.h issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08: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 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
cocos2d.cpp MenuItemToggle is fixed 2013-06-05 17:51:40 -07:00