minggo
|
60ef01b870
|
Merge pull request #11394 from giginet/intersects-circle
Implement Rect::intersectsCircle
|
2015-04-14 18:10:16 +08:00 |
WenhaiLin
|
5f4fd20b06
|
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
|
2015-04-14 18:04:35 +08:00 |
minggo
|
b10b9f20a7
|
Merge pull request #11437 from CocosRobot/update_cocosfiles_1429005136
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-14 17:55:55 +08:00 |
minggo
|
52c5b4dd6e
|
Merge pull request #11436 from CocosRobot/update_lua_bindings_1429002458
[AUTO]: updating luabinding automatically
|
2015-04-14 17:54:27 +08:00 |
CocosRobot
|
b7065407fc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-14 09:52:18 +00:00 |
minggo
|
561123d4cc
|
[ci skip]update CHANGELOG
|
2015-04-14 17:49:17 +08:00 |
andyque
|
3c3d76fd9e
|
remove listview focus test
|
2015-04-14 17:48:43 +08:00 |
minggo
|
f4aea9fa13
|
Merge pull request #11433 from andyque/update-external-versoin-v3
update external to v39
|
2015-04-14 17:48:33 +08:00 |
CocosRobot
|
66fcba02b1
|
[AUTO]: updating luabinding automatically
|
2015-04-14 09:10:16 +00:00 |
minggo
|
caf308f061
|
Merge pull request #11431 from CocosRobot/update_lua_bindings_1429000943
[AUTO]: updating luabinding automatically
|
2015-04-14 17:03:10 +08:00 |
minggo
|
fe207fe8e0
|
[ci skip]update CHANGELOG
|
2015-04-14 17:02:20 +08:00 |
minggo
|
fbb1c578a2
|
Merge pull request #11430 from minggo/update-spine
update spine runtime to v2.1.25
|
2015-04-14 17:01:11 +08:00 |
andyque
|
01090a950b
|
update external to v39
|
2015-04-14 16:54:16 +08:00 |
minggo
|
bae408e9ca
|
Merge pull request #11432 from samuele3hu/v3_studio2
[ci skip]Update cocos2d-console submodule
|
2015-04-14 16:48:20 +08:00 |
CocosRobot
|
0e4a209241
|
[AUTO]: updating luabinding automatically
|
2015-04-14 08:44:30 +00:00 |
samuele3hu
|
092eed12a2
|
Update cocos2d-console submodule
|
2015-04-14 16:43:03 +08:00 |
minggo
|
1e4c22c043
|
[ci skip]update CHANGELOG
|
2015-04-14 16:39:49 +08:00 |
minggo
|
8b98dcd06b
|
Merge pull request #11429 from andyque/optimize-button-memory-usage-v3
optimize memory usage of ui::Button
|
2015-04-14 16:38:47 +08:00 |
minggo
|
0559b96a8e
|
Merge pull request #11428 from samuele3hu/v3_studio2
[ci skip]Remove useless classes configuration for Lua binding and fix two minor bugs.
|
2015-04-14 16:38:05 +08:00 |
minggo
|
cdd7acc537
|
add spine test case
|
2015-04-14 16:14:51 +08:00 |
samuele3hu
|
dd3b6ced34
|
Fix the bugs that title and button disappeared because of camera setting
|
2015-04-14 15:40:12 +08:00 |
andyque
|
240bf58bfc
|
fix edge case crash
|
2015-04-14 15:34:15 +08:00 |
minggo
|
c62b34ac01
|
update spine runtime to v2.1.25
|
2015-04-14 15:23:16 +08:00 |
zhangbin
|
8c2413aa54
|
Add submodule js-bindings & html5.
|
2015-04-14 15:20:46 +08:00 |
samuele3hu
|
b2c3628aee
|
Remove useless classes configuration for Lua binding
|
2015-04-14 15:02:25 +08:00 |
minggo
|
e126d1f856
|
Merge pull request #11426 from super626/texturecube
Texturecube
|
2015-04-14 15:02:19 +08:00 |
andyque
|
a2df0ca769
|
optimize memory usage of ui::Button
|
2015-04-14 15:00:42 +08:00 |
minggo
|
793f7cd1e7
|
[ci skip]update CHANGELOG
|
2015-04-14 14:29:49 +08:00 |
XiaoYang
|
5ed65e13c9
|
Merge pull request #303 from zhukaixy/texturecube
bugfix for cubemap
|
2015-04-14 14:25:35 +08:00 |
zhukaixy
|
451a560200
|
bugfix for cubemap
|
2015-04-14 14:20:31 +08:00 |
yangxiao
|
8c8058a9be
|
merge cocos resolve conflict
|
2015-04-14 13:56:05 +08:00 |
XiaoYang
|
43cf540915
|
Merge pull request #302 from zhukaixy/texturecube
1: update cube texture for sky box
|
2015-04-14 13:34:55 +08:00 |
yangxiao
|
74db8e6cf2
|
modify changelog for particle3d
|
2015-04-14 13:33:53 +08:00 |
zhangbin
|
ea86978ce2
|
Add js-bindings generator tools.
|
2015-04-14 11:01:07 +08:00 |
minggo
|
4aaa494be7
|
Merge pull request #11421 from CocosRobot/update_lua_bindings_1428977404
[AUTO]: updating luabinding automatically
|
2015-04-14 10:58:08 +08:00 |
minggo
|
1ebcca8d9f
|
Merge pull request #11417 from super626/terrain
Terrain
|
2015-04-14 10:50:21 +08:00 |
minggo
|
a87741af5f
|
[ci skip] update version
|
2015-04-14 10:47:05 +08:00 |
minggo
|
2b66bb7082
|
[ci skip] update version
|
2015-04-14 10:46:20 +08:00 |
CocosRobot
|
a0a6b9cda4
|
[AUTO]: updating luabinding automatically
|
2015-04-14 02:12:05 +00:00 |
minggo
|
4211b20134
|
Merge pull request #11414 from likexx/patch-1
Update CCLabel.cpp
|
2015-04-14 10:06:09 +08:00 |
minggo
|
7f1d48978f
|
Merge pull request #11416 from super626/v3
Sprite3D fix
|
2015-04-14 10:04:22 +08:00 |
minggo
|
d4d7a3a7b0
|
[ci skip]update CHANGELOG
|
2015-04-14 10:01:49 +08:00 |
minggo
|
d246c33974
|
Merge pull request #11413 from WenhaiLin/v3-label-sf-position
Label:Fixed the position of system font is wrong if it is visited by a new camera.
|
2015-04-14 09:59:09 +08:00 |
minggo
|
ee36556563
|
[ci skip]update AUTHORS
|
2015-04-14 09:41:07 +08:00 |
minggo
|
f8cf6822b9
|
[ci skip]update CHANGELOG
|
2015-04-14 09:38:03 +08:00 |
minggo
|
06a2042a11
|
Merge pull request #11345 from IgorMats/v3
Add getStroke/setStroke methods for motion streak.
|
2015-04-14 09:36:03 +08:00 |
XiaoYang
|
b5e640f715
|
Merge pull request #299 from tangziwen/terrain
move reset draw polygon state in corresponding position
|
2015-04-14 09:14:34 +08:00 |
XiaoYang
|
37dc4c33d9
|
Merge pull request #300 from lvlonggame/v3
fix bug: create single node recursively.
|
2015-04-14 09:10:24 +08:00 |
zhukaixy
|
6684491249
|
1: update cube texture for sky box
2: add mouse-controled camera for test case (skybox)
|
2015-04-14 01:39:23 +08:00 |
Igor Mats
|
e54a51be02
|
Fix comment.
|
2015-04-13 19:24:19 +03:00 |