CocosRobot
|
3aeefd911e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-07-11 07:54:54 +00:00 |
minggo
|
3d5789ee77
|
Merge pull request #16077 from mogemimi/fix-documentation-comments
Fix documentation when compile with -Wdocumentation and Clang
|
2016-07-11 15:49:28 +08:00 |
minggo
|
5dd8843c88
|
Merge pull request #16082 from CocosRobot/update_cocosfiles_1468209886
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-07-11 15:42:08 +08:00 |
CocosRobot
|
ca28b5b603
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-07-11 04:04:47 +00:00 |
minggo
|
9c7d44ccd7
|
Merge pull request #16080 from minggo/use-std_abs
use std::abs instead
|
2016-07-11 12:02:10 +08:00 |
minggo
|
2ca1760b78
|
Merge pull request #16079 from minggo/use-std_srand
use std::srand() instead
|
2016-07-11 12:01:38 +08:00 |
minggo
|
3dc167a9f9
|
use std::abs instead
|
2016-07-11 12:01:09 +08:00 |
minggo
|
a146f3eec7
|
use std::srand() instead
|
2016-07-11 11:17:28 +08:00 |
mogemimi
|
7531c5156b
|
Fix documentation when compile with -Wdocumentation and Clang
|
2016-07-10 17:38:32 +09:00 |
Ricardo Quesada
|
4e8ef384bc
|
Merge pull request #16075 from ricardoquesada/issue_16073
fix: Text::create() does not crash on mac/ios
|
2016-07-08 18:13:05 -07:00 |
Ricardo Quesada
|
995868c62e
|
fix: Text::create() does not crash on mac/ios
...on invalid unicode.
fixes issue #16073
|
2016-07-08 16:59:44 -07:00 |
minggo
|
b55d938a93
|
Merge pull request #16070 from minggo/remove-codeide-related
[ci skip]Remove codeide related
|
2016-07-08 18:17:43 +08:00 |
minggo
|
d4bd1d0c9a
|
fix conflict
|
2016-07-08 18:15:57 +08:00 |
minggo
|
826b142096
|
remove ide-support in framework project
|
2016-07-08 18:07:57 +08:00 |
minggo
|
3f60d1d886
|
remove code ide related codes in tempaltes
|
2016-07-08 17:17:23 +08:00 |
minggo
|
c267167d07
|
Merge pull request #16069 from minggo/ndkr12b-issue
fix compiling and linking error with ndk r12b
|
2016-07-08 17:01:09 +08:00 |
minggo
|
a144006931
|
use arm mode
|
2016-07-08 16:00:32 +08:00 |
minggo
|
4e125d84a4
|
fix compiling and linking error with ndk r12b
|
2016-07-08 15:29:35 +08:00 |
minggo
|
8d8c295ff0
|
Merge pull request #16062 from minggo/fileutils-issue
fix bug that FileUtils::removeDirectory() can not work on all platforms except iOS and Mac
|
2016-07-08 14:54:25 +08:00 |
minggo
|
9f2f794cac
|
Merge pull request #16065 from mogemimi/fix-readme-and-other-docs
Fix typos in README and other markdown docs
|
2016-07-08 13:39:52 +08:00 |
minggo
|
f395be5f0d
|
Merge pull request #16067 from CocosRobot/update_lua_bindings_1467918081
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-07-08 13:39:11 +08:00 |
CocosRobot
|
8fe92fbd4b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-07-07 19:04:04 +00:00 |
Ricardo Quesada
|
7727c2eb6f
|
Merge pull request #16058 from ricardoquesada/issue_11942
test: add test case for Github issue #11942
|
2016-07-07 11:51:47 -07:00 |
Ricardo Quesada
|
891fe706da
|
Merge pull request #16057 from ricardoquesada/issue_12226
test: add test case for Github issue #12226
|
2016-07-07 08:34:30 -07:00 |
mogemimi
|
56e8f4246a
|
Fix typos in README and other markdown docs
|
2016-07-07 23:59:57 +09:00 |
minggo
|
836acff6d0
|
Merge pull request #16060 from minggo/merge-v312
Merge v312
|
2016-07-07 18:29:28 +08:00 |
minggo
|
4e7929e165
|
Merge pull request #16055 from mogemimi/avoid-overhead-of-casting
Avoid overhead of casting float to double
|
2016-07-07 18:28:34 +08:00 |
minggo
|
4511b35b51
|
fix bug that FileUitls::removeDirectory() can not work on all platforms except iOS and Mac
|
2016-07-07 17:43:19 +08:00 |
minggo
|
58b1c03681
|
Merge pull request #16048 from CocosRobot/update_lua_bindings_1467792185
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-07-07 15:30:37 +08:00 |
minggo
|
734d857ced
|
Merge branch 'v3.12' into merge-v312
|
2016-07-07 15:13:21 +08:00 |
minggo
|
c579cd48f4
|
update VR link
|
2016-07-07 10:55:27 +08:00 |
minggo
|
7e7985ffd3
|
Merge pull request #16054 from cocos2d/v3.12-Release-Notes-Changes
updated link to VR doc, capitalized some headers, corrected Cocos2d-x…
|
2016-07-07 10:02:34 +08:00 |
minggo
|
9d7aee25b0
|
Merge pull request #16053 from pandamicro/v3.12
[ci skip]Made css style inline
|
2016-07-07 10:02:27 +08:00 |
Ricardo Quesada
|
766817f1dd
|
test: add test case for Github issue #11942
test case for Github issue #11942
|
2016-07-06 17:21:58 -07:00 |
Ricardo Quesada
|
6d5a94e569
|
test: add test case for Github issue #12226
Adds test case for Github issue #12226
|
2016-07-06 16:37:15 -07:00 |
mogemimi
|
6ce7f3c0e9
|
Avoid overhead of casting float to double
|
2016-07-07 01:38:27 +09:00 |
slackmoehrle
|
a68c82f2f2
|
updated link to VR doc, capitalized some headers, corrected Cocos2d-x branding.
|
2016-07-06 10:15:56 -04:00 |
pandamicro
|
d99a8f0f84
|
Made css style inline
|
2016-07-06 19:42:27 +08:00 |
minggo
|
e632f99d48
|
Merge pull request #16052 from pandamicro/v3.12
[ci skip]Update release notes
|
2016-07-06 18:05:35 +08:00 |
pandamicro
|
927fd73ff0
|
Update release notes
|
2016-07-06 18:02:25 +08:00 |
minggo
|
c81268d182
|
Merge pull request #16051 from pandamicro/v3.12
[ci skip]Fix last issue in html5 engine
|
2016-07-06 17:25:42 +08:00 |
pandamicro
|
384279fc26
|
Fix last issue in html5 engine
|
2016-07-06 17:24:43 +08:00 |
minggo
|
8d6acd9ffe
|
Merge pull request #16050 from pandamicro/v3.12
[ci skip]Update JS versions
|
2016-07-06 17:04:42 +08:00 |
pandamicro
|
ccb30cefc7
|
Update JS versions
|
2016-07-06 17:02:53 +08:00 |
CocosRobot
|
e0c40ad83b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-07-06 08:06:02 +00:00 |
minggo
|
6248480b3a
|
Merge pull request #16047 from minggo/issue-14071
[ci skip]convert aplpha channel correctly
|
2016-07-06 15:59:50 +08:00 |
minggo
|
d0db838b71
|
convert aplpha channel correctly
|
2016-07-06 15:49:05 +08:00 |
minggo
|
418907d972
|
Merge pull request #16044 from pandamicro/v3.12
Improve web template and update web ref
|
2016-07-06 14:47:23 +08:00 |
minggo
|
995cd6fcfd
|
update release note
|
2016-07-06 14:41:13 +08:00 |
minggo
|
01fe35a24b
|
update release note
|
2016-07-06 14:40:25 +08:00 |