linshun
|
2a02510a9c
|
issue #12078: Added network group.
|
2015-05-28 15:46:36 +08:00 |
linshun
|
77639bc88e
|
issue #12078: Added audio group.
|
2015-05-28 15:46:02 +08:00 |
子龙山人
|
b8fd5ba290
|
Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 16:59:50 +08:00 |
子龙山人
|
e044b1ab11
|
Merge pull request #11785 from geron-cn/fixbug
fix crash when run TestTimelineFrameEvent in cpp-test
|
2015-05-27 16:28:13 +08:00 |
子龙山人
|
49ae39e6ef
|
Merge pull request #12053 from CocosRobot/update_cocosfiles_1432713765
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-27 16:26:47 +08:00 |
子龙山人
|
62832586d0
|
Merge pull request #12049 from samuele3hu/v3_material
issue #12046: Add Lua bindings for material systems and related test cases
|
2015-05-27 16:26:26 +08:00 |
子龙山人
|
ca8ca35fd6
|
Merge pull request #12054 from andyque/Feature_Add_Title_Alignment_for_Button
[ci skip]Feature add title alignment for button
|
2015-05-27 16:09:06 +08:00 |
andyque
|
44babe18fb
|
add missing comments and fix back compatibility.
|
2015-05-27 16:07:37 +08:00 |
CocosRobot
|
08c70e9478
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-27 08:02:47 +00:00 |
CocosRobot
|
3851e8356e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 08:00:53 +00:00 |
子龙山人
|
8caf7542e9
|
Merge pull request #12051 from andyque/v3
[ci skip]update changelog
|
2015-05-27 16:00:29 +08:00 |
andyque
|
b58bb59fd7
|
update changelog
|
2015-05-27 15:59:48 +08:00 |
子龙山人
|
616ac0058c
|
Merge pull request #12016 from namezero111111/v3
ui::TextField::getTextColor() missing
|
2015-05-27 15:53:09 +08:00 |
samuele3hu
|
9934d73548
|
issue #12046: Add Lua bindings for material systems and related test cases.
|
2015-05-27 15:37:59 +08:00 |
子龙山人
|
401ad61d6f
|
Merge pull request #12015 from hugohuang1111/v3-update-3rd
update 3rd part config
|
2015-05-27 15:06:11 +08:00 |
子龙山人
|
c8d8a9cfd2
|
Merge pull request #12022 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-27 15:05:32 +08:00 |
子龙山人
|
4cd5d479c0
|
Merge pull request #12028 from samuele3hu/v3_issue10302
issue #10302: Remove duplicated test cases
|
2015-05-27 15:05:10 +08:00 |
子龙山人
|
4a1c5954a3
|
Merge pull request #12045 from andyque/v3
fix iOS 64bit implicit conversion error.
|
2015-05-27 15:04:41 +08:00 |
andyque
|
452248c0dd
|
fix iOS 64bit implicit conversion error.
|
2015-05-27 13:45:07 +08:00 |
子龙山人
|
fc8f556f98
|
Merge pull request #12027 from jianglong0156/modifyShaderSample
rename shader file name
|
2015-05-27 13:33:02 +08:00 |
hugo
|
1f96ac9921
|
[M] update external version
|
2015-05-27 11:24:46 +08:00 |
子龙山人
|
b2132eb127
|
Merge pull request #11921 from felixjingga/uibutton-support-bmfont
Uibutton support bmfont
|
2015-05-27 11:19:46 +08:00 |
子龙山人
|
face507bf8
|
Merge pull request #12032 from CocosRobot/update_lua_bindings_1432635645
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 11:18:13 +08:00 |
子龙山人
|
b8fdb152fd
|
Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue
fix assert failure of NinePatchImageParser and rapidjson
|
2015-05-27 11:17:31 +08:00 |
子龙山人
|
2cfeed2c49
|
Merge pull request #12031 from yangws/v3_bugfixTerrain
Fix bug: terrain can't move to other position except origin point in world coord.
|
2015-05-27 10:48:02 +08:00 |
jianglong0156
|
406532fdf7
|
Merge branch 'modifyTestResource' of https://github.com/jianglong0156/cocos2d-x into modifyTestResource
|
2015-05-27 10:19:32 +08:00 |
jianglong0156
|
4bde9e635e
|
add copy recourse path in mac from js-test rests
|
2015-05-27 10:19:01 +08:00 |
子龙山人
|
2975cb9874
|
Merge pull request #12039 from andyque/update-change-log
[ci skip]update change log
|
2015-05-27 10:15:22 +08:00 |
andyque
|
16f0718e9c
|
update change log
|
2015-05-27 10:14:36 +08:00 |
jianglong0156
|
c3aae69fc0
|
modify proj.android-studio copy resource path
|
2015-05-27 10:08:03 +08:00 |
jianglong0156
|
9cd2b16ad0
|
modify js resource name
|
2015-05-27 09:52:44 +08:00 |
Ricardo Quesada
|
a2129641f5
|
Merge pull request #12038 from CocosRobot/update_lua_bindings_1432676996
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 14:59:49 -07:00 |
CocosRobot
|
824456b073
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 21:56:01 +00:00 |
Ricardo Quesada
|
536ad6fa26
|
Merge pull request #12037 from MSOpenTech/v3-winrt-rapidjson
V3 winrt rapidjson fix for ARM builds
|
2015-05-26 14:37:47 -07:00 |
Dale Stammen
|
06a5f7ed7a
|
moved CCNinePath files to base folder in solution
|
2015-05-26 09:48:25 -07:00 |
Dale Stammen
|
d146f26144
|
define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds
|
2015-05-26 09:46:15 -07:00 |
Namezero
|
9808f6aa91
|
Update UITextField.h
|
2015-05-26 12:55:57 +02:00 |
子龙山人
|
b7f244f193
|
Merge pull request #12033 from andyque/add-jsb-to-daily-build
[ci skip]add jsb to daily build script
|
2015-05-26 18:29:57 +08:00 |
CocosRobot
|
0079b8a788
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 10:26:45 +00:00 |
andyque
|
20ba131612
|
add jsb to daily build script
|
2015-05-26 18:25:49 +08:00 |
子龙山人
|
8459dca259
|
Merge pull request #12025 from yangws/v3
Fix bug: skybox can't move to other position except origin point in w…
|
2015-05-26 18:16:54 +08:00 |
Vincent Yang
|
d7ad7221e4
|
ciskip add doc for camera::getnear/farplane().
|
2015-05-26 18:14:37 +08:00 |
Vincent Yang
|
8105e9c714
|
Fix bug: terrain can't move to other position except origin point.
|
2015-05-26 17:51:26 +08:00 |
andyque
|
8d78fd31b7
|
add assert to make program more robust
|
2015-05-26 17:25:42 +08:00 |
jianglong0156
|
4d6b763eb6
|
rename shader file name
|
2015-05-26 17:21:35 +08:00 |
jianglong0156
|
5b7cf14384
|
rename shader file name
|
2015-05-26 17:20:48 +08:00 |
samuele3hu
|
ea75e222ba
|
issue #10302: Remove duplicated test cases
|
2015-05-26 17:20:46 +08:00 |
andyque
|
c668001e73
|
fix assert failure of NinePatchImageParser and rapidjson
|
2015-05-26 17:20:10 +08:00 |
Vincent Yang
|
246913c092
|
Fix bug: skybox can't move to other position except origin point in world space.
|
2015-05-26 17:14:26 +08:00 |
jianglong0156
|
fb4d638231
|
copy resources in linux
|
2015-05-26 16:34:04 +08:00 |