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 92f278657e Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 		2013-03-25 11:46:02 +08:00
..
actions Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
base_nodes fixed #1837: Refactoring schedule binding codes. 2013-03-18 15:29:53 +08:00
cocoa Add CCSet::create() to create, autorelease and return a new empty set. 2013-03-13 10:58:24 -07:00
draw_nodes issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
effects issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
include issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
kazmath Add new port: Native Client 2013-03-02 12:15:24 -08:00
keypad_dispatcher Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
label_nodes fix a logic error and a memory leak in CCLabelBMFont. 2013-03-20 13:55:43 +08:00
layers_scenes_transitions_nodes Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
menu_nodes issue #1686:synchronize CCMenu.cpp 2013-02-28 10:15:09 +08:00
misc_nodes Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
particle_nodes Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x 2013-03-25 11:46:02 +08:00
platform - changed cocos2d mac project to support universal build and x86 2013-03-23 16:04:51 +00:00
proj.blackberry issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
proj.ios fixed #1830: Using JS::CompileOptions::setUTF8(true) to compile script. 2013-03-13 18:10:54 +08:00
proj.linux Fix warning in linux build. 2013-03-12 16:59:22 -07:00
proj.mac - changed cocos2d mac project to support universal build and x86 2013-03-23 16:04:51 +00:00
proj.marmalade issue #1529:modify marmalade and native client project configuration 2013-03-07 09:51:26 +08:00
proj.nacl Fix warning in linux build. 2013-03-12 16:59:22 -07:00
proj.win32 issue #1529:add user_default into vs2010 project 2013-03-07 10:31:01 +08:00
script_support add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
shaders Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
sprite_nodes Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
support issue #1529:CCUserDefault work ok on Android 2013-03-11 16:45:20 +08:00
text_input_node fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
textures Fix linux compilation of CCTexturePVR.cpp 2013-03-22 10:40:35 -07:00
tilemap_parallax_nodes Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -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 #1529:CCUserDefault supports default value on iOS 2013-03-11 14:45:07 +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 Fix all compiler warnings produced by gcc. 2013-03-05 17:01:00 -08:00
CCConfiguration.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCDirector.cpp Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime 2013-03-12 19:38:57 -07:00
CCDirector.h Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime 2013-03-12 19:38:57 -07:00
CCScheduler.cpp fixed #1837: Refactoring schedule binding codes. 2013-03-18 15:29:53 +08:00
CCScheduler.h issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
ccFPSImages.c.REMOVED.git-id issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
ccFPSImages.h issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
cocos2d.cpp modify version 2013-03-18 11:25:27 +08:00