minggo
c5c846f6e1
Merge pull request #16107 from cezheng/fix/EaseExponentialOut_clone_crash
...
fix crash in EaseExponentialOut::clone()
2016-07-13 16:32:48 +08:00
minggo
bed7458de8
Merge pull request #16108 from mogemimi/add-missing-override
...
Add missing override keyword
2016-07-13 16:32:23 +08:00
minggo
71d02538f6
Merge pull request #16106 from CocosRobot/update_cocosfiles_1468384735
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-13 14:11:16 +08:00
mogemimi
98cc48bc62
Add missing override keyword
2016-07-13 15:03:53 +09:00
Ce Zheng
cf18857206
fix crash in EaseExponentialOut::clone()
2016-07-13 14:28:04 +09:00
CocosRobot
eea229c101
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-13 04:38:56 +00:00
Ricardo Quesada
1824b21cb7
Merge pull request #16090 from ricardoquesada/issue_15566
...
fixes issue #15566
2016-07-12 21:36:52 -07:00
minggo
8561e5f868
Merge pull request #16089 from mogemimi/avoid-double-promotion
...
Use std::abs to avoid overhead of casting float to double
2016-07-13 12:01:20 +08:00
Ricardo Quesada
05a772115e
fixes issue #15566
...
lua and javascript for arm64 is not compiled
version 103
uses JPEG 9b for android
using armeabi
uses Lua, and not LuaJIT for Android ARM64
2016-07-12 19:03:53 -07:00
minggo
147fe4336c
Merge pull request #16104 from natural-law/v3
...
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:45:29 +08:00
zhangbin
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
minggo
a9862f26fa
Merge pull request #16096 from coderwj/v3
...
Fix a bug, in lua can't get the "backClicked" but a nil
2016-07-13 09:34:17 +08:00
minggo
434448a445
Merge pull request #16099 from mogemimi/bump-simulator-version
...
Bump simulator version number to 3.12
2016-07-13 09:32:53 +08:00
Tyler Kopf
15c6788783
fix buffer overflow in CCGLProgram.cpp in memcmp call (Address Sanitizer spots it easily)
...
- previously the flow went memcmp, if that != 0, do a bounds check, etc
- now do a bounds check, if destSize >= srcSize, do memcmp, etc
2016-07-12 11:10:16 -07:00
mogemimi
b9c78ac41c
Use std::abs to avoid overhead of casting float to double
2016-07-13 00:55:11 +09:00
mogemimi
905bd36e32
Bump simulator version number to 3.12
2016-07-13 00:41:27 +09:00
coderwj
c9ad76e56a
Fix a bug, in lua can't get the "backClicked" but a nil
...
in lua, I registerScriptKeypadHandler,when debug on Andriod, after clicking back button, I didn't get "backClicked",but a nil
I see that in CHANGELOG:
cocos2d-x-3.1 May.24 2014
[FIX] EventKeyboard::KeyCode: key code for back button changed from KEY_BACKSPACE to KEY_ESCAPE
so,I fix it , and get the right "backClicked"
2016-07-12 17:37:33 +08:00
zhangbin
4408f28480
Solve the error in simulator project.
...
Remove unused files.
2016-07-12 17:33:43 +08:00
halx99
c0e0931838
fix, replace std::sort by std::stable_sort ( #16092 )
...
* fix, replace std::sort by std::stable_sort
2016-07-12 13:46:38 +08:00
Steve Tranby
f162ffe2ae
Match parent's camera mask when adding child.
2016-07-12 00:07:41 -05:00
minggo
9f09349fa9
Merge pull request #16084 from CocosRobot/update_lua_bindings_1468223553
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-12 11:28:52 +08:00
zilongshanren
67fde8e91b
make -n args works
2016-07-12 10:29:04 +08:00
Tyler Kopf
5ecd016a9e
fix leak in Data on move assignment
2016-07-11 15:33:51 -07:00
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