minggo
0b222da93e
Merge pull request #16041 from mogemimi/fix-various-typos
...
Fix various typos
2016-07-06 10:09:05 +08:00
mogemimi
bed4e048b6
Fix various typos
2016-07-06 08:27:39 +09:00
minggo
0796f8189d
Merge pull request #16036 from minggo/fileuitl-getcontents
...
fix some bugs in FileUtils
2016-07-05 15:37:14 +08:00
minggo
2f1e14dcde
fix compiling error
2016-07-05 14:28:30 +08:00
minggo
4c2efb1319
don't read file content if it is empty
2016-07-05 14:27:28 +08:00
minggo
33d1eb4455
don't invoke front() if container is empty
2016-07-05 14:27:11 +08:00
minggo
e4aa6d1ef7
Merge pull request #16035 from minggo/issue-16032
...
remove extra '\'
2016-07-05 14:22:19 +08:00
minggo
0cc8b9fc09
Merge pull request #16031 from MrCapone/fix_GLView
...
GLView::setFrameSize fixed
2016-07-05 09:54:59 +08:00
minggo
1c9ad5594c
remove extra '\'
2016-07-05 09:50:38 +08:00
minggo
f666d99192
Merge pull request #16021 from yalab/cocosstudio_with_texturepacker
...
Fixed to use TexturePacker with cocosstudio.
2016-07-05 09:35:59 +08:00
minggo
f621afedc4
Merge pull request #16034 from mogemimi/avoid-double-promotion
...
Add missing float suffix to avoid -Wdouble-promotion
2016-07-05 09:33:10 +08:00
mogemimi
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
mr_capone-win7
0e64c2a071
GLView::setFrameSize fixed
2016-07-04 19:48:24 +07:00
minggo
b9d6f0d8d6
Merge pull request #16027 from CocosRobot/update_lua_bindings_1467596228
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 11:00:49 +08:00
minggo
ca8ff36f2e
Merge pull request #16016 from LeeMyoungYeol/v3
...
Update utils::getTimeInMilliseconds()
2016-07-04 10:55:41 +08:00
CocosRobot
934b2413dc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 01:40:35 +00:00
minggo
8bbeb01be4
Merge pull request #16025 from mogemimi/fix-doc-typo
...
Fix typos and other mistakes in docs
2016-07-04 09:33:29 +08:00
minggo
b380df97c6
Merge pull request #16022 from mogemimi/fix-format-string
...
Fix format string warning when compiling with Android NDK
2016-07-04 09:31:45 +08:00
minggo
97205f4a0a
Merge pull request #16024 from CocosRobot/update_lua_bindings_1467522653
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 09:30:30 +08:00
mogemimi
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
mogemimi
57900112c5
Fix format string warning when compiling with Android NDK
2016-07-03 17:19:17 +09:00
CocosRobot
f30a7cf546
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-03 05:14:11 +00:00
Ricardo Quesada
548a5ebdce
Merge pull request #16019 from ricardoquesada/hex_hex
...
fix: Add support for hexagonal tiled maps
2016-07-02 22:07:03 -07:00
yalab
35968a6fc1
Slidebar can load TextureCache on cocosstudio.
2016-07-02 18:45:20 +09:00
yalab
c675675de5
Fixed to use TexturePacker with cocosstudio.
2016-07-02 17:31:32 +09:00
Ricardo Quesada
f7d65fbe8a
Squashed commit of the following:
...
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 1 11:05:02 2016 -0700
Add support for Hex tiled maps
Based on original patch by https://github.com/JustVic
Original patch:
https://github.com/cocos2d/cocos2d-x/pull/13288
fix: tiled hex maps
Hexagonal TileMaps Support
fix: odd, even works as expected
still problems with rendering order
fix: fixes layer position in Hex
fix render ordering
2016-07-01 15:51:00 -07:00
minggo
d63802e718
Merge pull request #16018 from minggo/update-release-note
...
update release note
2016-07-01 17:22:20 +08:00
minggo
c1949be617
Merge pull request #16017 from minggo/issue-15978
...
don't search APK if the path is absolute
2016-07-01 17:21:37 +08:00
minggo
46c38fff62
update release note
2016-07-01 17:21:26 +08:00
minggo
fa5de8ccd3
Merge pull request #16006 from mogemimi/fix-utf8-substring
...
Fix getSubStringOfUTF8String bug
2016-07-01 15:53:41 +08:00
minggo
12442521b2
don't search APK if the path is absolute
2016-07-01 15:42:02 +08:00
minggo
30b5be6ddd
Merge pull request #16014 from natural-law/v3
...
[ci skip] Update submodule cocos2d-console.
2016-07-01 14:35:27 +08:00
이명열
853e083c68
- The result comes across as negative.(device android)
2016-07-01 15:32:43 +09:00
mogemimi
2354df9faf
Fix getSubStringOfUTF8String bug
2016-07-01 15:16:35 +09:00
zhangbin
51e7de9457
Update submodule cocos2d-console.
...
Changed:
- Remove unused command framework.
2016-07-01 12:03:26 +08:00
minggo
6aec420a13
Merge pull request #16013 from pandamicro/v3.12
...
Fix callfunc released with retained data (callback, target, extradata) issue
2016-07-01 11:52:23 +08:00
pandamicro
d02bdda781
Fix callfunc released with retained data (callback, target, extradata) issue
2016-07-01 10:56:17 +08:00
minggo
5f817eaa67
Merge pull request #16011 from CocosRobot/update_lua_bindings_1467339225
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-01 10:35:53 +08:00
CocosRobot
94de257115
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-01 02:16:32 +00:00
minggo
043d81be1c
Merge pull request #16008 from yalab/cocosstudio_with_texturepacker
...
cocosstudio can manage TexturePacker Image.
2016-07-01 10:10:09 +08:00
halx99
2610ad77cc
#15965 : remove unused _orderOfArrival ( #16009 )
2016-07-01 10:09:25 +08:00
yalab
c5648db10a
cocosstudio can manage TexturePacker Image.
2016-06-30 18:10:08 +09:00
Ricardo Quesada
9bc695a75b
Merge pull request #16007 from ricardoquesada/linux_glfw_32
...
upgrades to GLFW v3.2
2016-06-29 17:20:56 -07:00
Ricardo Quesada
afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
CocosRobot
274a82c7f5
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16001 )
2016-06-29 22:56:13 +08:00
minggo
47442b9d8b
Merge pull request #15997 from mogemimi/fix-variable-names
...
Fix some minor typos in local variable names
2016-06-29 14:24:00 +08:00
minggo
bb1b8f1cde
Merge pull request #15998 from pandamicro/v3.12
...
[ci skip] Fix js test issues
2016-06-29 14:21:30 +08:00
minggo
39fbf253ed
Merge pull request #16000 from CocosRobot/update_lua_bindings_1467175446
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-29 14:20:23 +08:00
CocosRobot
ef01ac4465
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-29 04:47:21 +00:00
Ricardo Quesada
935c60c552
Merge pull request #15999 from ricardoquesada/issue13351
...
fix: not leak Toggle items
2016-06-28 21:40:10 -07:00