James Chen
|
3acdb327fb
|
Merge pull request #2760 from natural-law/develop
Add plugin weibo for iOS on branch develop
|
2013-06-04 20:23:26 -07:00 |
James Chen
|
b2c85ef360
|
Merge pull request #2761 from natural-law/master
Update the license in the sample code.
|
2013-06-04 20:21:55 -07:00 |
minggo
|
6491ff75cf
|
issue #2257: make ios template work
|
2013-06-05 11:21:04 +08:00 |
zhangbin
|
457942f05b
|
Update the license in the sample code.
|
2013-06-05 11:19:54 +08:00 |
zhangbin
|
f26530748a
|
Update the license in the sample code.
|
2013-06-05 11:19:17 +08:00 |
James Chen
|
ecffa01475
|
Merge pull request #2759 from natural-law/master
Add plugin weibo for iOS [master]
|
2013-06-04 20:00:34 -07:00 |
zhangbin
|
d947da8dce
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-06-05 10:32:44 +08:00 |
zhangbin
|
828158d009
|
Update the JS binding code of plugin.
|
2013-06-05 10:30:44 +08:00 |
zhangbin
|
b2ef2ac916
|
fixed #2254 : Add sample code for plugin weibo on iOS.
|
2013-06-05 10:30:44 +08:00 |
zhangbin
|
7b00055d9e
|
issue #2254 : Add plugin weibo for iOS.
|
2013-06-05 10:30:43 +08:00 |
zhangbin
|
4939ac1f14
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2013-06-05 10:25:56 +08:00 |
zhangbin
|
aa94056b5a
|
Update the JS binding code of plugin.
|
2013-06-05 10:25:19 +08:00 |
James Chen
|
669c4d22b6
|
Merge pull request #2758 from dumganhar/ricardoquesada-configuration_set_value-develop
Merge PR #2728 and minor fix.[develop]
|
2013-06-04 19:20:03 -07:00 |
James Chen
|
555e8e324d
|
Merge pull request #2757 from dumganhar/ricardoquesada-configuration_set_value-master
Merge PR #2728 and minor fix.[master]
|
2013-06-04 19:17:51 -07:00 |
zhangbin
|
ae7ff06e95
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2013-06-05 09:52:35 +08:00 |
James Chen
|
993070b27e
|
Minor fix in CCConfiguration.
|
2013-06-05 09:47:29 +08:00 |
Ricardo Quesada
|
d27da88c06
|
Adds setObject to CCConfiguration
also adds the test
Conflicts:
scripting/javascript/bindings/generated
|
2013-06-05 09:46:56 +08:00 |
James Chen
|
26219d4a14
|
Minor fix in CCConfiguration.
|
2013-06-05 09:41:03 +08:00 |
James Chen
|
2a16a6b17f
|
Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value
|
2013-06-05 09:36:53 +08:00 |
minggo
|
823cffb1d2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-06-05 09:30:08 +08:00 |
Ricardo Quesada
|
609801e900
|
compiles on linux and other machines without C99 support
|
2013-06-05 09:29:27 +08:00 |
Ricardo Quesada
|
4b37ec252a
|
Adds C++11 std::function<> support to MenuItem
Updates some of the tests
|
2013-06-04 18:29:26 -07:00 |
Ricardo Quesada
|
9b305a60d1
|
cc_timeval works on 64bit machines, like OS X
|
2013-06-05 09:29:12 +08:00 |
James Chen
|
0c76516a1a
|
Merge pull request #2744 from ricardoquesada/testmenu_sorted
Testmenu sorted
|
2013-06-04 18:27:08 -07:00 |
Ricardo Quesada
|
337f966d0f
|
It was using an clang extension for tuples<>
Instead of converting it to pairs<>, which is compatible with gcc,
I converted it to C structs.
|
2013-06-04 10:03:32 -07:00 |
Ricardo Quesada
|
f22092c7fc
|
Merge branch 'develop' into testmenu_sorted
|
2013-06-04 09:53:49 -07:00 |
loong0
|
886c704742
|
clear
|
2013-06-04 22:25:07 +08:00 |
loong0
|
c23267834b
|
smarter script for creating android project
|
2013-06-04 22:21:41 +08:00 |
James Chen
|
8a858f83d2
|
Merge pull request #2753 from dumganhar/master
[iOS] Fixing compilation errors for HelloLua.
|
2013-06-04 06:15:56 -07:00 |
david feng
|
9d9bc1f593
|
fix a library search path error
|
2013-06-04 21:13:08 +08:00 |
James Chen
|
ddbdb3e983
|
[iOS] Fixing compilation errors for HelloLua.
|
2013-06-04 21:11:44 +08:00 |
James Chen
|
2ee96f81e1
|
Merge pull request #2752 from dumganhar/template-fix-develop
Updating multi-platform-xxx template for iOS and Mac. [develop]
|
2013-06-04 05:57:38 -07:00 |
James Chen
|
bb635c280c
|
Updating multi-platform-xxx template for iOS and Android after enabling c++ 11.
|
2013-06-04 20:52:29 +08:00 |
James Chen
|
b88a222fc5
|
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 20:37:24 +08:00 |
James Chen
|
ce20c48b78
|
Merge pull request #2751 from dumganhar/template-fix-master
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 05:12:54 -07:00 |
James Chen
|
3b673547cc
|
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 19:49:03 +08:00 |
James Chen
|
ce2421779d
|
Merge pull request #2750 from CocosRobot/updategeneratedsubmodule_1370342158
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-04 04:23:32 -07:00 |
CocosRobot
|
0bc9c19e76
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-04 10:36:03 +00:00 |
zhangbin
|
17d0ea1c09
|
fixed #2254 : Add sample code for plugin weibo on iOS.
|
2013-06-04 18:32:42 +08:00 |
minggo
|
5ee6e9d982
|
Merge pull request #2749 from chengstory/master_Components
Master components
|
2013-06-04 03:31:42 -07:00 |
zhangbin
|
65dfb60442
|
issue #2254 : Add plugin weibo for iOS.
|
2013-06-04 18:31:42 +08:00 |
Sergey Shambir
|
f5b9b4580c
|
Enabled c++0x flag, use OpenAL audio backend by default.
|
2013-06-04 14:29:29 +04:00 |
chengstory
|
a5f8e2c27e
|
no message
|
2013-06-04 17:54:05 +08:00 |
chengstory
|
cfb424a6c9
|
1. add Component struct.
|
2013-06-04 17:38:43 +08:00 |
James Chen
|
d2648d6166
|
Merge pull request #2748 from dumganhar/iss2253-refactor-editbox-master
fixed #2253: [CCEditBox iOS] Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
|
2013-06-04 02:19:18 -07:00 |
James Chen
|
8874699cbb
|
Update AUTHORS [ci skip]
|
2013-06-04 17:17:04 +08:00 |
sunxiaoyu
|
d41a78453a
|
Update CCEditBoxImplIOS.mm
02c6647306
|
2013-06-04 17:16:45 +08:00 |
James Chen
|
c678664085
|
Update AUTHORS [ci skip]
|
2013-06-04 17:12:13 +08:00 |
James Chen
|
7b98808aa7
|
Merge pull request #2640 from sunxiaoyu/patch-1
fixed #2253: Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
|
2013-06-04 02:08:42 -07:00 |
René Klačan
|
f66e12f414
|
Merge pull request #4 from cocos2d/develop
pull request from main repo
|
2013-06-04 02:05:36 -07:00 |