minggo
|
87125e4b2a
|
issue #2129:use capital words for static const member variables
|
2013-07-08 18:11:32 +08:00 |
James Chen
|
d0b7b403b9
|
Merge pull request #3096 from CocosRobot/updategeneratedsubmodule_1373270989
[ci skip] [AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-08 01:16:01 -07:00 |
CocosRobot
|
bff888507a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-08 08:10:07 +00:00 |
minggo
|
cd1801d324
|
Merge pull request #3085 from minggo/iss2129-remove_prefix
issue #2129:remove prefix of types in ccTypes.h
|
2013-07-08 01:03:29 -07:00 |
minggo
|
cf96ec079e
|
Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix
Bug fixes. Please see the commits for details.
|
2013-07-08 00:40:23 -07:00 |
James Chen
|
962207a48a
|
Adding some logs in travis script.
|
2013-07-08 15:27:49 +08:00 |
James Chen
|
466a64ba05
|
issue #2129: Updating bindings-generator.
|
2013-07-08 15:25:04 +08:00 |
James Chen
|
c07eda8894
|
issue #2129: Updating cocos2dx.ini.
|
2013-07-08 15:19:46 +08:00 |
James Chen
|
7a7d451acf
|
issue #2129: Reverting changes in cocos2d_specifics.cpp
|
2013-07-08 15:19:26 +08:00 |
James Chen
|
17e1b65646
|
issue #2129: Adding 'FontDefinition_to_jsval' and reverting some changes.
|
2013-07-08 15:18:57 +08:00 |
James Chen
|
d64fb7339c
|
issue #2129: FontDefinition* --> const FontDefinition&
|
2013-07-08 15:18:16 +08:00 |
James Chen
|
fe2a3c3d69
|
issue #2129: Using 'const FontDefinition&' instead of 'FontDefinition*' and resolving memory leak in FontDefinition LabelTTF::getTextDefinition()
|
2013-07-08 15:17:37 +08:00 |
James Chen
|
16ec50e86b
|
issue #2129: Adding explicit for 'Color4B(const Color4F &color4F);' and 'explicit Color4F(const Color3B &color3B)'.
|
2013-07-08 15:16:22 +08:00 |
James Chen
|
4a0fe35d5a
|
iss2129: bug fix in CCDrawNode.cpp
|
2013-07-08 15:15:22 +08:00 |
James Chen
|
37f9c4415a
|
vertex --> getVertex, originalVertex --> getOriginVertex.
|
2013-07-08 15:12:06 +08:00 |
James Chen
|
3d4005ebbc
|
issue #2129: Bug fix in "Color4B::Color4B(const Color4F &color4F)".
|
2013-07-08 14:53:47 +08:00 |
minggo
|
b39e7e205f
|
issue #2129:modify pkg files
|
2013-07-08 11:34:31 +08:00 |
James Chen
|
1eacab0278
|
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
|
2013-07-08 10:51:07 +08:00 |
James Chen
|
4f5c5b20c8
|
Merge pull request #3092 from ricardoquesada/more_const_love
issue #2373: Adds const to more getters
|
2013-07-07 19:45:43 -07:00 |
minggo
|
b9f36f042b
|
Merge pull request #10 from dumganhar/minggo-iss2129-remove_prefix2
issue #2129: Windows doesn't support 'initializer list', using constructor instead.
|
2013-07-07 19:03:36 -07:00 |
James Chen
|
e28cf8d258
|
issue #2129: Windows doesn't support 'initializer list', using constructor instead.
|
2013-07-07 21:08:14 +08:00 |
Ricardo Quesada
|
c65b6f1417
|
Adds const to more getters
adds `const` to more getters.
|
2013-07-06 22:01:21 -07:00 |
James Chen
|
db0a15b02f
|
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
|
2013-07-06 15:19:09 +08:00 |
James Chen
|
d71db1d582
|
Update AUTHORS [ci skip]
|
2013-07-06 15:12:48 +08:00 |
James Chen
|
9743161463
|
Merge pull request #3084 from azmeuk/openal-linux
Fixed linux compilation bug in eclipse
|
2013-07-06 00:10:46 -07:00 |
James Chen
|
ad88bf5e54
|
Merge pull request #3086 from natural-law/develop
Support more ABI types in plugin.
|
2013-07-05 19:57:07 -07:00 |
James Chen
|
8535448a6f
|
Merge pull request #3090 from dumganhar/develop
[Windows] Fixing complication errors for WINDOWS.
|
2013-07-05 19:53:20 -07:00 |
James Chen
|
43260a2bf1
|
[Windows] Fixing complication errors for WINDOWS.
|
2013-07-06 10:49:13 +08:00 |
minggo
|
5ff7baf126
|
update to latest branch
|
2013-07-05 17:53:39 +08:00 |
minggo
|
dfde41b932
|
issue #2129:fix conflicts
|
2013-07-05 17:32:50 +08:00 |
zhangbin
|
baf72b7e46
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-07-05 17:26:53 +08:00 |
zhangbin
|
7e015867ad
|
closed #2330, Support more ABI types in plugin.
|
2013-07-05 17:26:07 +08:00 |
minggo
|
04465622b7
|
issue #2129:remove prefix of types in ccTypes.h
|
2013-07-05 16:49:22 +08:00 |
minggo
|
7e56bb57c8
|
Merge pull request #3076 from samuele3hu/execDev
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
|
2013-07-05 01:32:06 -07:00 |
Éloi Rivard
|
6354b7e9c3
|
Fixed linux compilation bug in eclipse
|
2013-07-05 10:28:06 +02:00 |
samuele3hu
|
ec2f5376f1
|
issue #2244:Add namespace to some enums
|
2013-07-05 16:05:38 +08:00 |
James Chen
|
4838f0f39c
|
Merge pull request #3081 from dumganhar/iss2368-js-test-url
issue #2368: JS-Test repo needs to use the URL of cocos2d/cocos2d-js-tests
|
2013-07-05 00:36:42 -07:00 |
James Chen
|
47c28c43c9
|
Updating auto jsbindings glue codes.
|
2013-07-05 15:34:45 +08:00 |
James Chen
|
a996b878cd
|
issue #2368: Updating JS-test.
|
2013-07-05 15:30:33 +08:00 |
James Chen
|
d6da357795
|
issue #2368: Using cocos2d/cocos2d-js-tests.git as the submodule.
|
2013-07-05 15:30:12 +08:00 |
James Chen
|
fcc02d476c
|
Updating AppDelegate.cpp
|
2013-07-05 15:24:29 +08:00 |
James Chen
|
e03091f934
|
Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture.
|
2013-07-05 15:18:04 +08:00 |
James Chen
|
6dffa99e32
|
Merge pull request #3080 from dumganhar/iss2373-const
Adding missing overload const getter functions.
|
2013-07-05 00:13:55 -07:00 |
James Chen
|
268245635d
|
issue #2373: Fixing a bug in CardinalSplineTo::clone function. this->_points needs to be cloned.
|
2013-07-05 15:08:52 +08:00 |
James Chen
|
ec902c3550
|
issue #2373: Adding missing overload const getter functions.
|
2013-07-05 15:08:52 +08:00 |
James Chen
|
d2746bbe90
|
issue #2373: Removing inline for virtual function. Adding more const getter functions.
|
2013-07-05 15:08:52 +08:00 |
James Chen
|
9d2152b513
|
sudo apt-get update before install new packages
|
2013-07-05 13:45:37 +08:00 |
minggo
|
12bc534475
|
Merge pull request #3079 from dabingnn/Issue-2367-ClippingNodes-Bug
issue #2367: Fix Bug "ClippingNodes work different in Android and IOS"
|
2013-07-04 22:42:03 -07:00 |
James Chen
|
76bbef97ce
|
Merge pull request #3078 from natural-law/develop
Add online IAP feature in plugins : uc, nd91 & qh360.
|
2013-07-04 22:40:41 -07:00 |
Huabing.Xu
|
7a61ead598
|
issue #2367: Fix Bug "ClippingNodes work different in Android and IOS"
|
2013-07-05 11:59:46 +08:00 |