minggo
|
9ab2dae212
|
Merge pull request #6635 from dumganhar/iss4660-unicode
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
|
2014-05-12 17:57:25 +08:00 |
James Chen
|
8115b09d29
|
Adds config.json for runtime
|
2014-05-12 17:55:57 +08:00 |
James Chen
|
5dc69026ac
|
Updates download-deps.py to support download several files.
|
2014-05-12 17:53:51 +08:00 |
minggo
|
cbf2629bf0
|
[ci skip]
|
2014-05-12 16:54:18 +08:00 |
minggo
|
70267bc4ed
|
[ci skip]
|
2014-05-12 16:53:12 +08:00 |
minggo
|
01db66c855
|
Merge pull request #6658 from asmodehn/asmo_newv3
Added SDK / NDK detection based on PATH - tested on Linux only
|
2014-05-12 16:51:02 +08:00 |
minggo
|
2d468b055f
|
Merge pull request #6679 from CocosRobot/update_cocosfiles_1399882304
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 16:29:32 +08:00 |
minggo
|
5c0fb8e80b
|
Merge pull request #6680 from CocosRobot/update_lua_bindings_1399882383
[AUTO]: updating luabinding automatically
|
2014-05-12 16:29:07 +08:00 |
CocosRobot
|
16b31e3157
|
[AUTO]: updating luabinding automatically
|
2014-05-12 08:14:14 +00:00 |
CocosRobot
|
18e8f1bdae
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 08:11:46 +00:00 |
minggo
|
f290d4d3ff
|
Merge pull request #6632 from andyque/refactor5057
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
|
2014-05-12 16:10:21 +08:00 |
andyque
|
9a8c87601c
|
Merge branch 'v3' into refactor5057
|
2014-05-12 15:52:47 +08:00 |
minggo
|
ed7f27665a
|
Merge pull request #6678 from Dhilan007/v3
fixed compile fail on android.
|
2014-05-12 15:31:28 +08:00 |
Dhilan007
|
64b2562e1f
|
fixed compile fail on android.
|
2014-05-12 15:22:57 +08:00 |
andyque
|
da3e794631
|
issue #5057, convert const char* to std::string&
|
2014-05-12 14:59:00 +08:00 |
James Chen
|
d8b913dcd8
|
Merge pull request #30 from Dhilan007/iss4660
Label:fixed wrong logic of alignment.
|
2014-05-12 14:39:14 +08:00 |
Dhilan007
|
fc72dc040d
|
Label:fixed wrong logic of alignment.
|
2014-05-12 14:34:25 +08:00 |
andyque
|
56f417c520
|
issue #5057, fix windows compile error
|
2014-05-12 14:11:44 +08:00 |
minggo
|
f5055548ac
|
[ci skip]
|
2014-05-12 14:00:11 +08:00 |
minggo
|
94f50b1856
|
Merge pull request #6535 from dumganhar/value-optimize
closed #5099: Optimization for Value
|
2014-05-12 13:57:50 +08:00 |
andyque
|
8232b98525
|
issue #5057, fix android compile error
|
2014-05-12 13:54:30 +08:00 |
James Chen
|
a126433bdd
|
Merge pull request #6677 from CocosRobot/update_lua_bindings_1399873414
[AUTO]: updating luabinding automatically
|
2014-05-12 13:45:22 +08:00 |
CocosRobot
|
5c735e5277
|
[AUTO]: updating luabinding automatically
|
2014-05-12 05:44:32 +00:00 |
minggo
|
8ceb26532a
|
[ci skip]
|
2014-05-12 13:43:47 +08:00 |
minggo
|
b23056537b
|
Merge pull request #6602 from minggo/remove-unneeded-codes
remove unneeded codes
|
2014-05-12 13:41:12 +08:00 |
andyque
|
b735ce3ffc
|
issue #5057, fix andriod and linux compile
|
2014-05-12 11:55:00 +08:00 |
andyque
|
9d7d06a1f8
|
issue #5047, refactor UIVideoPlayer
|
2014-05-12 11:35:57 +08:00 |
andyque
|
4f3c128c4f
|
issue #5057, refator UITextField
|
2014-05-12 11:29:22 +08:00 |
andyque
|
eeaf48d3e5
|
issue #5047, refactor UISlider
|
2014-05-12 11:17:06 +08:00 |
andyque
|
74ac5d1d5a
|
issue #5057, refactor UIScrollView
|
2014-05-12 11:08:10 +08:00 |
andyque
|
ba802e1308
|
issue #5057, refactor UIRichText
|
2014-05-12 10:39:30 +08:00 |
andyque
|
77a463bac3
|
issue #5057, refactor UIPageView
|
2014-05-12 10:31:52 +08:00 |
andyque
|
7f15a14d55
|
issue #5057, refactor LoadingBar
|
2014-05-12 10:12:22 +08:00 |
andyque
|
43eb75fb1a
|
issue #5057, refactor Listview
|
2014-05-12 09:51:23 +08:00 |
Ricardo Quesada
|
5c44d4dcc8
|
Merge pull request #6673 from ricardoquesada/changelog
updates changelog
|
2014-05-11 11:20:07 -07:00 |
Ricardo Quesada
|
91d1883e15
|
updated changelog
|
2014-05-11 11:19:11 -07:00 |
James Chen
|
5b14338d1f
|
Update Android.mk
|
2014-05-11 13:22:42 +08:00 |
James Chen
|
449d1af7a8
|
Merge pull request #6672 from dumganhar/linux-android-fix
Linux android build fix
|
2014-05-11 12:51:27 +08:00 |
James Chen
|
292c1a5aa4
|
Linux android build fix
|
2014-05-11 12:50:51 +08:00 |
James Chen
|
9bd59de3de
|
Merge pull request #6671 from dumganhar/deprecate-cpp-warning-fix
Warning fix in CCDeprecated.cpp and CCGLProgramState.h
|
2014-05-11 12:35:51 +08:00 |
James Chen
|
14b6a046a3
|
Warning fix in CCDeprecated.cpp and CCGLProgramState.h
|
2014-05-11 12:14:17 +08:00 |
James Chen
|
4d275f91d0
|
issue #4660: Updates utf unit test, use c memcmp and run 10000 times
|
2014-05-11 11:24:32 +08:00 |
James Chen
|
3d22c30933
|
issue #4660: Warning fix in CCLabel.cpp and ConvertUTF.c
|
2014-05-11 11:24:01 +08:00 |
James Chen
|
945ad2eb04
|
issue #4660: Adds utf8/16 conversion unit test
|
2014-05-10 21:52:19 +08:00 |
James Chen
|
602fa28577
|
issue #4660: Updates comments and doc for deprecated ccutf8 api
|
2014-05-10 21:51:42 +08:00 |
James Chen
|
448c1ad352
|
issue #4660: Removes unused function in ccUTF8.cpp
|
2014-05-10 19:34:49 +08:00 |
Dhilan007
|
4692c67b78
|
issue #4660:remove unnecessary API.
|
2014-05-10 19:33:05 +08:00 |
James Chen
|
645a9761c8
|
issue #4660: CCTweenFunction.h/.cpp must be in 'action' filter
|
2014-05-10 19:33:05 +08:00 |
James Chen
|
f0cf415228
|
issue #4660: Fix windows include path doesn't contain `external/ConvertUTF`
|
2014-05-10 19:33:05 +08:00 |
James Chen
|
3a30adde0f
|
issue #4660: A warning fix in CCFontAtlas.cpp
|
2014-05-10 19:33:05 +08:00 |