James Chen
|
a73991dcc1
|
Merge pull request #4685 from dumganhar/develop
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
|
2013-12-26 06:03:11 -08:00 |
James Chen
|
a8d93ddf72
|
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
|
2013-12-26 21:49:40 +08:00 |
CaiWenzhi
|
26a7f3474c
|
Modify reader
|
2013-12-26 21:02:47 +08:00 |
CaiWenzhi
|
a8ab58d8d8
|
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
|
2013-12-26 20:32:50 +08:00 |
James Chen
|
93ed5a4f0f
|
long --> ssize_t for TableView callback.
|
2013-12-26 04:09:24 -08:00 |
CaiWenzhi
|
ad535e2fcb
|
Add listview and pageview reader
|
2013-12-26 17:53:22 +08:00 |
CaiWenzhi
|
f0eb5d28c1
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
|
2013-12-26 17:32:08 +08:00 |
CocosRobot
|
50a379b8f0
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 09:04:04 +00:00 |
CaiWenzhi
|
3206727b9c
|
Modify actionnode
|
2013-12-26 17:01:31 +08:00 |
CaiWenzhi
|
a2e873d12a
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
|
2013-12-26 16:45:48 +08:00 |
CocosRobot
|
09996ea82c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 08:20:26 +00:00 |
CaiWenzhi
|
7b6e022388
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
|
2013-12-26 16:19:12 +08:00 |
CaiWenzhi
|
067af2fb93
|
optimize loop
|
2013-12-26 16:17:52 +08:00 |
James Chen
|
5dfb7f321a
|
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
|
2013-12-26 16:03:30 +08:00 |
CaiWenzhi
|
530f82ee27
|
Add refresh layout method
|
2013-12-26 14:57:30 +08:00 |
CaiWenzhi
|
946dab0b34
|
Modify android mk
|
2013-12-26 12:23:58 +08:00 |
CaiWenzhi
|
b1d2aa9b79
|
Modify CMakeList
|
2013-12-26 11:25:49 +08:00 |
CaiWenzhi
|
581678b6b0
|
Modify android mk
|
2013-12-26 11:06:10 +08:00 |
CocosRobot
|
e6727ea087
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 02:50:37 +00:00 |
CaiWenzhi
|
eaef723bd7
|
Remove C cast
|
2013-12-25 22:13:19 +08:00 |
CaiWenzhi
|
8299e4c494
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 22:05:21 +08:00 |
CocosRobot
|
6492f61691
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 10:34:46 +00:00 |
CaiWenzhi
|
96279c12dc
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 18:32:15 +08:00 |
CaiWenzhi
|
c516860017
|
Fixed bugs about color and opacity
|
2013-12-25 18:30:21 +08:00 |
samuele3hu
|
7c3978bdd8
|
Add missing file for linux lua binding
|
2013-12-25 17:42:59 +08:00 |
CaiWenzhi
|
570b6c95a7
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 17:29:30 +08:00 |
samuele3hu
|
a2c5881699
|
Add include_directories for spine
|
2013-12-25 17:22:14 +08:00 |
samuele3hu
|
1075a711e0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 16:58:19 +08:00 |
samuele3hu
|
9cf45a292b
|
Delete some annotated statement about spine and add some reserve manual lua binding functions
|
2013-12-25 16:42:40 +08:00 |
James Chen
|
142b189305
|
Some warning fixes.
|
2013-12-25 16:06:39 +08:00 |
CocosRobot
|
c71cd5a407
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 06:39:38 +00:00 |
James Chen
|
55b0ef85d8
|
Merge pull request #4631 from boyu0/const_char_star_to_std_string
Change const char* to const std::string&
|
2013-12-24 22:34:34 -08:00 |
boyu0
|
2c2953abc1
|
change “string.compare()” to “==“
|
2013-12-25 14:20:37 +08:00 |
boyu0
|
f2e18f32a9
|
fix android compile error
|
2013-12-25 13:57:17 +08:00 |
samuele3hu
|
9fd64df099
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 13:48:10 +08:00 |
samuele3hu
|
45cfe00ec4
|
Modify iOS project set and some manual lua binding
|
2013-12-25 13:47:22 +08:00 |
CocosRobot
|
9aa48cac37
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 03:49:23 +00:00 |
James Chen
|
538da31773
|
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
|
2013-12-25 11:18:14 +08:00 |
James Chen
|
6fce4f9061
|
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
|
2013-12-25 11:00:51 +08:00 |
boyu0
|
62fc889a54
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
cocos/2d/platform/CCFileUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCImageCommon_cpp.h
cocos/2d/platform/CCSAXParser.cpp
cocos/2d/platform/CCSAXParser.h
|
2013-12-25 10:41:37 +08:00 |
CaiWenzhi
|
2ae8576e0f
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 10:40:05 +08:00 |
CaiWenzhi
|
0dac69523c
|
Remove "_renderer" from widget
|
2013-12-24 20:22:14 +08:00 |
James Chen
|
17a6dbebb6
|
Compilation error fixes.
|
2013-12-24 19:05:35 +08:00 |
James Chen
|
1f5611ae05
|
Adds missing ‘)’.
|
2013-12-24 18:23:36 +08:00 |
James Chen
|
0ff85852cc
|
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
|
2013-12-24 18:08:40 +08:00 |
James Chen
|
f664a72d6e
|
Merge pull request #4635 from dabingnn/develop_FixClippingNodeBug
fix clippingNode bug
|
2013-12-24 01:50:51 -08:00 |
Huabing.Xu
|
b6dc3d0371
|
fix clippingNode bug
|
2013-12-24 17:16:28 +08:00 |
CocosRobot
|
c3b7406b43
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 09:00:04 +00:00 |
James Chen
|
81d073aff0
|
Reverts FileUtil::getFileData to virtual function.
|
2013-12-24 16:29:55 +08:00 |
James Chen
|
d33b2c41c7
|
Merge branch 'develop' into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-24 16:24:17 +08:00 |