XiaoYang
4da55d1686
Merge pull request #360 from songchengjiang/v3
...
modify interfaces of Animate3DCallback
2015-07-15 17:56:22 +08:00
songchengjiang
282dc23bb2
modify interfaces of Animate3DCallback
2015-07-15 17:34:14 +08:00
pandamicro
bcd20b1bf0
Merge pull request #12861 from pandamicro/v3
...
Sync Cocos2d-x v3.7 RC1
2015-07-15 17:16:44 +08:00
pandamicro
95a7afcd36
Merge pull request #12862 from CocosRobot/update_lua_bindings_1436948312
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 17:16:31 +08:00
Jacky
e4b392d4c8
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-15 16:27:29 +08:00
CocosRobot
be71b6d563
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 08:23:23 +00:00
子龙山人
b2d83350ff
Merge pull request #12860 from zilongshanren/fix-scale9sprite-gray
...
fixed Scale9Sprite gray state issue.
2015-07-15 16:15:32 +08:00
pandamicro
99e504e668
Merge pull request #12854 from yangws/issue_11310
...
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
pandamicro
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
andyque
2f31f6baa6
fixed Scale9Sprite gray state issue.
...
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.
This commit reset the shader state.
2015-07-15 14:35:13 +08:00
子龙山人
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
pandamicro
3c08b497ba
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-15 14:26:19 +08:00
pandamicro
7f7cf92da3
Update bindings-generator
2015-07-15 14:21:47 +08:00
pandamicro
650f045192
Merge pull request #12858 from pandamicro/v3.7-release
...
[ci skip]Update requirements info
2015-07-15 14:15:26 +08:00
pandamicro
0064dfbc71
Update requirements info
2015-07-15 14:11:59 +08:00
子龙山人
dcf0d9bf45
Merge pull request #12855 from CocosRobot/update_lua_bindings_1436938954
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 14:06:17 +08:00
Jacky
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
CocosRobot
4b418fe823
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 05:46:42 +00:00
子龙山人
f476169f6f
Merge pull request #12853 from zilongshanren/remove-warning-xcode7
...
fix tons of warnings in Xcode7
2015-07-15 13:39:28 +08:00
Vincent Yang
7a105ce1e1
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 12:09:08 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
yangxiao
69e79ed164
fix #10242 , reload shader when light number changed
2015-07-15 11:36:53 +08:00
XiaoYang
3a6c84dd32
Merge pull request #358 from songchengjiang/v3
...
fix issue#9310 issue#10151 issue#12551
2015-07-15 11:22:16 +08:00
songchengjiang
6c83e8d81c
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2015-07-15 11:13:27 +08:00
子龙山人
49b39bb9c5
Merge pull request #12851 from zilongshanren/v3
...
[ci skip]fix win32&win8.1 template compile
2015-07-15 10:04:03 +08:00
andyque
15b0fea530
fix win32&win8.1 template compile
2015-07-15 10:00:35 +08:00
pandamicro
1e84b8c156
Merge pull request #12850 from pandamicro/v3.7-release
...
[ci skip] v3.7 rc1 release doc
2015-07-14 23:24:30 +08:00
pandamicro
d768df51ed
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release
2015-07-14 23:22:54 +08:00
pandamicro
c126aac35f
v3.7 rc1 release doc
2015-07-14 23:21:34 +08:00
Mazyad Alabduljaleel
008a5ef89c
replaced tabs with whitespace
2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel
6f8bc04934
First commit for improving iOS EditBox
...
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
2015-07-14 16:18:03 +03:00
pandamicro
b49054876c
Merge pull request #12846 from VisualSJ/v3.7-release-parser
...
[ci skip] update we index
2015-07-14 18:23:29 +08:00
VisualSj
909ff57231
update we index
2015-07-14 18:21:03 +08:00
pandamicro
373ab0e5b8
Merge pull request #12844 from CocosRobot/update_cocosfiles_1436868917
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-14 18:16:35 +08:00
CocosRobot
3ba4d7230e
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-14 10:15:18 +00:00
pandamicro
b6c02cb0ea
Merge pull request #12843 from natural-law/v3.7-release
...
[ci skip] Update the JS templates to keep the directory structure is same with before.
2015-07-14 18:13:46 +08:00
Bin Zhang
55890f6206
Update the JS templates to keep the directory structure is same with before.
2015-07-14 18:07:17 +08:00
pandamicro
eb56ad6d60
Merge pull request #12836 from pandamicro/v3.7-release
...
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 17:37:00 +08:00
pandamicro
a90a8b12c6
Merge pull request #12840 from pandamicro/path
...
[ci skip] Add cc.path.mainFileName
2015-07-14 16:41:16 +08:00
子龙山人
49b47f576d
Merge pull request #12828 from WenhaiLin/v3-label-readability
...
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
子龙山人
7e4e82da2c
Merge pull request #12835 from zilongshanren/improve-coding-style
...
add more descriptive message to ASSET macro.
2015-07-14 16:36:59 +08:00
子龙山人
af4442d0d6
Merge pull request #12833 from fusijie/v3
...
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
pandamicro
41778f35fb
Add cc.path.mainFileName
2015-07-14 16:33:38 +08:00
子龙山人
8dad9cdbbd
Merge pull request #12839 from zilongshanren/v3
...
[ci skip]add cocos framework android build on linux platform.
2015-07-14 16:32:38 +08:00
andyque
97168fa139
add cocos framework build on linux platform.
2015-07-14 16:25:54 +08:00
pandamicro
658fe74141
Merge pull request #12838 from VisualSJ/v3.7-release-parser
...
[ci skip] Remove getRes (parser)
2015-07-14 16:20:42 +08:00
pandamicro
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
VisualSj
a9deb6dda5
Remove getRes (parser)
2015-07-14 15:26:13 +08:00
pandamicro
48376db17a
Merge pull request #12832 from pandamicro/jsb_loader_fix
...
Fix jsb loader
2015-07-14 15:25:24 +08:00