pipu
|
ab969db441
|
Modifying ImageViewReader, UIImageView
|
2014-10-11 15:43:37 +08:00 |
pipu
|
29eb552d00
|
1. Modifying ButtonReader
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
|
2014-10-11 15:35:09 +08:00 |
pipu
|
583a756d33
|
Reverting build/cocos2d-win32.vc2012.sln
Reverting cocos/2d/libcocos2d.vcxproj
|
2014-10-11 14:13:56 +08:00 |
pipu
|
9ba51a1909
|
Reverting cocos/scripting/lua-bindings/auto/*.*
|
2014-10-11 13:49:56 +08:00 |
pipu
|
8b61c4677f
|
Deleting cocos/scripting/lua-bindings/auto/*.*
|
2014-10-11 12:09:11 +08:00 |
pipu
|
b732ce378e
|
Merge branch 'v3_pipu_protocol_buffers' into merge_test
Conflicts:
cocos/ui/UIScale9Sprite.cpp
|
2014-10-11 11:08:46 +08:00 |
minggo
|
fdf405a17c
|
Merge pull request #8637 from dualface/migrate_lua_to_project_src
Migrate Deprecated Lua API from Luabinding of modules to folder src/cocos
|
2014-10-11 10:14:56 +08:00 |
Ricardo Quesada
|
e03fb86990
|
one more fix, oops
|
2014-10-10 18:28:05 -07:00 |
Ricardo Quesada
|
3cd2163558
|
more win fixes
|
2014-10-10 18:21:15 -07:00 |
Ricardo Quesada
|
ee3086ff8d
|
compiler fixes for windows
|
2014-10-10 17:41:11 -07:00 |
dualface
|
20cbbfdbe5
|
update luabinding scripts
|
2014-10-11 02:51:58 +08:00 |
dualface
|
68f71b3df4
|
do not load deprecated Lua API from luabinding of modules
|
2014-10-10 23:59:41 +08:00 |
pipu
|
ffd83bbdd0
|
Modifying win32 and wp8 protocol buffers lib
|
2014-10-10 22:38:34 +08:00 |
minggo
|
4d084496a3
|
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
added LuaStack::loadChunksFromZIP()
|
2014-10-10 22:14:55 +08:00 |
minggo
|
09616d68d9
|
Merge pull request #8628 from andyque/ficChipmunkLinuxCompile
try to fix ubuntu 12.04 compile error
|
2014-10-10 22:14:33 +08:00 |
pipu
|
efe22a0dd7
|
Modifying protocol buffers for win32 version
|
2014-10-10 21:55:59 +08:00 |
minggo
|
4a193c6d76
|
Merge pull request #8554 from newnon/v3_scale9sprite_capinets_fix
Scale9Sprite capInsets set fix
|
2014-10-10 18:05:32 +08:00 |
andyque
|
ad1e44a254
|
try to fix ubuntu 12.04 compile error
|
2014-10-10 17:27:15 +08:00 |
CocosRobot
|
53cde3f3b2
|
[AUTO]: updating luabinding automatically
|
2014-10-10 08:39:46 +00:00 |
minggo
|
63e4d7ce27
|
Merge pull request #8614 from andyque/fixEditBoxMaxLengthOnMac
fix setMaxLength issue of EditBox-mac
|
2014-10-10 16:28:21 +08:00 |
minggo
|
4b7d5694b8
|
Merge pull request #8573 from Dhilan007/v3-labelatlas
fix #8569: LabelAtlas opacity do not change when setting parent node's opacity
|
2014-10-10 15:52:50 +08:00 |
minggo
|
44f3dcdfca
|
Merge pull request #8608 from Dhilan007/v3-fileutil-ios
issue #8568: Fixed FileUtils::removeFile doesn't work on iOS
|
2014-10-10 15:35:43 +08:00 |
minggo
|
7d4a235d46
|
Merge pull request #8611 from dabingnn/v3_fixGLProgramCrash
V3 fix gl program crash
|
2014-10-10 15:28:23 +08:00 |
andyque
|
2013cdb4ef
|
fix setMaxLength issue of EditBox-mac
|
2014-10-10 15:26:33 +08:00 |
minggo
|
01e3ae2c61
|
Merge pull request #8606 from andyque/fixButtonContentSize
fix button title only content size issue
|
2014-10-10 15:23:25 +08:00 |
minggo
|
49b3e907e9
|
Merge pull request #8604 from samuele3hu/v3_3D
Add CameraTest、OBBTest and related lua bindings
|
2014-10-10 15:22:17 +08:00 |
Dhilan007
|
7fb448e90f
|
add 'static' for global function
|
2014-10-10 15:13:05 +08:00 |
minggo
|
df60fde7ab
|
Merge pull request #8610 from andyque/fixCocostudioIncludePath
fix cocostudio include path
|
2014-10-10 15:05:39 +08:00 |
Huabing.Xu
|
a08d0e4be3
|
Merge branch 'v3' into v3_fixGLProgramCrash
|
2014-10-10 15:05:09 +08:00 |
minggo
|
4856b6782a
|
Merge pull request #7979 from giginet/scene-reader-canvas-size
SceneReader sets contentSize by canvasSize.
|
2014-10-10 15:00:28 +08:00 |
Huabing.Xu
|
e69465e428
|
remove texture unit 4-7, only 0 -3 is reserved
|
2014-10-10 14:06:37 +08:00 |
Huabing.Xu
|
f097c76e46
|
fix compile error for macro redefinition
|
2014-10-10 14:05:57 +08:00 |
Dhilan007
|
250875b081
|
fixed compile error
|
2014-10-10 14:03:20 +08:00 |
andyque
|
d5fe0758ed
|
fix cocostudio include path
|
2014-10-10 13:48:49 +08:00 |
pipu
|
d699b5809b
|
Modifying libprotocolbuf.a as protocolbuffer.a
|
2014-10-10 12:52:42 +08:00 |
Dhilan007
|
6a8c4f4194
|
Fixed FileUtils::removeFile doesn't work on iOS
|
2014-10-10 11:59:35 +08:00 |
minggo
|
2a95286329
|
Merge pull request #7785 from DaisukeHashimoto/fix_CCActionManagerEx_Bug
use fileName for _actionDic key
|
2014-10-10 11:13:41 +08:00 |
andyque
|
da48649370
|
fix button title only content size issue
|
2014-10-10 11:01:51 +08:00 |
minggo
|
ba5ff2e8e3
|
Merge pull request #8586 from super626/v3
Fix warning of Bundle3D and modify light
|
2014-10-10 10:46:24 +08:00 |
pipu
|
ee624e47cc
|
1. Modifying UIScale9Sprite
2. Updating UI Test
3. Updatding resource of ActionTimeline
|
2014-10-10 10:44:16 +08:00 |
minggo
|
3aa6337974
|
Merge pull request #8599 from dabingnn/v3_fixEGLConfigOnAndroid
fix egl config error on android
|
2014-10-10 10:41:52 +08:00 |
Huabing.Xu
|
254ee5b873
|
Merge branch 'v3' into v3_fixGLProgramCrash
|
2014-10-10 10:09:26 +08:00 |
yangxiao
|
7a23cc3c1a
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-10-10 09:55:56 +08:00 |
yangxiao
|
1ef511d31f
|
Merge branch 'newcode' into v3
|
2014-10-10 09:53:57 +08:00 |
samuele3hu
|
f97a7ae52d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-10-10 09:52:29 +08:00 |
samuele3hu
|
115d81574c
|
Add CameraTest、OBBTest and related lua bindings
|
2014-10-10 09:49:25 +08:00 |
Ahlwong
|
5027f24348
|
Fix UIButton Scale 9 Highlight
|
2014-10-09 12:48:09 -07:00 |
Huabing.Xu
|
d5e29d285d
|
fix gel Config error on android
|
2014-10-09 18:34:14 +08:00 |
XiaoYang
|
b77559fe5d
|
Merge pull request #136 from songchengjiang/new_v3
Fixed CosOuterAngle error
|
2014-10-09 18:31:24 +08:00 |
pipu
|
752eb839c7
|
Add protocolbuf.a
|
2014-10-09 18:28:09 +08:00 |