ZhangMenghe
|
3396da508f
|
pageTurnDown in WebGL testCase
|
2015-07-13 12:45:07 +08:00 |
子龙山人
|
e162edd867
|
Merge pull request #12727 from andyque/improve-template-dialy-build
[ci skip]fix ios/mac/win32/win8.1 compile error
|
2015-07-08 07:37:41 +08:00 |
andyque
|
dda07bebf5
|
fix ios/mac/win32/win8.1 compile error
|
2015-07-08 07:36:26 +08:00 |
子龙山人
|
d02da9d2f2
|
Merge pull request #12725 from andyque/improve-template-dialy-build
[ci skip]change sign team to none.
|
2015-07-07 22:03:22 +08:00 |
andyque
|
451bedbaad
|
change sign team to none.
|
2015-07-07 22:02:35 +08:00 |
子龙山人
|
a567b7b795
|
Update Authors
|
2015-07-07 17:52:58 +08:00 |
子龙山人
|
26db4c38ab
|
Merge pull request #12722 from andyque/improve-template-dialy-build
[ci skip]minor improvements of template daily build
|
2015-07-07 16:57:40 +08:00 |
andyque
|
a18116aaa4
|
minor improvements
|
2015-07-07 16:56:38 +08:00 |
子龙山人
|
71158eba44
|
Merge pull request #12721 from andyque/improve-template-dialy-build
[ci skip]Improve template dialy build
|
2015-07-07 16:54:54 +08:00 |
andyque
|
0ca645f744
|
add runtime daily build script
|
2015-07-07 16:54:03 +08:00 |
andyque
|
47bae38168
|
finish template daily build
|
2015-07-07 16:27:38 +08:00 |
andyque
|
04ade7c16e
|
remove xcode scheme
|
2015-07-07 14:57:25 +08:00 |
pandamicro
|
8f0cf8c3e6
|
Merge pull request #12575 from ywxzm/v3
fix onTouch begin don't return value
|
2015-07-07 14:57:13 +08:00 |
andyque
|
a5115bd739
|
improve
|
2015-07-07 14:34:02 +08:00 |
andyque
|
494036be1a
|
fix linux build
|
2015-07-07 14:34:02 +08:00 |
andyque
|
d8bf9c8a2a
|
improve template daily build scripts
|
2015-07-07 14:34:02 +08:00 |
子龙山人
|
1b9b741068
|
Merge pull request #12719 from andyque/add-scheme-to-templates
[ci skip]add shared scheme to iOS & Mac project.
|
2015-07-07 14:27:09 +08:00 |
andyque
|
302976b603
|
add shared scheme to iOS & Mac project.
|
2015-07-07 14:24:17 +08:00 |
pandamicro
|
71ca511c81
|
Merge pull request #12716 from CocosRobot/update_lua_bindings_1436248841
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 14:14:58 +08:00 |
CocosRobot
|
4a486077c0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 06:05:39 +00:00 |
子龙山人
|
f28fbdd0c4
|
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
Add scroll bar feature into ScrollView
|
2015-07-07 13:56:09 +08:00 |
pandamicro
|
5970f56e1f
|
Merge pull request #12714 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:55:12 +08:00 |
VisualSj
|
dd0edac171
|
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:36:47 +08:00 |
子龙山人
|
cdaa994b84
|
Merge pull request #12711 from yangws/issue_12626
Fix bug taken from pr12602: scroll view can't scroll if pressed the b…
|
2015-07-07 13:33:24 +08:00 |
子龙山人
|
01d388c16a
|
Merge pull request #12710 from andyque/v3
merge v3.7 back to v3
|
2015-07-07 13:33:06 +08:00 |
Vincent Yang
|
b4559a005b
|
Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it.
|
2015-07-07 10:42:04 +08:00 |
andyque
|
6238ddebf3
|
Merge remote-tracking branch 'upstream/v3.7-release' into v3
|
2015-07-07 10:18:43 +08:00 |
子龙山人
|
a6b29666c9
|
Merge pull request #12674 from WenhaiLin/v3-38-issue12673
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
|
2015-07-07 09:50:00 +08:00 |
pandamicro
|
e73906a119
|
Merge pull request #12707 from pandamicro/v3.7-release
[ci skip][Simulator JSB] Fix issue caused by video and web view binding
|
2015-07-07 09:48:42 +08:00 |
子龙山人
|
de64dbfbb1
|
Merge pull request #12703 from CocosRobot/update_lua_bindings_1436229517
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 09:43:45 +08:00 |
pandamicro
|
a9f98aefea
|
[Simulator JSB] Fix issue caused by video and web view binding
|
2015-07-07 09:38:38 +08:00 |
CocosRobot
|
4c88db3fb2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 00:44:47 +00:00 |
Ricardo Quesada
|
ed7a841dec
|
Merge pull request #12702 from ricardoquesada/xcode_7_bug_fixes
compiles on Xcode 7
|
2015-07-06 17:30:40 -07:00 |
Ricardo Quesada
|
ad1fc88fa8
|
compiles on Xcode 7
|
2015-07-06 16:30:29 -07:00 |
Ricardo Quesada
|
df3aa84481
|
Merge pull request #12701 from ricardoquesada/cmake-no-exceptions
removes -fno-excpetion and -fexception from cmake
|
2015-07-06 13:28:14 -07:00 |
Ricardo Quesada
|
4c88be9520
|
removes -fno-excpetion and -fexception from cmake
|
2015-07-06 12:09:50 -07:00 |
子龙山人
|
6005c42892
|
Merge pull request #12700 from CocosRobot/update_lua_bindings_1436178667
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 21:25:34 +08:00 |
CocosRobot
|
a4bce56cca
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 10:37:24 +00:00 |
子龙山人
|
89d40c164e
|
Merge pull request #12697 from jianglong0156/add-remove-key-api
add UserDefault api deleteValueForKey
|
2015-07-06 18:27:04 +08:00 |
子龙山人
|
06ea3dce20
|
Merge pull request #12696 from andyque/improve-template-dialy-build
[ci skip]fix python syntax error
|
2015-07-06 17:10:28 +08:00 |
andyque
|
92585d3a8e
|
fix python syntax error
|
2015-07-06 17:09:55 +08:00 |
jianglong0156
|
6f3b977c1e
|
add UserDefault api deleteValueForKey
|
2015-07-06 17:01:17 +08:00 |
子龙山人
|
b2c83b6038
|
Merge pull request #12695 from andyque/improve-template-dialy-build
add framework daily build scripts
|
2015-07-06 17:00:10 +08:00 |
andyque
|
881a388892
|
add framework daily build scripts
|
2015-07-06 16:43:37 +08:00 |
子龙山人
|
faab927f1b
|
Merge pull request #12693 from CocosRobot/update_lua_bindings_1436170966
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 16:36:44 +08:00 |
CocosRobot
|
ae860bd6ee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 08:29:03 +00:00 |
子龙山人
|
17207f14e5
|
Merge pull request #12689 from fusijie/refine_setAnimationInterval
Refine setAnimationInterval from double to float.
|
2015-07-06 16:18:45 +08:00 |
Jacky
|
4499b60446
|
Refine setAnimationInterval from double to float.
|
2015-07-06 14:57:42 +08:00 |
Neo Kim
|
a01f31c75c
|
Change NULL to nullptr
|
2015-07-06 15:54:28 +09:00 |
Neo Kim
|
69a4a438bb
|
Change Xcode project configurations to use spaces instead of tab as indentation.
|
2015-07-06 14:54:41 +09:00 |