minggo
|
49bd79d14a
|
Merge pull request #8853 from 2youyouo2/v3_EventFrame
fixed emit frame event
|
2014-10-20 13:57:38 +08:00 |
minggo
|
2c3f22eb11
|
Merge pull request #8854 from Dhilan007/v3-labelfix
Fix Label: endless loop if not using system font, and constrained length is less than one character width
|
2014-10-20 13:52:38 +08:00 |
minggo
|
63a0899850
|
Merge pull request #8855 from dabingnn/v3_fixAssetMgrTestCase
change asset manager to use a new resource, which will not affect other ...
|
2014-10-20 13:49:10 +08:00 |
Huabing.Xu
|
ede7f75f5d
|
change lua asset manager test cases
|
2014-10-20 11:54:10 +08:00 |
minggo
|
72057cc30a
|
Merge pull request #8858 from minggo/update-release-note
[ci skip]Update release note
|
2014-10-20 11:42:01 +08:00 |
minggo
|
73d6e36c25
|
Merge pull request #8856 from samuele3hu/v3_new_spine
Fix a bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32 and update plugin submodule
|
2014-10-20 11:37:26 +08:00 |
minggo
|
80c4ce3e7a
|
update release note
|
2014-10-20 11:34:04 +08:00 |
samuele3hu
|
29bf39bfab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-20 11:09:41 +08:00 |
samuele3hu
|
a151ea0163
|
Update plugin submodule
|
2014-10-20 11:03:54 +08:00 |
Huabing.Xu
|
86fedffd56
|
change asset manager to use a new resource, which will not affect other test cases
|
2014-10-20 11:03:13 +08:00 |
minggo
|
8d3e4818a5
|
Merge pull request #8842 from joshuastray/v3
add needed link library for linux
|
2014-10-20 10:56:54 +08:00 |
Dhilan007
|
0bb02fb34f
|
Fix Label: endless loop if not using system font, and constrained length is less than one character width
|
2014-10-20 10:41:01 +08:00 |
samuele3hu
|
1195960ea7
|
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
|
2014-10-20 10:22:44 +08:00 |
minggo
|
84e0ae750c
|
[ci skip]update README.md
|
2014-10-20 09:50:11 +08:00 |
minggo
|
fed7787ceb
|
[ci skip]update config.json
|
2014-10-20 09:36:01 +08:00 |
minggo
|
1134112748
|
Merge pull request #8849 from samuele3hu/v3_new_spine
Fix some bugs reported in the test
|
2014-10-20 09:35:13 +08:00 |
minggo
|
be296265a4
|
[ci skip]update config.json
|
2014-10-20 09:29:26 +08:00 |
samuele3hu
|
5112f4ab5e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-19 22:41:15 +08:00 |
samuele3hu
|
66a9d1c52e
|
Fix FontTest' output error message-> “cocos2d: removeChildByTag(tag = 0): child not found!”
|
2014-10-19 22:35:30 +08:00 |
samuele3hu
|
1194873b60
|
Fix Camera3DTest has not effect on the Linux
|
2014-10-19 22:20:34 +08:00 |
youyou
|
03ebe0152b
|
fixed timeline loop
|
2014-10-19 21:32:23 +08:00 |
minggo
|
9f4ef42882
|
Merge pull request #8848 from CocosRobot/update_cocosfiles_1413720591
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-19 20:10:34 +08:00 |
minggo
|
c1128a227d
|
Merge pull request #8847 from samuele3hu/v3_new_spine
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 20:10:12 +08:00 |
CocosRobot
|
aa7478d375
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-19 12:09:52 +00:00 |
minggo
|
1a549b9c1d
|
Merge pull request #8840 from CocosRobot/update_lua_bindings_1413617697
[AUTO]: updating luabinding automatically
|
2014-10-19 20:08:12 +08:00 |
samuele3hu
|
634d42775e
|
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 17:00:05 +08:00 |
Jialong Zhai
|
2befd74b0e
|
add needed link library for linux
|
2014-10-18 15:40:47 +08:00 |
CocosRobot
|
96d709aff3
|
[AUTO]: updating luabinding automatically
|
2014-10-18 07:36:54 +00:00 |
minggo
|
8318b16922
|
Merge pull request #8827 from cocoscodeide/v3
don't show runtime on top by default
|
2014-10-18 15:12:17 +08:00 |
minggo
|
bca15538e3
|
Merge pull request #8823 from super626/v3
add isVisibleByVisitingCamera check
|
2014-10-18 15:11:45 +08:00 |
minggo
|
8218804c52
|
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
[LUA]Add New AudioEngine on window
|
2014-10-18 15:11:29 +08:00 |
minggo
|
df0e33c07f
|
Merge pull request #8833 from huangshiwu/v3_wp8template
fix wp8 template crash bug by modefy font resource's properties
|
2014-10-18 15:10:40 +08:00 |
minggo
|
7bd5e3f94c
|
Merge pull request #8834 from andyque/fixLongFilePathOnWP8
fix long file path on WP8
|
2014-10-18 15:10:03 +08:00 |
andyque
|
0dc7bbe861
|
fix long file path on WP8
|
2014-10-18 14:48:27 +08:00 |
Dhilan007
|
5ca3483dd8
|
fixed compile error
|
2014-10-18 13:44:19 +08:00 |
Dhilan007
|
c9bc80f831
|
Fix compile error
|
2014-10-18 13:03:28 +08:00 |
huanghsiwu
|
f549aa3747
|
fix wp8 template crash bug by modefy font resource's properties
|
2014-10-18 11:20:12 +08:00 |
honghui
|
f2647e56e4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-10-18 09:45:25 +08:00 |
minggo
|
61215e015f
|
Merge pull request #8831 from samuele3hu/v3_new_spine
Add lua-bindings for Light and test case and fix compile error triggered by UIHelper.cpp
|
2014-10-18 09:28:17 +08:00 |
samuele3hu
|
e74c3cd1e4
|
Remove some comments
|
2014-10-18 00:29:04 +08:00 |
samuele3hu
|
529ee72432
|
Fix compile error triggered by UIHelper.cpp
|
2014-10-18 00:25:55 +08:00 |
samuele3hu
|
6502beaf95
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-18 00:14:53 +08:00 |
samuele3hu
|
3348f8300e
|
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
|
2014-10-18 00:13:22 +08:00 |
minggo
|
7e6ee9c15a
|
Merge pull request #8801 from 2youyouo2/v3
add deprecated information for Armature::drawContour
|
2014-10-17 23:02:49 +08:00 |
minggo
|
ac692eaa4d
|
Merge pull request #8818 from samuele3hu/v3_new_spine
Update Mac project setting and some lua test cases about UI and ActionTimeline
|
2014-10-17 23:01:55 +08:00 |
minggo
|
b4ffad06eb
|
Merge pull request #8822 from huangshiwu/v3_fixtemplate
change ios and mac template's resource struct
|
2014-10-17 23:00:42 +08:00 |
minggo
|
1da69a5f7b
|
Merge pull request #8828 from CocosRobot/update_lua_bindings_1413557585
[AUTO]: updating luabinding automatically
|
2014-10-17 22:58:15 +08:00 |
minggo
|
e1abb74e02
|
Merge pull request #8829 from CocosRobot/update_lua_bindings_1413557591
[AUTO]: updating luabinding automatically
|
2014-10-17 22:57:32 +08:00 |
CocosRobot
|
20781825f2
|
[AUTO]: updating luabinding automatically
|
2014-10-17 14:56:22 +00:00 |
CocosRobot
|
3a47bfe3c9
|
[AUTO]: updating luabinding automatically
|
2014-10-17 14:55:25 +00:00 |