Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 		2012-07-23 22:49:11 +08:00
..
actions fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
base_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
cocoa fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
effects fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
include Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08:00
kazmath fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
keypad_dispatcher add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
label_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
layers_scenes_transitions_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
menu_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
misc_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
particle_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
platform fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
proj.ios issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
proj.win32 issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
script_support add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
shaders Fixes a few Xcode 4.5-specific error messages. 2012-07-08 22:37:19 -07:00
sprite_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
support fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
text_input_node add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
textures fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
tilemap_parallax_nodes fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
touch_dispatcher fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
Android.mk issue #1399: Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System. 2012-07-21 13:49:20 +08:00
CCCamera.cpp issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
CCCamera.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCConfiguration.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCConfiguration.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCDirector.cpp issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
CCDirector.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCDrawingPrimitives.cpp fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
CCDrawingPrimitives.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCScheduler.cpp fixed #1402, résolve conflicting "create" functions 2012-07-23 22:49:11 +08:00
CCScheduler.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
cocos2d.cpp modify cocos2d-x version 2012-06-26 15:37:47 +08:00