Sam Clegg
|
ab1243e8dd
|
[NaCl] Disable http tests under NaCl
|
2013-06-20 10:56:26 -07:00 |
Sam Clegg
|
3686e8245f
|
[NaCl] Fix sigslot.h compilation on NaCl ARM
|
2013-06-20 10:54:11 -07:00 |
James Chen
|
9ac7088664
|
Merge pull request #2954 from dumganhar/develop
closed #2315: [JSB] Iterating through cc.Node children causes crash.
|
2013-06-20 07:53:42 -07:00 |
James Chen
|
8b9090eb55
|
fixed #2315: [JSB] Iterating through cc.Node children causes crash.
|
2013-06-20 22:51:54 +08:00 |
samuele3hu
|
71fe43ee97
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
|
2013-06-20 22:40:21 +08:00 |
samuele3hu
|
15c69563e2
|
issue #2276: Add ScrollView lua binding and test sample
|
2013-06-20 22:39:30 +08:00 |
James Chen
|
032c07b735
|
Merge pull request #2953 from dumganhar/develop
issue #2129: Removing CC prefix for template.
|
2013-06-20 07:22:04 -07:00 |
James Chen
|
d1bd34fd08
|
issue #2129: Removing CC prefix for template.
|
2013-06-20 22:18:43 +08:00 |
James Chen
|
de0e683014
|
Merge pull request #2949 from dumganhar/develop
Bug fixes for the tool to generate luabindings.
|
2013-06-20 05:56:50 -07:00 |
James Chen
|
2ceec2f65d
|
Merge pull request #2947 from pyrasis/tizen_2.1
[Tizen] Fix compile error
|
2013-06-20 04:58:21 -07:00 |
James Chen
|
1b66a98390
|
Bug fixes for the tool to generate luabindings.
|
2013-06-20 19:00:23 +08:00 |
Lee, Jae-Hong
|
2f8b24d05c
|
Fix compile error.
|
2013-06-20 19:20:27 +09:00 |
James Chen
|
358cbde2a1
|
Merge pull request #2946 from dumganhar/develop
Compilation Fixes for WIN32
|
2013-06-20 03:05:13 -07:00 |
James Chen
|
8b2b95ab4d
|
[WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object
|
2013-06-20 18:02:37 +08:00 |
James Chen
|
6ce5064f32
|
[WIN32] NULL --> nullptr for CCLayer.cpp.
|
2013-06-20 18:01:53 +08:00 |
James Chen
|
a90f51d03a
|
Merge branch 'develop' of z:/Project/cocos2d-x into develop
|
2013-06-20 17:38:23 +08:00 |
James Chen
|
b37fbfdcc8
|
Merge pull request #2939 from growingdever/patch-3
Update create_project.py
|
2013-06-20 01:45:23 -07:00 |
James Chen
|
c99d39ec36
|
Merge pull request #2943 from CocosRobot/updategeneratedsubmodule_1371716731
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-20 01:38:50 -07:00 |
James Chen
|
d2199e85a9
|
Merge pull request #2944 from dumganhar/iss2129-format-codes3
issue #2129: Removing CC prefix and renaming member variables for plugin module.
|
2013-06-20 01:37:49 -07:00 |
James Chen
|
6d60a77622
|
issue #2129: Renaming variables.
|
2013-06-20 16:31:12 +08:00 |
James Chen
|
c2f0bcf167
|
issue #2129: Warning fix in PluginUtils.h
|
2013-06-20 16:28:20 +08:00 |
James Chen
|
f3d08a8b4e
|
issue #2129: Renaming member variables for plugin, m_XXX --> _XXX.
|
2013-06-20 16:27:50 +08:00 |
CocosRobot
|
e651c40d66
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-20 08:25:36 +00:00 |
James Chen
|
d79ecd038c
|
Merge pull request #2942 from dumganhar/iss2129-format-codes3
closed #2129: Removing CC prefix to make cocos2d-x more CPP friendly.
|
2013-06-20 01:19:49 -07:00 |
James Chen
|
e280815cfe
|
issue #2129: Removing CC prefix for plugin module.
|
2013-06-20 16:02:39 +08:00 |
James Chen
|
36d82c9384
|
closed #2129: Updating LuaCocos2d.cpp.
|
2013-06-20 15:10:44 +08:00 |
James Chen
|
150394d648
|
issue #2129: Compatible with old class name exported to LUA, I mean keeping CC prefix for luabinding.
|
2013-06-20 15:10:14 +08:00 |
James Chen
|
14b07af56c
|
issue #2129: CC_Reader --> _Reader.
|
2013-06-20 15:08:22 +08:00 |
minggo
|
9caa40590a
|
Merge pull request #2941 from minggo/iss2304-refator-cclayer
fix a crash on android
|
2013-06-20 00:06:55 -07:00 |
minggo
|
e39df16d49
|
use correct pointer to be closed
|
2013-06-20 15:03:51 +08:00 |
James Chen
|
9cbf513c9e
|
issue #2129: jsb_CCXXX --> jsb_XXX
|
2013-06-20 14:58:33 +08:00 |
James Chen
|
da6af26cd8
|
issue #2129: Updating cocos2dx.ini.
|
2013-06-20 14:58:01 +08:00 |
James Chen
|
73c167d1b2
|
issue #2129: Updating submodule of bindings-generator.
|
2013-06-20 14:56:33 +08:00 |
James Chen
|
865263d3a8
|
Merge pull request #2940 from growingdever/patch-4
Update .gitignore
|
2013-06-19 23:53:32 -07:00 |
growingdever
|
6b826bba69
|
Update .gitignore
it didn't work normally. (grammar mistake.)
|
2013-06-20 15:41:34 +09:00 |
James Chen
|
ba1fe39d91
|
issue #2129: Removing CC prefix for scripting module.
|
2013-06-20 14:33:59 +08:00 |
James Chen
|
c7456af00e
|
issue #2129: Updating tojs/cocos2d.ini and tojs/cocos2dx_extension.ini.
|
2013-06-20 14:24:36 +08:00 |
James Chen
|
1fb9f44d15
|
issue #2129: Removing CC prefix for samples module.
|
2013-06-20 14:17:10 +08:00 |
James Chen
|
cb67ed0227
|
issue #2129: Removing CC prefix for extension module.
|
2013-06-20 14:15:53 +08:00 |
James Chen
|
93b6328303
|
issue #2129: Removing CC prefix for cocos2dx module.
|
2013-06-20 14:13:12 +08:00 |
James Chen
|
0a0bada9c2
|
issue #2129: Removing CC prefix for CocosDenshion module.
|
2013-06-20 14:12:43 +08:00 |
James Chen
|
31cbc0cbf8
|
issue #2129: [TestCpp] A typo fix.
|
2013-06-20 14:08:22 +08:00 |
James Chen
|
74048d7eec
|
issue #2129: [TestCpp] Renaming some class name to avoid conflicts after removing CC prefix.
|
2013-06-20 14:04:44 +08:00 |
James Chen
|
e3ed28a8fb
|
issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*.
|
2013-06-20 14:02:14 +08:00 |
James Chen
|
b55a0dee2b
|
issue #2129: using cocos2d::extension::armature namespace for Armature extension.
|
2013-06-20 13:48:43 +08:00 |
James Chen
|
7ce6ef04f8
|
issue #2129: [TestCpp] LayerGradient --> LayerGradientTest, TexturePVR --> TexturePVRTest.
|
2013-06-20 13:43:40 +08:00 |
James Chen
|
e281fdfa73
|
issue #2129: Renaming EditBoxImplIOS to EditBoxImplIOS_objc since it will be conflict with CCEditBoxImplIOS after removing CC prefix.
|
2013-06-20 13:07:09 +08:00 |
James Chen
|
b60e891b09
|
issue #2129: Don't use CGPoint in chipmunk since we are using cocos2d-x rather than cocos2d-iphone.
|
2013-06-20 13:02:20 +08:00 |
James Chen
|
78a5dff06d
|
issue #2129: Resetting the namespace of armature to 'cocos2d::extension::armature'.
|
2013-06-20 12:59:32 +08:00 |
James Chen
|
136a9743d4
|
issue #2129: [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones.
|
2013-06-20 12:56:51 +08:00 |