minggo
fa74de8511
Merge pull request #6993 from Teivaz/v3
...
* Set COCOS2D_VERSION to 3.2.0
2014-06-09 09:43:50 +08:00
minggo
ccff80df2f
Merge pull request #6991 from andyque/fixUIFrameColorAndOpacity
...
fix UI frame cascade color and opacity
2014-06-09 09:42:47 +08:00
Anton Sokolchenko
1a16dd02f8
Possible use of null pointer.
...
Or maybe better to add CCASSERT.
2014-06-09 02:12:17 +03:00
Anton Sokolchenko
3edef12094
Update CCControlButton.cpp
2014-06-09 02:07:43 +03:00
Anton Sokolchenko
f5efc49903
fix assertions
...
'label' could be not caught after previous assertions
2014-06-09 02:04:44 +03:00
Sergey
904f157c2c
move node from one parent to another fix
2014-06-07 12:25:20 +04:00
yangxiao
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
oleksandr.kuznietsov
2640938c68
* Set COCOS2D_VERSION to 3.2.0
2014-06-06 12:58:32 +03:00
samuele3hu
1f291dc2c6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-06 17:19:27 +08:00
samuele3hu
eba954b410
Add bytecode and encrypted files test cases for Lua
2014-06-06 17:17:43 +08:00
Frank.Xu
d7f808934d
Add const for getStringLength() function
2014-06-06 17:06:55 +08:00
zhouxiaoxiaoxujian
e0cc5153fa
Remove misleading comment, add new comment
...
Remove misleading comment, add new comment for enableOutline
2014-06-06 16:54:51 +08:00
zhouxiaoxiaoxujian
fabc4d03ee
Update UIText.cpp
2014-06-06 16:50:25 +08:00
zhouxiaoxiaoxujian
03eeb2cade
Remove unnecessary Type::TTF Check
...
Remove unnecessary TTF type check on enableOutline or enableGlow function。
2014-06-06 16:41:45 +08:00
andyque
8962f7fc2e
refactor Scale9Sprite setColor & setOpacity
2014-06-06 16:15:19 +08:00
andyque
4f22b03d7f
refactor Widget setColor & setOpacity
2014-06-06 16:14:35 +08:00
andyque
282264575b
refactor TextField setColor & setOpacity
2014-06-06 16:10:33 +08:00
andyque
5ae97da030
refactor TextBMFont setColor & setOpacity
2014-06-06 16:09:59 +08:00
andyque
d615de8299
refactor TextAtlas setColor & setOpacity
2014-06-06 16:09:13 +08:00
andyque
a37a6737ca
refactor Text setColor & setOpacity
2014-06-06 16:08:31 +08:00
andyque
f0f4d41813
refactor Slider setColor & setOpacity
2014-06-06 16:07:47 +08:00
andyque
3c80fe53d3
refactor LoadingBar setColor & setOpacity
2014-06-06 16:03:59 +08:00
andyque
6193893b2b
refactor ImageView setColor & setOpacity
2014-06-06 16:02:44 +08:00
andyque
0805c215b3
refactor UICheckBox setColor & setOpacity
2014-06-06 16:01:55 +08:00
andyque
46ad4edab3
refactor UIButton setColor & setOpacity
2014-06-06 16:00:28 +08:00
minggo
76d9916864
Merge pull request #6990 from Dhilan007/v3-wp8fix
...
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:43:43 +08:00
Dhilan007
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
minggo
716769241a
Merge pull request #6938 from CaryZheng/v3
...
Simplify BlendFunc operator< judgement
2014-06-06 15:29:33 +08:00
minggo
bd00e17190
[ci skip]
2014-06-06 13:47:38 +08:00
minggo
e0238c107e
[ci skip]
2014-06-06 13:41:40 +08:00
minggo
6771afb13b
Merge pull request #6989 from samuele3hu/v3_fix
...
Update cocos2d-console submodule
2014-06-06 13:38:46 +08:00
minggo
4016c3aa84
Merge pull request #6988 from minggo/add-comment
...
[ci skip]add some comment
2014-06-06 12:11:02 +08:00
minggo
bbff18c96f
add some comment
2014-06-06 12:09:39 +08:00
samuele3hu
52323b27fa
Update cocos2d-console submodule
2014-06-06 12:09:10 +08:00
minggo
49f7b2aec1
Merge pull request #6986 from iSevenDays/patch-11
...
Fix CCImage to be compatible with UNIX2003
2014-06-06 12:05:58 +08:00
minggo
ab63569e4a
Merge pull request #6987 from samuele3hu/v3_fix
...
Update control.lua for lua-tests
2014-06-06 12:04:07 +08:00
samuele3hu
890bc20475
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-06 11:44:23 +08:00
samuele3hu
5ab8b81205
Update control.lua for lua-tests
2014-06-06 11:42:18 +08:00
minggo
11320a0ef5
[ci skip]
2014-06-06 11:40:32 +08:00
minggo
6cee3fe830
Merge pull request #6979 from visiblelight/TextureOptimize
...
Texture Optimize
2014-06-06 11:38:49 +08:00
vision
39f2669886
remove the new images and use the old ones.
2014-06-06 10:37:45 +08:00
Anton Sokolchenko
770d5e91b7
Update CCImage.cpp
2014-06-05 18:02:45 +03:00
Anton Sokolchenko
5f74b8568d
Fix CCImage to be compatible with UNIX2003
...
Without this wrapper I get errors below.
Mac Os X 10.9.3 Xcode 6 beta(the same problem also exists in Xcode 5)
I found a solution at http://stackoverflow.com/questions/8732393/code-coverage-with-xcode-4-2-missing-files and added one more wrapping function.
Undefined symbols for architecture i386:
"_fwrite$UNIX2003", referenced from:
_unixErrorHandler in libcocos2dx iOS.a(tif_unix.o)
_unixWarningHandler in libcocos2dx iOS.a(tif_unix.o)
_empty_output_buffer in libcocos2dx iOS.a(jdatadst.o)
_term_destination in libcocos2dx iOS.a(jdatadst.o)
_Fax3PrintDir in libcocos2dx iOS.a(tif_fax3.o)
_PredictorPrintDir in libcocos2dx iOS.a(tif_predict.o)
"_strerror$UNIX2003", referenced from:
_TIFFOpen in libcocos2dx iOS.a(tif_unix.o)
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
2014-06-05 16:54:00 +03:00
Frank.Xu
7ece807a63
Add shadow, outline, glow filter support for UITextField
2014-06-05 19:21:06 +08:00
yangxiao
87c7e2b0e9
worldmat cache in bone
2014-06-05 18:21:25 +08:00
Frank.Xu
b74040a2ac
Add getStringLength() support for UITextField
2014-06-05 17:59:54 +08:00
yangxiao
32ba5f2873
change comment
2014-06-05 16:47:03 +08:00
yangxiao
ed8f8a9cad
sprite3d with skin render&bundle
2014-06-05 16:36:01 +08:00
vision
f7d5d837bf
add new tests for different pixel formats
2014-06-05 16:33:42 +08:00
minggo
5cf083fbeb
Merge pull request #6982 from CocosRobot/update_lua_bindings_1401951865
...
[AUTO]: updating luabinding automatically
2014-06-05 15:59:19 +08:00