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 |
James Chen
|
07204a0602
|
issue #4660: Updates win32 project
|
2014-05-10 19:33:05 +08:00 |
James Chen
|
e693a51c6e
|
issue #4660: Linux build ok
|
2014-05-10 19:24:04 +08:00 |
James Chen
|
20adf418fd
|
Updates 2d/CMakeLists.txt
|
2014-05-10 19:24:04 +08:00 |
James Chen
|
e003a09a2c
|
Updates CMakeLists.txt
|
2014-05-10 19:24:04 +08:00 |
James Chen
|
dd3ed008b9
|
issue #4660: Updates Android.mk
|
2014-05-10 19:24:04 +08:00 |
James Chen
|
b003ba5eb0
|
issue #4660: Oops, utf16 is 2 bytes.
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
a61b1097db
|
issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
5fda13639d
|
issue #4660: Uses new utf api for Label.
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
ed8633141f
|
issue #4660: Updates android.mk
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
e84ccc8914
|
issue #4660: Updates Xcode project
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
9f4d2acaee
|
issue #4660: StringUtils is a namespace now
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
20a8808b78
|
issue #4660: Refactors utf8 api, make it safer and easier to use.
|
2014-05-10 19:24:03 +08:00 |
James Chen
|
42ffd25fca
|
issue #4660: Adds ConvertUTF lib and adds license (LLVM and unicode license).
|
2014-05-10 19:24:02 +08:00 |
Ricardo Quesada
|
df623c70d3
|
Merge pull request #6669 from dabingnn/v3_fix_accident_changes
add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS
|
2014-05-09 22:24:21 -07:00 |
Huabing.Xu
|
bbac0be9a6
|
add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS
|
2014-05-09 22:04:19 -07:00 |
Ricardo Quesada
|
006fe7eb94
|
Merge pull request #6667 from super626/improved_glprogram
remove unused shadertest
|
2014-05-09 21:42:01 -07:00 |
Ricardo Quesada
|
4d579892b1
|
Merge pull request #6668 from dabingnn/v3_fix_accident_changes
V3 fix accident changes
|
2014-05-09 21:38:09 -07:00 |
Huabing.Xu
|
ba63befa5e
|
roll back target=android-10
|
2014-05-09 21:36:35 -07:00 |
yangxiao
|
cb3bd52d9a
|
remove unused shadertest
|
2014-05-09 21:34:59 -07:00 |
Huabing.Xu
|
b80a1e7c3c
|
roll back submodule changes
|
2014-05-09 21:31:15 -07:00 |
Ricardo Quesada
|
4d3c930da5
|
Merge pull request #6666 from ricardoquesada/fix_deprecated_warnings
Fixes deprecated warnings
|
2014-05-09 21:29:57 -07:00 |
Ricardo Quesada
|
a8c2fb5431
|
Fixes deprecated warnings
|
2014-05-09 21:29:24 -07:00 |
James Chen
|
f9cb7a6d0f
|
Merge pull request #6663 from CocosRobot/update_cocosfiles_1399694291
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-10 12:09:00 +08:00 |
Ricardo Quesada
|
c288c67aef
|
Merge pull request #6664 from ricardoquesada/fix_double_free_crash
fixes double free crash on GLProgramStateCache
|
2014-05-09 21:07:04 -07:00 |
Ricardo Quesada
|
605fe8e4f3
|
fixes double free crash on GLProgramStateCache
|
2014-05-09 21:06:02 -07:00 |
CocosRobot
|
4ce297458f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-10 03:58:12 +00:00 |
James Chen
|
36e699faa2
|
Merge pull request #6662 from CocosRobot/update_cocosfiles_1399694120
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-10 11:57:54 +08:00 |
Ricardo Quesada
|
029c38a789
|
Merge pull request #6660 from CocosRobot/update_lua_bindings_1399693609
[AUTO]: updating luabinding automatically
|
2014-05-09 20:56:03 -07:00 |
CocosRobot
|
b1ff6bfd1f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-10 03:55:21 +00:00 |
Ricardo Quesada
|
36074f7bbe
|
Merge pull request #6661 from ricardoquesada/fix_shader_test
10 tests
|
2014-05-09 20:52:52 -07:00 |
Ricardo Quesada
|
1a0ab4bf92
|
10 tests
|
2014-05-09 20:51:46 -07:00 |
CocosRobot
|
f0c240f885
|
[AUTO]: updating luabinding automatically
|
2014-05-10 03:47:56 +00:00 |
Ricardo Quesada
|
2664904b08
|
Merge pull request #6593 from super626/improved_glprogram
Improves GLProgram
|
2014-05-09 20:44:32 -07:00 |
Huabing.Xu
|
e84d96234b
|
add two shaderTest case for Trace
comment out one(it is not working on IOS device)
|
2014-05-09 20:35:15 -07:00 |
Ricardo Quesada
|
4a49668940
|
plist are not executable files
|
2014-05-09 20:11:36 -07:00 |
Huabing.Xu
|
c3a255e2d0
|
do not generate backupFile if it is not needed for convert particle file yCoordFlipped
|
2014-05-09 20:07:46 -07:00 |
Ricardo Quesada
|
32d96ca9ad
|
Compiles on Windows Phone 8
... but does not run
|
2014-05-09 19:42:57 -07:00 |
Ricardo Quesada
|
488a8deae9
|
Shader fixes for windows
|
2014-05-09 19:13:12 -07:00 |
Ricardo Quesada
|
e8d2cf7871
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 19:08:08 -07:00 |
Ricardo Quesada
|
8f71e65482
|
Compiles on windows, sort of
|
2014-05-09 19:07:22 -07:00 |
yangxiao
|
d46729862c
|
android rename ShaderCahe to GLProgramCache
|
2014-05-09 19:05:39 -07:00 |
Ricardo Quesada
|
63c7c6a05c
|
Updates template files
|
2014-05-09 18:41:12 -07:00 |
Ricardo Quesada
|
b62f4e51a4
|
Updates Linux project
|
2014-05-09 18:40:53 -07:00 |