Vladimir Timofeev
|
b6201f9328
|
cmake: try to fix lua-bindings for msvc
|
2015-01-26 10:09:49 +03:00 |
andyque
|
691e1925ca
|
udpate test resource submodule
|
2015-01-26 15:05:41 +08:00 |
Vladimir Timofeev
|
991ea4532d
|
cmake: fix using of external/xxhash for msvc generated project
|
2015-01-26 10:03:49 +03:00 |
Vladimir Timofeev
|
725744744b
|
cmake: add logic to find and link with curl in cpp-tests, because cpp-tests use curl as its own (in file tests/cpp-tests/Classes/CurlTest/CurlTest.cpp)
|
2015-01-26 10:03:30 +03:00 |
Vladimir Timofeev
|
5d27da2887
|
cmake: add glew include dirs globally, because windows code uses glew from public headers
|
2015-01-26 10:03:07 +03:00 |
yangxiao
|
77716d481d
|
format
|
2015-01-26 15:03:01 +08:00 |
Vladimir Timofeev
|
fc5023c9e7
|
cmake: add ZLIB_INCLUDE_DIRS to include directories before external/unzip compile (fix compilation with msvc)
|
2015-01-26 10:02:46 +03:00 |
Vladimir Timofeev
|
567c5933bb
|
cmake: fix GLEW include dir for msvc prebuilt library
|
2015-01-26 10:02:27 +03:00 |
yangxiao
|
5e1d7449f7
|
complete use case 1
|
2015-01-26 14:58:16 +08:00 |
andyque
|
12cf9da486
|
improve loadingbar test
|
2015-01-26 14:46:45 +08:00 |
andyque
|
0e67cfcbff
|
improve loading Bar Test
|
2015-01-26 14:39:44 +08:00 |
minggo
|
d94c26006b
|
[ci skip] Update CHANGELOG
|
2015-01-26 14:11:49 +08:00 |
minggo
|
cba0e19252
|
Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield
Change the order of detach and attach of TextField::upadate
|
2015-01-26 14:00:58 +08:00 |
minggo
|
b722ea33da
|
[ci skip] Update CHANGELOG
|
2015-01-26 13:55:57 +08:00 |
minggo
|
4ac50f2c26
|
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
Fixed sets the page's base URL for WebView doesn't work.
|
2015-01-26 13:51:08 +08:00 |
minggo
|
38a86ad18a
|
[ci skip] Update CHANGELOG
|
2015-01-26 13:50:36 +08:00 |
andyque
|
fdbf84a118
|
add uploading switch scale9 tests
|
2015-01-26 13:49:54 +08:00 |
minggo
|
988a2729d7
|
Merge pull request #10203 from Dhilan007/v3-bmf-performance
Improved the parsing performance of bitmap fonts
|
2015-01-26 13:46:04 +08:00 |
pipu
|
35c1e73b8f
|
Checking whether tileset is valid during parses TMXTiledMap in GameMapReader.
|
2015-01-26 13:14:17 +08:00 |
Ryo Miyajima
|
d1d4ec2ac6
|
fix grammar in comment
|
2015-01-26 10:56:43 +09:00 |
Ryo Miyajima
|
4985653f5b
|
specify default capacity
|
2015-01-26 10:56:38 +09:00 |
minggo
|
0d872ae1d7
|
[ci skip] Update CHANGELOG
|
2015-01-26 09:49:36 +08:00 |
minggo
|
bc1b588062
|
Merge pull request #10202 from dabingnn/v3_fixCrashWithNoVAO
V3 fix crash with no vao
|
2015-01-26 09:48:25 +08:00 |
WenhaiLin
|
9afa871164
|
Improved the parsing performance of bitmap fonts
|
2015-01-24 16:23:30 +08:00 |
Wenhai Lin
|
81198583f1
|
Fixed sets the page's base URL for WebView doesn't work.
|
2015-01-23 18:30:12 +08:00 |
yangxiao
|
677ee473ff
|
3d+2d use case, not finished
|
2015-01-23 18:24:15 +08:00 |
Huabing.Xu
|
285a280bb4
|
enable attribute cache as before
|
2015-01-23 18:19:25 +08:00 |
Huabing.Xu
|
030394bffe
|
refactor the rendering and creation of DrawNode
make LayerColor rendering safer
|
2015-01-23 18:19:03 +08:00 |
minggo
|
ebc75579a2
|
Merge pull request #9838 from htlxyz/v3_origin
modify trans lua value to fontdefinition error
|
2015-01-23 16:55:01 +08:00 |
minggo
|
ea9d9f889c
|
[ci skip]Update Authors
|
2015-01-23 16:43:22 +08:00 |
minggo
|
0addc3fb1d
|
Merge pull request #10173 from tmr111116/fix_random_int_overflow
fix random int overflow
|
2015-01-23 16:38:08 +08:00 |
minggo
|
53754221e8
|
[ci skip] Update CHANGELOG
|
2015-01-23 16:17:53 +08:00 |
minggo
|
516c6f1387
|
Merge pull request #10187 from joshuastray/fix-win32-editbox-clip
Fix win32 editbox content not clipped correctly
|
2015-01-23 16:16:00 +08:00 |
minggo
|
42b6fbd1c6
|
Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
Lua load chunks from zip supports folder structured lua
|
2015-01-23 16:13:09 +08:00 |
minggo
|
eaba6ad9c3
|
Merge pull request #10191 from fusijie/multipletouches
[ci skip]add multiple touches toggle to iOS.
|
2015-01-23 15:56:54 +08:00 |
minggo
|
ba1058c03c
|
Merge pull request #10192 from samuele3hu/v3_4_rc1
[ci skip]Fix some lua test cases bug
|
2015-01-23 15:54:51 +08:00 |
minggo
|
c0c8af9248
|
[ci skip] Update CHANGELOG
|
2015-01-23 15:37:12 +08:00 |
samuele3hu
|
6e055ba41f
|
Fix some lua test cases bug
|
2015-01-23 15:35:15 +08:00 |
Jacky
|
da76cfdc79
|
add multiple touches toggle to iOS.
|
2015-01-23 15:09:46 +08:00 |
minggo
|
2b3cc6c62b
|
Merge pull request #10188 from samuele3hu/v3_4_issue9537
Update plugin submodule
|
2015-01-23 14:57:44 +08:00 |
minggo
|
deaa6098e9
|
Merge pull request #10189 from dabingnn/v3_fixCrashNoVAO
disbale cache for s_attributeFlags
|
2015-01-23 14:55:13 +08:00 |
Huabing.Xu
|
421310f3a8
|
Merge branch 'v3' into v3_fixCrashNoVAO
Conflicts:
cocos/renderer/ccGLStateCache.cpp
|
2015-01-23 14:50:21 +08:00 |
Huabing.Xu
|
550fc44187
|
disbale cache for s_attributeFlags
|
2015-01-23 14:32:36 +08:00 |
Jialong Zhai
|
b295c8e817
|
fix indentation
|
2015-01-23 14:13:36 +08:00 |
samuele3hu
|
80bca0c876
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9537
|
2015-01-23 14:13:19 +08:00 |
Jialong Zhai
|
7ef80e9dae
|
Update UIEditBoxImpl-win32.cpp
|
2015-01-23 14:11:22 +08:00 |
samuele3hu
|
29c8b2c3f2
|
Update plugin submodule
|
2015-01-23 14:08:19 +08:00 |
minggo
|
e423babd64
|
Merge pull request #10184 from pandamicro/v3_origin
Fix AssetsManagerEx small issues
|
2015-01-23 13:34:05 +08:00 |
pandamicro
|
5e8baa4f39
|
Fix AssetsManagerEx small issues
|
2015-01-23 12:10:32 +08:00 |
minggo
|
938b5dc5c6
|
[ci skip] Update CHANGELOG
|
2015-01-23 12:04:55 +08:00 |