samuele3hu
|
a6e514f3d5
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
|
2013-07-27 00:36:20 +08:00 |
samuele3hu
|
016593bd0e
|
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
|
2013-07-27 00:28:06 +08:00 |
James Chen
|
db61ebef0f
|
Merge pull request #3281 from CocosRobot/updategeneratedsubmodule_1374852122
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-26 08:24:55 -07:00 |
CocosRobot
|
7a0e765a39
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-26 15:22:06 +00:00 |
James Chen
|
b313ec43fc
|
Merge pull request #3239 from samuele3hu/TestSample
issue #2429:LuaWebSocket supports sending binary string passed by lua
|
2013-07-26 08:00:52 -07:00 |
James Chen
|
04077e312e
|
Merge pull request #3280 from dumganhar/minggo-iss2430-modify_enum
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3270, move enum into class and using enum class
|
2013-07-26 07:58:39 -07:00 |
James Chen
|
387ae822b1
|
issue #2430: Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp
|
2013-07-26 22:57:15 +08:00 |
samuele3hu
|
18819c00ec
|
issue #2429:Replace table with spaces
|
2013-07-26 22:56:42 +08:00 |
James Chen
|
58a3560bca
|
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
|
2013-07-26 22:55:41 +08:00 |
samuele3hu
|
bc83304e23
|
issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function
|
2013-07-26 22:50:45 +08:00 |
James Chen
|
19d9c08c79
|
issue #2430: Fixing compilation errors for lua and js bindings.
|
2013-07-26 22:15:30 +08:00 |
samuele3hu
|
70fcf47a3e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
|
2013-07-26 21:39:34 +08:00 |
James Chen
|
2bfccb4a43
|
A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType
|
2013-07-26 21:36:32 +08:00 |
James Chen
|
dc7fcce0fe
|
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2013-07-26 21:22:16 +08:00 |
James Chen
|
fe3f953493
|
Merge pull request #3278 from CocosRobot/updategeneratedsubmodule_1374842827
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-26 05:53:04 -07:00 |
James Chen
|
f144df7f45
|
Update AUTHORS [ci skip]
|
2013-07-26 20:49:59 +08:00 |
James Chen
|
6c2e6e8cb0
|
Merge pull request #3253 from metalbass/patch-3
Added virtual destructors to some interfaces to fix issue 3095
|
2013-07-26 05:47:35 -07:00 |
CocosRobot
|
e9b32f1f0c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-26 12:47:22 +00:00 |
James Chen
|
a73a4b9837
|
Merge pull request #3276 from dumganhar/constants-refactor
Enumeration refactoring
|
2013-07-26 05:36:16 -07:00 |
James Chen
|
0dce6d9cf3
|
Merge pull request #3227 from azmeuk/file-utils
Added some guards in file utils
|
2013-07-26 05:31:02 -07:00 |
James Chen
|
c9def73930
|
Application::Platform::OS_MACOS --> Application::Platform::OS_MAC.
|
2013-07-26 20:24:33 +08:00 |
Éloi Rivard
|
95b826d82a
|
Fixed a bug in emscripten file utils.
|
2013-07-26 14:19:47 +02:00 |
Éloi Rivard
|
3ffc026c6c
|
Added some guards in file utils.
|
2013-07-26 14:19:20 +02:00 |
James Chen
|
9b6d3e6090
|
ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT
|
2013-07-26 20:07:41 +08:00 |
James Chen
|
0ae5ea334f
|
Merge pull request #3277 from CocosRobot/updategeneratedsubmodule_1374834840
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-26 05:00:49 -07:00 |
James Chen
|
49c727e122
|
Updating LuaCocos2d.cpp
|
2013-07-26 19:57:22 +08:00 |
James Chen
|
3bc45e665c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2013-07-26 19:56:04 +08:00 |
James Chen
|
7d9d799194
|
issue #2430: Fixing a typo.
|
2013-07-26 19:54:44 +08:00 |
CocosRobot
|
9fb6d032ca
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-26 10:34:03 +00:00 |
James Chen
|
1122432f80
|
Merge pull request #3268 from samuele3hu/deprectedOperator
issue #2404:replace deprecated functions in testlua and hellolua sample
|
2013-07-26 03:27:09 -07:00 |
James Chen
|
e16a5f469b
|
issue #2430: Refactoring enum 'ResolutionPolicy'.
|
2013-07-26 18:18:58 +08:00 |
James Chen
|
2f8d3587bd
|
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
|
2013-07-26 18:17:30 +08:00 |
minggo
|
3cb40b36e4
|
issue #2430:fix some errors
|
2013-07-26 18:07:40 +08:00 |
minggo
|
859da78499
|
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
|
2013-07-26 17:47:52 +08:00 |
minggo
|
7817dd6c0f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
|
2013-07-26 17:45:24 +08:00 |
minggo
|
a7c1904eb8
|
issue #2430:move EditBox enum into class
|
2013-07-26 17:45:01 +08:00 |
James Chen
|
ad1d8b667d
|
enum class for LanguageType, Application::Platform
|
2013-07-26 17:29:06 +08:00 |
James Chen
|
54ab99bf74
|
enum class for ProgressTimer::type
|
2013-07-26 17:28:18 +08:00 |
James Chen
|
6ff6aa20b1
|
Merge pull request #3271 from natural-law/develop
Update class ProtocolAds to compatible with more Ads SDKs.
|
2013-07-26 02:23:48 -07:00 |
minggo
|
0b3ed85914
|
issue #2430:fix some compiling error
|
2013-07-26 16:43:40 +08:00 |
zhangbin
|
f847bf4757
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-07-26 16:11:11 +08:00 |
zhangbin
|
4ea5d0509f
|
Update the JS binding for the change of class ProtocolAds.
|
2013-07-26 16:07:30 +08:00 |
minggo
|
bafc01c2aa
|
issue 2430:fix a compiling error and add missing cpp
|
2013-07-26 15:55:12 +08:00 |
zhangbin
|
bbe649812a
|
Update class ProtocolAds to compatible with more Ads SDKs.
|
2013-07-26 15:51:06 +08:00 |
minggo
|
0870581623
|
fix warnings
|
2013-07-26 15:22:45 +08:00 |
samuele3hu
|
6b9c7d4ade
|
issue #2404:modify a function name to isSwallowsTouches()
|
2013-07-26 15:21:19 +08:00 |
samuele3hu
|
fae8e253c0
|
issue #2404:Modify tab to spaces
|
2013-07-26 15:06:35 +08:00 |
samuele3hu
|
b6256be1ad
|
issue #2404:del a deprecated func
|
2013-07-26 15:01:31 +08:00 |
minggo
|
f55d73194e
|
issue 2430:use enum class for Control enum values
|
2013-07-26 14:37:26 +08:00 |
samuele3hu
|
0f8d10f9a7
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
|
2013-07-26 14:36:50 +08:00 |