f72b950465
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16926 )
2016-11-30 11:33:49 +08:00
129838d960
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16896 )
2016-11-24 11:39:02 +08:00
18204c1e37
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16880 )
2016-11-21 15:00:00 +08:00
7c6f0598b2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16861 )
2016-11-18 09:27:20 +08:00
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
f99dae383f
Fixed math error (issue #16837 ) in Lua function radian2angle ( #16848 )
2016-11-16 09:35:47 +08:00
d0705d9e25
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16828 )
2016-11-09 17:33:47 +08:00
c6f98cd95b
jsb.addRoot is not a function ( #16509 )
...
* jsb.addRoot is not a function
jsb.addRoot is not a function
* Update jsb_cocos2d.js
remove jsb._root
2016-11-09 15:19:32 +08:00
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
9204c87cfc
Adding performance.now() to cocos2d-js. ( #16766 )
...
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision
* Adding performance.now tests
2016-11-04 11:58:48 +08:00
9eb177c6cc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16802 )
2016-11-03 15:29:09 +08:00
3b87e46280
Support compile & run project on Tizen by cocos command. ( #16783 )
...
* Add config files for build engine source code on tizen.
* Add config files for cpp-empty-test on tizen.
* Add missing files.
* Add config files for cpp-tests on tizen.
* Add Tizen config files for lua-bindings.
* Add Tizen config files for lua-empty-test.
* Solve the error when build lua-empty-test for Tizen.
* Add Tizen config files for lua-tests.
* Solve the error when build lua-tests for Tizen.
* Add tizen config files for templates.
* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
a888f42d7f
Lua: have cc.Ray:intersects additionally return the distance ( #16677 )
...
cc.Ray:intersects now returns two results, an indication of hit or
not, plus the distance along the ray. The function can still be called
expecting a single argument and hence is backward compatible.
Also correct the debug error message
2016-11-02 09:45:24 +08:00
57903077d0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-30 01:00:27 +00:00
3ab1be61a7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16764 )
2016-10-28 10:13:57 +08:00
e4170a7b02
Improve JS bindings ( #16751 )
...
* Fix tests for v3.12 web
* Improve scheduler wrapper
* Update web engine ref
* Fix leak: js_remove_object_reference can not remove non binding objects
* Fix ScriptingCore::evalString
* Add missed `__cppCreated` for JS create objects
* Fix manifest path issue
2016-10-28 09:29:56 +08:00
44f6865697
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16750 )
2016-10-27 11:15:24 +08:00
92af2b2b6f
bug fix ( #16747 )
2016-10-27 09:46:07 +08:00
323ea7c0d4
Sprite scale9 ( #16702 )
...
* Adds slice9 support for Sprite.
how to use it:
// points coords
sprite->setCenterRect(Rect(x,y,w,h));
// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite
more slice 9 changes
sprite 9 slice works?
kind of works
correct anchor point
slice 9 works, at least with non-rotated atlases
streched works ok
better Y invert code.
cleaner, compatible with the previous code
yay, scaling workings...
need a better api now
sets scale correctly
yay! works as expected!
more fixes and tests
better test for box
setContentSize() changes size in non-9-slice mode sprites as well
setCenterRect() -> setCenterRectNormalized()
yet another test
adds setPositionNormalized()
adds setCenterRect() tests
remove devel team from xcode
tests: add one more tests
fun test!
improved test
yet another test for slice 9
* fixes anchorPoint issues
* adds documentation
* fix: using top-left coordinate for setRect
* sprite: fixes related to scale9 and tiled
* Sprite: slice 9 fixes
works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`
* fixes js and lua bindings for Autopolygon
2016-10-26 18:45:40 -07:00
5b8919829c
Fix typos in local variables ( #16712 )
2016-10-20 18:17:37 +08:00
875cf45d1d
Lua: add cc.vec3 functions - add, sub, mul and dot ( #16706 )
...
Also update the lua test to use these functions.
2016-10-17 10:39:40 +08:00
23ff5fc51f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16676 )
2016-10-11 11:40:11 -07:00
cdee1e11de
Performance tweak: use range-based for-loops instead of iterator-based for-loops. ( #16642 )
...
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp
* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp
* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp
* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp
* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp
* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp
* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp
* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp
* Switched implementation to range-based for loops
* Added readability, fixed loop in CCDataReaderHelper.cpp
Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
e4be87a059
Adds Spine binary-file format support ( #16629 )
...
* Adds Spine binary-file format support
fixes issue #10438
* ignore SkeletonBinary.c from linter
* add another file to the exclude list
* lua manual fixes for spine
* SkeletonBinary.c and not .cpp
* missing files for win8.1
* don't compile it as crt
* new updates from spine
2016-10-11 10:56:14 -07:00
f280ed2cdb
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-11 01:51:00 +00:00
0c8376411e
Update GuiConstants.lua ( #16666 )
...
- fixed PageView constant
2016-10-10 13:56:42 +08:00
1c0602e130
Remove unnecessary arguments from some lua cc.mat4 methods ( #16658 )
...
* Lua: remove unused 3rd argument from cc.mat4.transformVector
cc.mat4.transformVector takes a mat4 and a 4vector and returns the result
of applying the mat4 to the vector. Strangely it had been made to also
require a third argument called dst which it doesn't use but did check
was a vec4. This commit allows cc.mat4.transformVector to be called
without the unnecessary argument. We still permit calling with it for
backward compatibility.
Also changed is the wrapper in Cocos2d.lua so that a second form of
cc.mat4.transformVector can be used where the vector is supplied as
4 separate numbers.
Changed the test files to call without the unnecessary argument.
* Lua: remove unused argument from cc.mat4.createTranslation/Rotation
Both these functions have an extra unnecessary argument called dst,
although neither use it either to pass in or out a value. This
commit removes the extra argument and updates the test programs
correspondingly.
Also, within Cocos2d.lua, remove some definitions that are later
overwritten by new ones
2016-10-08 14:33:50 +08:00
868e6f62c5
Fix typos in doc: accpetable / accepteable -> acceptable ( #16641 )
2016-10-04 22:08:56 -07:00
c046257efc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16630 )
2016-09-30 09:44:34 +08:00
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
8b703a8d12
Fix implicit conversion warning ( #16598 )
...
* Fix implicit conversion warning
* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
466053b740
Fix JS AssetsManagerTest and Improve scheduler wrapper ( #16605 )
...
* Fix tests for v3.12 web
* Improve scheduler wrapper
* Update web engine ref
2016-09-26 14:44:32 +08:00
e8c3082229
Move skipBOM function outside to prevent shadowing warning ( #16585 )
2016-09-20 14:52:15 +08:00
e7f739897c
Fix deprecated warning ( #16592 )
2016-09-20 14:48:00 +08:00
91cdb3394b
Suppress warning C4101 on MSVC ( #16573 )
2016-09-14 10:49:14 -07:00
7410bdd981
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16563 )
2016-09-12 10:03:21 +08:00
ced81f3527
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16554 )
2016-09-12 09:46:19 +08:00
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
7c298bdcd7
misspelling check on cocos directory ( #16522 )
...
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
8d2b645a96
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16519 )
...
* fixed #16473 : OpenSLES error while play background music in writable path or sdcard. (#16475 ) (#16517 )
* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-09-06 10:11:11 +08:00
8947ff722e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16514 )
2016-09-05 13:48:58 +08:00
6f4551cdad
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16513 )
2016-09-05 10:19:41 +08:00
5bfd110424
Fixes jsval_to_std_string could not convert number to string. ( #16504 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 10:02:05 +08:00
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
df3b33cd59
Merge pull request #16457 from minggo/merge-v3.13
...
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
ee4d59cf76
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16454 )
2016-08-29 11:48:21 +08:00
e124fe4fc5
Update CCBProxy.cpp ( #16421 )
...
fixed bug
2016-08-23 14:48:06 +08:00
56cfd76b4c
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16411 )
2016-08-22 15:49:43 +08:00
ec52cf4aa4
[ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref ( #16412 )
...
* Remove LayerRGBA in scripts to avoid issues and update web ref
* Doctoc docs
2016-08-22 10:55:21 +08:00
f0be4f3069
Merge part of Cocos2d-x-lite ( #16380 )
...
* Update js auto binding settings with new ndk version
* Remove unnecessary property from Ref
* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup
* Fix spine track entry circle referencing issue
* cocos2d/cocos2d-x#16327 : Fix global object leak issue in JSB
* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey
* Update JS versions
* Add docs for web v3.13
* Improve ScriptingCore
* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone
* Fix auto bindings configurations
* Update web ref
2016-08-19 16:28:47 +08:00
e9a5a4e2bd
Revert luajit ( #16397 )
...
* revert to use lua
* comment lua bytecode test
* update release note
2016-08-19 11:49:19 +08:00
d09ee83c5a
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16395 )
2016-08-19 09:36:50 +08:00
7540a64fd8
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16370 )
2016-08-16 16:56:06 +08:00
86b8a633f3
Android arm64-v8a also uses Luajit. ( #16352 )
...
* Android arm64-v8a also uses Luajit.
* Updates external/config.json
2016-08-15 14:57:04 +08:00
7f222c92e0
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16360 )
2016-08-15 10:53:07 +08:00
f9abbf02f6
fix the problem in ccUTF8.cpp and CCLuaJavaBridge.cpp ( #16314 )
...
* fix the return value when return null in java
fix the return value when return null in java
* fix getStringUTFCharsJNI
fix getStringUTFCharsJNI when srcjStr is null
* remove a word
remove a word added by mistake
* make a indention
line 233 utf8Str
2016-08-08 10:43:14 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
aac49e35e1
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16284 )
2016-07-31 22:50:28 +08:00
9a8f577095
fix some typos ( #16269 )
2016-07-29 17:20:42 +08:00
c5923e00ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16261 )
2016-07-29 13:40:46 +08:00
af1783364b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-29 01:43:11 +00:00
2945968614
Upgrades to Spine v3.4 ( #16242 )
...
* Upgrades to Spine v3.4
Github issue #16115
* compiles and works on windows
tested on:
* win32
* win10
* win8.1
* include-linter: don't test spine files
we need them unmodified
* spine bindings fixes
also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
6b3454e9c6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-27 20:38:57 +00:00
9566a0cb24
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 02:06:58 +00:00
e0abb981d5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 09:39:34 +00:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
708dab448d
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16175 )
2016-07-21 10:11:14 +08:00
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
cbcbeb96b3
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-18 06:20:59 +00:00
1824b21cb7
Merge pull request #16090 from ricardoquesada/issue_15566
...
fixes issue #15566
2016-07-12 21:36:52 -07:00
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
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
3aeefd911e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-11 07:54:54 +00:00
9c7d44ccd7
Merge pull request #16080 from minggo/use-std_abs
...
use std::abs instead
2016-07-11 12:02:10 +08:00
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +08:00
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
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
8fe92fbd4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-07 19:04:04 +00:00
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
ccb30cefc7
Update JS versions
2016-07-06 17:02:53 +08:00
6248480b3a
Merge pull request #16047 from minggo/issue-14071
...
[ci skip]convert aplpha channel correctly
2016-07-06 15:59:50 +08:00
d0db838b71
convert aplpha channel correctly
2016-07-06 15:49:05 +08:00
305bd95dc2
More secure release in JSB_closeWindow
2016-07-06 13:55:18 +08:00
cf2646b7a2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-06 02:16:03 +00:00
bed4e048b6
Fix various typos
2016-07-06 08:27:39 +09:00
e4aa6d1ef7
Merge pull request #16035 from minggo/issue-16032
...
remove extra '\'
2016-07-05 14:22:19 +08:00
1c9ad5594c
remove extra '\'
2016-07-05 09:50:38 +08:00
934b2413dc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 01:40:35 +00:00
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
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
f30a7cf546
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-03 05:14:11 +00:00
d02bdda781
Fix callfunc released with retained data (callback, target, extradata) issue
2016-07-01 10:56:17 +08:00
94de257115
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-01 02:16:32 +00:00
274a82c7f5
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16001 )
2016-06-29 22:56:13 +08:00
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
ef01ac4465
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-29 04:47:21 +00:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
d46cd96896
Don't warn user about API deprecation
2016-06-28 12:11:21 +08:00
e7e365a00f
Fix window.close crash in JSB
2016-06-28 11:59:55 +08:00
8cb2e93644
Fix easing action crash because the js object is not rooted
2016-06-24 14:38:59 +08:00
0dce4961ee
Avoid implicit conversion from size_t to int
2016-06-24 15:15:45 +09:00
86af4cdab8
Merge pull request #15897 from halx99/patch-4
...
luabindings: Add script with utf-8 bom support.
2016-06-24 09:58:41 +08:00
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
b7982fd8e0
Fix -Wreturn-type warnings when compiling JSB with Clang
2016-06-24 08:48:21 +09:00
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
90434e58d0
fix compile error.
2016-06-23 11:37:20 +08:00
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
710ab777dd
Some lua bindings fixes:
...
1) Reverts changes in #15443 , the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904 )
2016-06-22 17:48:17 +08:00
67dd4b0684
JSScript* may be garbage collected before the next time execute the same JS file.
...
It will crash in JS_ExecuteScript.
2016-06-22 16:18:20 +08:00
4a5bedc6e6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-22 05:52:51 +00:00
cffc9cecd7
cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this.
2016-06-22 11:05:04 +08:00
f41130bafe
luabindings: Add script with utf-8 bom support.
2016-06-21 14:31:25 +08:00
4c233b8df7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-17 02:22:58 +00:00
cc2b887dbb
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-16 02:58:46 +00:00
a348cbda8b
Move StringUtils functions from deprecated header file to ccUTF8.h ( #15835 )
...
* Move StringUtils functions outside of deprecated header
* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
7c4b7e1bf1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-15 02:49:50 +00:00
de5dd21ded
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-08 15:41:44 +09:00
cf80eb18b1
Merge pull request #15777 from pandamicro/v3
...
Fix scheduler callback target lost issue
2016-06-03 14:05:32 +08:00
5cd4c8aaca
Merge pull request #15778 from minggo/scriptingcore-issue
...
avoid to access invalid memory
2016-06-03 14:04:17 +08:00
b7b74f2328
avoid to access invalid memory when received data length is the same as buffer size
2016-06-03 11:39:01 +08:00
3597ce7c43
Fix scheduler callback target lost issue
2016-06-03 11:01:06 +08:00
612cd7b82f
Fixed behavior of "cc.isObject" function for undefined and null values. ( #15085 )
...
* Fixed wrong behavior of "cc.isObject" function for undefined and null values.
* Simplify 'cc.isObject' function
* Remove double return in 'cc.isObject'
2016-06-03 09:45:32 +08:00
c7c67144b7
Merge pull request #15769 from pandamicro/v3
...
Fix scheduler callback target lost issue
2016-06-03 09:29:01 +08:00
da114e13d1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-02 09:16:13 +00:00
d1e9a149c4
Fix scheduler callback target lost issue
2016-06-02 16:02:29 +08:00
6f79082c6a
Merge pull request #15754 from minggo/linux-compiling-error
...
use std::isnan instead of isnan to fix compiling errors
2016-05-31 09:22:05 +08:00
3810854c45
use std::isnan instead of isnan to fix compiling errors
2016-05-30 18:19:10 +08:00
4f0869e51e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-30 09:27:04 +00:00
7516db0fa8
Merge pull request #15734 from pandamicro/v3
...
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
127f718dfc
Merge pull request #15728 from mogemimi/remove-duplicate-includes
...
Remove duplicate header includes
2016-05-27 14:25:39 +08:00
80039c4aee
Merge pull request #15731 from minggo/jsb-debug-issue
...
fix the bug that will lost message if only received one message
2016-05-27 09:46:36 +08:00
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
1928d24bf0
Made templates support cc.view.setOrientation on web
2016-05-26 19:24:24 +08:00
3e941be0ce
fix actionNode studio 1.6 parser error
2016-05-26 17:20:51 +08:00
031e329d64
fix the bug that will lost message if only received one message
2016-05-26 16:32:10 +08:00
8692ee176c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/network/HttpAsynConnection-apple.m
cocos/network/HttpClient-android.cpp
cocos/network/HttpClient.cpp
cocos/network/HttpCookie.h
cocos/network/HttpRequest.h
cocos/network/HttpResponse.h
cocos/network/SocketIO.cpp
cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
2c05ecc3cd
Fix Component event issue
2016-05-25 18:36:02 +08:00
c8c57696be
Merge pull request #15705 from minggo/jsb-debug-issue
...
lock mutext to get element from g_queue
2016-05-25 13:55:34 +08:00
fff7a78efe
lock mutext to get element from g_queue
2016-05-24 15:59:00 +08:00
38fd8ebca9
Fix typo in function name: Keybard -> Keyboard
2016-05-24 10:14:36 +09:00
b8e7f37eaf
Merge pull request #15640 from xpol/better-lua-print
...
Print as Lua 5.1 does and remove duplicate code.
2016-05-23 18:42:23 +08:00
9c0acf1e5d
Merge pull request #15619 from VisualSJ/v3_audio
...
audio search path (android)
2016-05-19 18:06:58 +08:00
3e396fedab
Merge pull request #15617 from pandamicro/v3
...
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
abe020e808
Merge pull request #15654 from minggo/ipv6-compatibility
...
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
88db5d3660
use AF_UNSPEC to support ipv6
2016-05-16 15:15:29 +08:00
CocosRobot