Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
samuele3hu 80a6811f9f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
..
actions closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
base_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
cocoa closed #2393:fix a compiling error 2013-07-12 18:25:36 +08:00
draw_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
effects closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
include closed #2393: fix conflicts 2013-07-12 18:04:32 +08: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 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
layers_scenes_transitions_nodes Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
menu_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
misc_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
particle_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
platform Merge pull request #3140 from minggo/iss2393-mark_deprecated 2013-07-12 08:59:27 -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 Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02: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 #2379: Removing CCZone.cpp for Makefile. 2013-07-09 15:31:28 +08:00
proj.tizen Support Tizen 2.2 SDK. 2013-07-10 13:04:08 +09:00
proj.win32 issue #2379: Removing CCZone.cpp/.h for win32 project. 2013-07-09 15:42:37 +08:00
script_support issue #2377:add scriptHandlerMgr and modify ActionManager.lua 2013-07-10 15:04:00 +08:00
shaders getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
sprite_nodes Merge pull request #3140 from minggo/iss2393-mark_deprecated 2013-07-12 08:59:27 -07:00
support Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
text_input_node getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
textures closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
tilemap_parallax_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
touch_dispatcher closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
Android.mk issue #2379: Removing CCZone.cpp for Makefile. 2013-07-09 15:31:28 +08:00
CCCamera.cpp Adds const to more getters 2013-07-06 22:01:21 -07:00
CCCamera.h Adds const to more getters 2013-07-06 22:01:21 -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 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
CCDirector.h getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCScheduler.cpp getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCScheduler.h Adds const to more getters 2013-07-06 22:01:21 -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