CocosRobot
dd880eedf7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17857 )
2017-05-23 10:17:48 +08:00
CocosRobot
a857ebe831
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17848 )
2017-05-22 16:47:08 +08:00
CocosRobot
1bfbf35026
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17830 )
2017-05-19 09:41:55 +08:00
Joshua Meng
cc21ff32bf
Issue #16188 : Fix lua-script Sprite:playAnimationOnce(animation, args) blink bug ( #17583 )
2017-05-10 17:37:38 +08:00
CocosRobot
e7a9ffb396
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17780 )
2017-05-05 11:11:06 +08:00
CocosRobot
ddb4dc893b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17733 )
2017-04-21 09:16:25 +08:00
minggo
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
CocosRobot
31c0e27b4b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17606 )
2017-03-29 14:23:15 +08:00
minggo
cab5195ad4
find .luac first ( #17572 )
2017-03-23 10:43:39 +08:00
CocosRobot
72d47c7f39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17566 )
2017-03-22 14:56:45 +08:00
CocosRobot
95921836ca
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17549 )
2017-03-20 09:39:41 +08:00
rh101
f8eccb9608
Added VS2017 support in project files ( #17548 )
...
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file
* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.
* Changed extension of CCStencilStateManager.hpp to .h
* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
CocosRobot
87b4d7d54d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17507 )
2017-03-15 16:23:50 +08:00
mogemimi
98d2236914
Prevent signed/unsigned mismatch ( #17468 )
2017-03-08 14:32:23 +08:00
CocosRobot
fb730b5395
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17456 )
2017-03-07 11:29:17 +08:00
CocosRobot
e08cbc1c39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17453 )
2017-03-07 09:45:23 +08:00
CocosRobot
b32c84f8c2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17449 )
2017-03-06 18:28:58 +08:00
CocosRobot
7dbfc85a8f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17430 )
2017-03-02 16:08:53 +08:00
James Chen
619e012d9b
[WebSocket] Adds support for getting url and server selected protocol ( #17381 )
...
* [WebSocket] Adds support for getting url and server selected protocol
* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
CocosRobot#Set
a3daaf3626
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-02-17 07:53:15 +00:00
CocosRobot
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
minggo
8cb299eb2b
fix lua binding string conversion ( #17367 )
...
* fix lua binding string conversion
In previous, the characters after \0 will be truncated.
* revert some unneeded modification
2017-02-15 09:27:10 +08:00
CocosRobot
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
CocosRobot
ced1009291
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17339 )
2017-02-10 14:14:16 +08:00
minggo
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
CocosRobot
85dbcc1638
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17332 )
2017-02-09 17:07:42 +08:00
minggo
8825a091bb
update spine to 3.5.35 ( #17331 )
...
* update spine to 3.5.35
* fix jsb compiling error
* fix lua compiling error
2017-02-09 16:57:42 +08:00
CocosRobot
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
mogemimi
75d2e76095
Fix minor typos in comments and docs ( #17294 )
2017-02-07 09:41:52 +08:00
CocosRobot
c1b4358d13
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17290 )
2017-02-06 16:31:09 +08:00
mogemimi
1d47ae7e90
Fix typo in function name ( #17253 )
2017-02-04 10:35:56 +08:00
CocosRobot#Set
bdcf461dc3
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-23 01:32:57 +00:00
minggo
690db56f44
Merge v3.14.1 ( #17231 )
...
* update cocos console to fix compiling error with Android Studio projects (#17129 ) (#17145 )
* fix crash if physics3d camera is not set (#17139 ) (#17144 )
* fix linking error with vs2015 (#17146 )
* fix issue #17116 & #17119 for v3.14.1
* tests cases
* better documentation
* doc: updates sprite doc
* Fix scale9sprite polygon info (#17161 )
* add guard code to Scale9Sprite
* add new test code
* Glfw linux issue (#17166 )
* purge glfw3 before installing glfw3.2
* purge glfw3 before installing glfw3.2
* Update web engine ref (#17169 )
* update version and release note (#17170 )
* issue ##17119 improved v3.14.1 (#17189 )
* update version (#17230 )
2017-01-20 09:59:30 +08:00
CocosRobot
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
minggo
00b9dcd62e
Lua custom handler ( #17211 )
...
* avoid crash if custom handler vector is empty
* simplify codes
2017-01-18 17:05:08 +08:00
mogemimi
888b985e0e
Fix variable name typo ( #17195 )
2017-01-16 11:21:34 +08:00
CocosRobot
21d57bfd39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17185 )
2017-01-16 11:20:39 +08:00
CocosRobot
f2114f36f8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17183 )
2017-01-13 14:04:11 +08:00
minggo
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
minggo
afb55253f1
fix dutch language value and add missing languages ( #17160 )
2017-01-11 14:04:45 +08:00
CocosRobot
90e0ab0c2e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17152 )
2017-01-11 10:49:48 +08:00
CocosRobot
91ae4b1c03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17143 )
2017-01-10 16:59:15 +08:00
CocosRobot#Set
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
CocosRobot
61170c69ee
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17103 )
2017-01-04 11:47:58 +08:00
CocosRobot
77d0e8292a
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17016 )
2016-12-15 10:03:04 +08:00
James Chen
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +08:00
CocosRobot
edca6862b9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17009 )
2016-12-14 09:37:46 +08:00
minggo
64994a2471
make it support .luac file too ( #16981 )
2016-12-09 17:52:45 +08:00
CocosRobot
77f5204877
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16972 )
2016-12-09 14:30:01 +08:00
CocosRobot#Set
5ef072de03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-05 01:43:54 +00:00
CocosRobot
f72b950465
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16926 )
2016-11-30 11:33:49 +08:00
CocosRobot
129838d960
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16896 )
2016-11-24 11:39:02 +08:00
CocosRobot
18204c1e37
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16880 )
2016-11-21 15:00:00 +08:00
CocosRobot
7c6f0598b2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16861 )
2016-11-18 09:27:20 +08:00
Tate Allen
f99dae383f
Fixed math error (issue #16837 ) in Lua function radian2angle ( #16848 )
2016-11-16 09:35:47 +08:00
CocosRobot
d0705d9e25
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16828 )
2016-11-09 17:33:47 +08:00
CocosRobot
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
CocosRobot
9eb177c6cc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16802 )
2016-11-03 15:29:09 +08:00
Bin Zhang
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
Paul Gardiner
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
CocosRobot#Set
57903077d0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-30 01:00:27 +00:00
CocosRobot
3ab1be61a7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16764 )
2016-10-28 10:13:57 +08:00
CocosRobot
44f6865697
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16750 )
2016-10-27 11:15:24 +08:00
niu2x
92af2b2b6f
bug fix ( #16747 )
2016-10-27 09:46:07 +08:00
Ricardo Quesada
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
mogemimi
5b8919829c
Fix typos in local variables ( #16712 )
2016-10-20 18:17:37 +08:00
Paul Gardiner
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
CocosRobot
23ff5fc51f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16676 )
2016-10-11 11:40:11 -07:00
Ricardo Quesada
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
CocosRobot#Set
f280ed2cdb
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-11 01:51:00 +00:00
9b9387
0c8376411e
Update GuiConstants.lua ( #16666 )
...
- fixed PageView constant
2016-10-10 13:56:42 +08:00
Paul Gardiner
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
mogemimi
868e6f62c5
Fix typos in doc: accpetable / accepteable -> acceptable ( #16641 )
2016-10-04 22:08:56 -07:00
CocosRobot
c046257efc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16630 )
2016-09-30 09:44:34 +08:00
minggo
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
mogemimi
e8c3082229
Move skipBOM function outside to prevent shadowing warning ( #16585 )
2016-09-20 14:52:15 +08:00
colajam93
e7f739897c
Fix deprecated warning ( #16592 )
2016-09-20 14:48:00 +08:00
mogemimi
91cdb3394b
Suppress warning C4101 on MSVC ( #16573 )
2016-09-14 10:49:14 -07:00
CocosRobot
7410bdd981
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16563 )
2016-09-12 10:03:21 +08:00
CocosRobot
ced81f3527
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16554 )
2016-09-12 09:46:19 +08:00
mogemimi
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
Allen Lee
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
CocosRobot
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
CocosRobot
8947ff722e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16514 )
2016-09-05 13:48:58 +08:00
CocosRobot
6f4551cdad
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16513 )
2016-09-05 10:19:41 +08:00
CocosRobot
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
minggo
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
minggo
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
CocosRobot
ee4d59cf76
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16454 )
2016-08-29 11:48:21 +08:00
9b9387
e124fe4fc5
Update CCBProxy.cpp ( #16421 )
...
fixed bug
2016-08-23 14:48:06 +08:00
minggo
e9a5a4e2bd
Revert luajit ( #16397 )
...
* revert to use lua
* comment lua bytecode test
* update release note
2016-08-19 11:49:19 +08:00
CocosRobot
d09ee83c5a
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16395 )
2016-08-19 09:36:50 +08:00
CocosRobot
7540a64fd8
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16370 )
2016-08-16 16:56:06 +08:00
James Chen
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
CocosRobot
7f222c92e0
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16360 )
2016-08-15 10:53:07 +08:00
JaryGuo
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
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
CocosRobot
aac49e35e1
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16284 )
2016-07-31 22:50:28 +08:00
CocosRobot
c5923e00ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16261 )
2016-07-29 13:40:46 +08:00
CocosRobot
af1783364b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-29 01:43:11 +00:00
CocosRobot
6b3454e9c6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-27 20:38:57 +00:00
CocosRobot
9566a0cb24
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 02:06:58 +00:00
CocosRobot
e0abb981d5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 09:39:34 +00:00
mogemimi
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
mogemimi
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
mogemimi
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
CocosRobot
cbcbeb96b3
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-18 06:20:59 +00:00
Ricardo Quesada
1824b21cb7
Merge pull request #16090 from ricardoquesada/issue_15566
...
fixes issue #15566
2016-07-12 21:36:52 -07: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
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
CocosRobot
3aeefd911e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-11 07:54:54 +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
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +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
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
CocosRobot
8fe92fbd4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-07 19:04:04 +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
CocosRobot
cf2646b7a2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-06 02:16:03 +00:00
CocosRobot
934b2413dc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 01:40:35 +00:00
CocosRobot
f30a7cf546
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-03 05:14:11 +00:00
CocosRobot
94de257115
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-01 02:16:32 +00:00
CocosRobot
274a82c7f5
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16001 )
2016-06-29 22:56:13 +08:00
CocosRobot
ef01ac4465
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-29 04:47:21 +00:00
minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
minggo
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
halx99
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
mogemimi
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
halx99
90434e58d0
fix compile error.
2016-06-23 11:37:20 +08:00
halx99
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
James Chen
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
CocosRobot
4a5bedc6e6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-22 05:52:51 +00:00
James Chen
cffc9cecd7
cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this.
2016-06-22 11:05:04 +08:00
halx99
f41130bafe
luabindings: Add script with utf-8 bom support.
2016-06-21 14:31:25 +08:00
CocosRobot
4c233b8df7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-17 02:22:58 +00:00
CocosRobot
cc2b887dbb
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-16 02:58:46 +00:00
CocosRobot
7c4b7e1bf1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-15 02:49:50 +00:00
mogemimi
de5dd21ded
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-08 15:41:44 +09:00
CocosRobot
da114e13d1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-02 09:16:13 +00:00
CocosRobot
4f0869e51e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-30 09:27:04 +00:00
Xpol Wan
a7d9dd9a75
Print as Lua 5.1 does and remove duplicate code.
2016-05-14 14:09:58 +08:00
minggo
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
Naoyuki Totani
04ebba425f
add missing lua const values
2016-05-07 16:23:23 +09:00
CocosRobot
d72fadf6cc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-06 05:44:31 +00:00
CocosRobot
0445e7c562
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-05 03:07:58 +00:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
dualface
2901f0aea6
fix display.wrapScene()
2016-05-03 21:37:15 +08:00
CocosRobot
198acb9466
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-28 01:56:50 +00:00
zilongshanren
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
CocosRobot
29da95494e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 03:47:27 +00:00
CocosRobot
361e054d6d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 07:07:41 +00:00
CocosRobot
f4c9ea3902
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 01:54:49 +00:00
CocosRobot
a9184f1047
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-20 09:31:06 +00:00
Xpol Wan
bd263d6be4
Fixes deprecated warnings
...
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
xpol
24db45e925
Fixes some warnings in Lua manual bindings. ( #15443 )
...
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
2016-04-18 16:35:50 +08:00
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
CocosRobot
7d9946a9cc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-11 09:56:18 +00:00
CocosRobot
dfe3dc5e14
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-07 07:46:49 +00:00
mogemimi
985155749b
Remove unnecessary const from return types in PU and Lua
2016-04-06 12:36:20 +09:00
mogemimi
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
CocosRobot
6e12d8c98a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-22 12:58:39 +00:00
Xpol Wan
ae3fbcce79
Manually fixes include path for generated code.
2016-03-22 16:08:28 +08:00
Xpol Wan
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
CocosRobot
35645d8c26
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-22 06:24:54 +00:00
CocosRobot
97130dc084
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-21 12:56:42 +00:00
Xpol Wan
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
CocosRobot
e2f820df25
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-18 09:11:18 +00:00
CocosRobot
c250ac8bfd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 05:53:10 +00:00
zilongshanren
d6f9ed93d6
add bindings
2016-03-17 11:56:48 +08:00
CocosRobot
69960024e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 03:42:52 +00:00
CocosRobot
16edf90f70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 14:40:00 +00:00
CocosRobot
e31c918264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-04 08:14:39 +00:00
CocosRobot
169a81c6ea
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-03 07:57:25 +00:00
zilongshanren
859aadd5e9
Revert "[ci skip][AUTO]: updating luabinding & jsbinding automatically"
2016-03-02 14:10:40 +08:00
CocosRobot
6e0887b2c9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-02 03:38:29 +00:00
CocosRobot
56fa8fa759
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-01 00:27:33 +00:00
Ricardo Quesada
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 09:37:24 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Feb 27 01:11:13 2016 -0800
correct paths for win8.1
commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 22:46:58 2016 -0800
projects works on win32
commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:57:10 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:26:55 2016 -0800
trying to make it compile on win32
commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 10:28:12 2016 -0800
quick hack to make it compile...
...autogenerated files will fix it.
commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 09:20:59 2016 -0800
Squashed commit of the following:
commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 20:10:13 2016 -0800
compiles.. sort of
commit a7990e2888d5ef1e43b811148b23c0b899105ab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:55:24 2016 -0800
more chipmunk fixes
commit 1174f6ec8201324161d7946af0f493b136a56690
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:36:15 2016 -0800
more chipmunk fixes
commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
Merge: f942c5a 0594d3c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:29:27 2016 -0800
Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed
commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:28:51 2016 -0800
correct path for chipmunk
commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 18:44:05 2016 -0800
compiles on ios
commit 379503399c384ad77d25d68a2f83b71a829b1c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:51:36 2016 -0800
chipmunk include fixes
commit 95839fb7b406a32255853294b016d8c15aec1ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:09:04 2016 -0800
fixes for cmake + mac
commit 39449ea3b7efccae2946785c1c11433d964ee480
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:51:25 2016 -0800
correct includes
commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:35:40 2016 -0800
fixes chipmunk with cmake
commit 337f21f9466703722847635301d841ace9b757cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:42:01 2016 -0800
updates android and linux projects
commit 7111a9993b97f78cf73206804b25665c21a59ca8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:18:26 2016 -0800
cosmetic changes
commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:53:41 2016 -0800
chipmunk autogenerated files
commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:47:41 2016 -0800
compatibility both in JS (to reduce space)
and in C for (C++ users)
commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:10:02 2016 -0800
mooooore fixes
commit 9ab23014093677e8eda69b105f50410b8c792aa3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:30:58 2016 -0800
doesn't crash with collision handler
commit 69275a16817a038244bbaaff9e82a011b6729cb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:16:29 2016 -0800
adds missing space functions
commit a6b97bbc76cb9ab293356bb7451cfa858353f589
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 22:22:27 2016 -0800
queries... better
commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 19:48:41 2016 -0800
adds more missing functions
fixes other chipmunk JS issues
commit 3797a033896d059da58a05ce0de832ed9c150eff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 18:30:21 2016 -0800
yep... poly works ok
commit d1bb57776891605b9d3e4fb90736c6869d96b944
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:29 2016 -0800
neede compat files
commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:04 2016 -0800
query working!
commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:57:03 2016 -0800
almost there
commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:18:46 2016 -0800
fixes return values
commit 7218778da846e1e36a510c0a19a5ee76f91db032
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 20:36:14 2016 -0800
cpMomentForSegment is manual since parameter 4 is optional
in chipmunk 6, but not in 7
commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 17:29:28 2016 -0800
yeah... process the arguments correctly
works both for functions and auto_classes
commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 16:49:00 2016 -0800
compiles and links
fixes some issues with the queries.
returns shapes instad of the queryInfo
commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 15:03:18 2016 -0800
adds removeCollisionHandler and other fixes
commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 18 20:59:24 2016 -0800
compiles... doesn't work yet
commit bd64de81713fb2d7652a538d667d73f05f5d9320
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 17 18:17:39 2016 -0800
WIP: chipmunk bindings
2016-02-29 13:53:00 -08:00
CocosRobot
78c99e33e9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-26 02:11:26 +00:00
CocosRobot
9a11556f4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-25 06:01:49 +00:00
CocosRobot
b2fd4b0c32
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-19 02:19:55 +00:00
肖峰
4e501149a3
Fix lua-test link error under linux
2016-02-18 10:53:33 +08:00
CocosRobot
4d7186f5bd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-16 09:07:51 +00:00
CocosRobot
f1f0a7130f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-14 06:53:19 +00:00
CocosRobot
89c0c801b0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-11 13:40:35 +00:00
Ricardo Quesada
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 14:08:49 2016 -0800
Merge branch 'v3' into uniform_matrix_auto
commit d6c37297954af752ebf42ec5f71e5e2fe28c9cc2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 13:54:07 2016 -0800
works ok...
commit 45c288631989ea735cc31ec5aa683d9d41aacab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 12:58:34 2016 -0800
quad works!
commit 7137cff51df09adee7129738cea2b69da090756e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 3 16:19:34 2016 -0800
more optimizations... WIP... doesn't work yet
commit a8324c1a9acb6b82102e05eee6e5e5f341306c7b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 21:59:42 2016 -0800
compiles in release mode
more tests... better threshold
commit 884ffc756e7520fcbb9252260181538ec81b8368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 17:21:32 2016 -0800
initial uniform_auto_matrix commit
Changes the CC_matrix uniform in runtime depending on whether the command can be batched or not.
Lot of things missing, though... like performance tests.
2016-02-08 11:25:37 -08:00
mogemimi
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
CocosRobot
330751a150
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-03 09:50:03 +00:00
CocosRobot
4ab9ffff4f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-01 06:34:11 +00:00
CocosRobot
346144742f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-28 04:01:53 +00:00
zilongshanren
366407ca1c
fix win32 compile issue
2016-01-27 20:21:32 +08:00
zilongshanren
bc44769b8b
add more deprecated functions
2016-01-25 18:14:48 +08:00
zilongshanren
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
CocosRobot
039286f814
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-22 14:25:59 +00:00
CocosRobot
4dab20b715
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-21 02:37:23 +00:00
CocosRobot
b340e48cb1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 10:21:41 +00:00
Ricardo Quesada
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
mogemimi
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
XiaoFeng
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00