minggo
|
fa95bda629
|
[ci skip]
|
2014-08-20 11:23:50 +08:00 |
minggo
|
d91dc842de
|
Merge pull request #7822 from Teivaz/v3_WP8
Added method for custom precompiled shader program loading in WP8
|
2014-08-20 11:22:26 +08:00 |
teivaz
|
0e5a79d486
|
+ [WP8] Added method for custom precompiled shader program loading
|
2014-08-20 12:02:16 +03:00 |
minggo
|
2c4fe854fb
|
[
|
2014-08-20 10:28:48 +08:00 |
minggo
|
84f2e248d1
|
Merge pull request #7823 from newnon/v3_Label_fix
Label performance problem
|
2014-08-20 10:28:01 +08:00 |
minggo
|
2fe45ec6cc
|
[ci skip]
|
2014-08-20 10:26:53 +08:00 |
minggo
|
2b709f92bb
|
Merge pull request #7816 from xiangxw/fix_sendPrompt
fix sendPrompt()
|
2014-08-20 10:25:30 +08:00 |
lvlong
|
93ee44c912
|
format code
|
2014-08-20 10:24:46 +08:00 |
minggo
|
74fba21fc0
|
Merge pull request #7825 from 2youyouo2/v3
remove cascade color for CorlorFrame
|
2014-08-20 10:23:15 +08:00 |
minggo
|
41905cb4c0
|
Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue
fix pageView touch location
|
2014-08-20 10:11:59 +08:00 |
andyque
|
9a3c2dc6a4
|
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-20 09:56:16 +08:00 |
minggo
|
83ccfa0faa
|
[ci skip]
|
2014-08-20 09:50:39 +08:00 |
minggo
|
eecaac3384
|
[ci skip]
|
2014-08-20 09:48:39 +08:00 |
minggo
|
2682efd119
|
Merge pull request #7824 from newnon/v3_setKeepScreenOn
setKeepScreenOn method
|
2014-08-20 09:46:36 +08:00 |
andyque
|
07eb0d373c
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
cocos/ui/Android.mk
|
2014-08-20 09:32:29 +08:00 |
samuele3hu
|
abf6a8b128
|
Update Xcode project configure
|
2014-08-19 22:54:57 +08:00 |
lite3
|
abc06cabac
|
Merge branch 'v3' into customguireader
|
2014-08-19 20:47:49 +08:00 |
Sergey
|
055a143f9d
|
Label performance problem
|
2014-08-19 15:02:09 +04:00 |
Sergey
|
bfe6513706
|
setKeepScreenOn method
|
2014-08-19 15:00:58 +04:00 |
samuele3hu
|
cddb6c9fbd
|
Integrate all module into cocos2d on the iOS/Mac platform
|
2014-08-19 18:00:34 +08:00 |
andyque
|
a8ab1a85b7
|
fix linux compile error
|
2014-08-19 17:42:17 +08:00 |
Sergey
|
b7fa3624cf
|
stopAllActionsByTag test
|
2014-08-19 13:31:19 +04:00 |
minggo
|
18cc62d16d
|
Merge pull request #7821 from Teivaz/v3
[WP8] Fixed default search path
|
2014-08-19 16:59:12 +08:00 |
teivaz
|
0e7ec265ee
|
* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"
|
2014-08-20 11:54:41 +03:00 |
minggo
|
49c6d1e746
|
Merge pull request #7819 from minggo/androidmk-optimize
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 16:11:40 +08:00 |
minggo
|
e9b5e34b0f
|
Merge pull request #7820 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-08-19 15:37:20 +08:00 |
minggo
|
cdd67be77a
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
yangxiao
|
54423efe9f
|
fix reskin
|
2014-08-19 15:25:00 +08:00 |
zhangbin
|
dab6e5fb70
|
Update the reference of submodule cocos2d-console.
|
2014-08-19 15:21:43 +08:00 |
kaile.yin
|
d884054ec9
|
remove cascade color for CorlorFrame
|
2014-08-19 15:19:47 +08:00 |
andyque
|
534938d88c
|
fix linux compile error
|
2014-08-19 15:17:48 +08:00 |
andyque
|
deb7ff64d4
|
fix pageView touch location
|
2014-08-19 15:14:07 +08:00 |
XiaoYang
|
9f444b7010
|
Merge pull request #104 from liuliang2004/Meshv3
Modification is compatible with the old model
|
2014-08-19 14:32:05 +08:00 |
liuliang
|
94be97f724
|
Modify change interface
|
2014-08-19 14:30:27 +08:00 |
liuliang
|
06dfaf9db5
|
Modify change interface
|
2014-08-19 14:21:48 +08:00 |
liuliang
|
9d3bab3810
|
Modification is compatible with the old model
|
2014-08-19 14:03:41 +08:00 |
yangxiao
|
5cf30a363c
|
remove unused code
|
2014-08-19 13:54:06 +08:00 |
yangxiao
|
289b04a2ae
|
merge cocos2d
|
2014-08-19 13:19:42 +08:00 |
yangxiao
|
b2d43a4167
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-19 11:56:21 +08:00 |
yangxiao
|
f2729c7ef2
|
cache work
|
2014-08-19 11:56:09 +08:00 |
xiangxw
|
bef6a2a7f1
|
fix sendPrompt()
a extra '\0' will be sent when sizeof() is used
|
2014-08-19 11:46:30 +08:00 |
andyque
|
8d1c422ac5
|
merge extension EditBox to ui module
|
2014-08-19 10:28:24 +08:00 |
minggo
|
de004e80c2
|
[ci skip]
|
2014-08-19 09:53:18 +08:00 |
minggo
|
dd1bc70cde
|
Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
bug on began touch - prevpoint
|
2014-08-19 09:49:01 +08:00 |
minggo
|
b25ddb8935
|
Merge pull request #7814 from Teivaz/v3
Fixed WP8 cocos library project and profiling macros
|
2014-08-19 09:31:20 +08:00 |
teivaz
|
ebb0876d29
|
* [WP8] Fixed resource search path in template
|
2014-08-19 21:44:46 +03:00 |
teivaz
|
5cdbf4c04c
|
* [WP8] Fixed paths in template
|
2014-08-19 19:57:06 +03:00 |
teivaz
|
db805ee2c8
|
* Fixed WP8 cocos library project
* Fixed profiling macros
|
2014-08-19 19:24:56 +03:00 |
minggo
|
b45c2e9b12
|
Merge pull request #7813 from CocosRobot/update_lua_bindings_1408375483
[AUTO]: updating luabinding automatically
|
2014-08-18 23:28:32 +08:00 |
CocosRobot
|
4236e89245
|
[AUTO]: updating luabinding automatically
|
2014-08-18 15:26:32 +00:00 |