minggo
|
99f9a0fb19
|
[ci skip]
|
2014-08-05 11:55:06 +08:00 |
minggo
|
0ff00ddbf7
|
[ci skip]
|
2014-08-05 11:53:37 +08:00 |
minggo
|
38e4ad0fbd
|
Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview
Update : added function for setting min/max scale
|
2014-08-05 11:52:22 +08:00 |
minggo
|
2f41f031fa
|
Merge pull request #7661 from CocosRobot/update_cocosfiles_1407204823
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 10:14:28 +08:00 |
CocosRobot
|
1772ab78ac
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 02:13:45 +00:00 |
minggo
|
06144bfc7a
|
Merge pull request #7660 from CocosRobot/update_lua_bindings_1407204158
[AUTO]: updating luabinding automatically
|
2014-08-05 10:12:33 +08:00 |
minggo
|
a6a90e4090
|
[ci skip]
|
2014-08-05 10:10:17 +08:00 |
CocosRobot
|
8dd1be5172
|
[AUTO]: updating luabinding automatically
|
2014-08-05 02:05:02 +00:00 |
minggo
|
326c76007a
|
Merge pull request #7659 from CocosRobot/update_cocosfiles_1407204055
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 10:02:07 +08:00 |
CocosRobot
|
0f3fbfa07f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 02:00:57 +00:00 |
minggo
|
cc75a8e860
|
Merge pull request #7632 from super626/v3
SubMesh and AttachMement
|
2014-08-05 09:59:38 +08:00 |
minggo
|
6d09b00e1d
|
Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback
fix potential crash when user remove self in widgets callback
|
2014-08-05 09:46:00 +08:00 |
minggo
|
34a0603a52
|
Merge pull request #7658 from andyque/fixButtonOpacityIssue
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
|
2014-08-05 09:39:13 +08:00 |
minggo
|
a42bbaebf9
|
[ci skip]
|
2014-08-05 09:35:13 +08:00 |
minggo
|
b6ceb507c0
|
[ci skip]
|
2014-08-05 09:33:37 +08:00 |
minggo
|
007e42faa0
|
Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak
Fix iOS VideoPlayer memory leak.
|
2014-08-05 09:30:52 +08:00 |
andyque
|
f44906d56c
|
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
|
2014-08-05 08:11:37 +08:00 |
takaken1994
|
1b74bc279a
|
Fix : remove unused params from header file
|
2014-08-04 23:20:47 +09:00 |
takaken1994
|
6f26a7b983
|
Fix : remove verbose function
|
2014-08-04 23:20:13 +09:00 |
takaken1994
|
7c0919042f
|
Fix : small bug
|
2014-08-04 23:17:09 +09:00 |
huangshiwu
|
25079ccbd8
|
delete wrong changes
|
2014-08-04 18:16:47 +08:00 |
Huabing.Xu
|
f7ad98b15b
|
using primitve->draw in Fast_tmx on draw
|
2014-08-04 17:57:31 +08:00 |
Huabing.Xu
|
95a8b23d64
|
fix draw bug in primitive when using indices
|
2014-08-04 17:56:56 +08:00 |
huangshiwu
|
9c87522199
|
little more modefy
|
2014-08-04 17:34:50 +08:00 |
Huabing.Xu
|
a0d1b0dad8
|
allow null index buffer when create primitive
|
2014-08-04 17:21:23 +08:00 |
samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
Huabing.Xu
|
2dca0a4809
|
remove IndexData class
|
2014-08-04 17:00:08 +08:00 |
huangshiwu
|
9a3f231771
|
merge v3 into v3_wp8glviewhookpr
|
2014-08-04 16:49:42 +08:00 |
Huabing.Xu
|
414d67851f
|
add _vertexBuffer back in Fast_tmx
|
2014-08-04 16:36:20 +08:00 |
minggo
|
cad0c40cd2
|
[ci skip]
|
2014-08-04 16:33:44 +08:00 |
minggo
|
b96f91730a
|
[ci skip]
|
2014-08-04 16:32:36 +08:00 |
minggo
|
93ee009366
|
Merge pull request #7656 from zii/v3
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
|
2014-08-04 16:30:41 +08:00 |
Huabing.Xu
|
bbf11f5d06
|
refactor vertex data
using vertex data in fast_tmx
|
2014-08-04 16:08:54 +08:00 |
yangxiao
|
8ffd0fe16e
|
spelling error
|
2014-08-04 16:07:16 +08:00 |
yangxiao
|
4084fdc461
|
add new file to cmake
|
2014-08-04 15:49:12 +08:00 |
yangxiao
|
11a13ce9e2
|
Merge branch 'newcode' into v3
|
2014-08-04 15:41:21 +08:00 |
minggo
|
60df3ddf31
|
Merge pull request #7636 from samuele3hu/v3_console
Update cocos2d-console submodule
|
2014-08-04 15:38:19 +08:00 |
minggo
|
aa78d878e1
|
[ci skip]
|
2014-08-04 15:37:17 +08:00 |
minggo
|
358d637e75
|
Merge pull request #7645 from andyque/testPR7549
fix EditBox began/end events not work issue
|
2014-08-04 15:36:07 +08:00 |
minggo
|
5deb273486
|
Merge pull request #7644 from 2youyouo2/v3
update ActionTimeline
|
2014-08-04 15:35:35 +08:00 |
samuele3hu
|
e5f9c1b488
|
Adjust common script and related test cases
|
2014-08-04 15:22:07 +08:00 |
zii
|
20c43e5684
|
Update ccUtils.h
|
2014-08-04 15:21:10 +08:00 |
zii
|
7659a1623f
|
Update ccUtils.h
|
2014-08-04 15:20:45 +08:00 |
zii
|
e151795c43
|
Update ccUtils.cpp
|
2014-08-04 15:18:01 +08:00 |
yangxiao
|
47838ce945
|
reset
|
2014-08-04 14:37:26 +08:00 |
zhangbin
|
c0b1ce9ce6
|
Store the version of engine into the prebuilt engine.
|
2014-08-04 14:34:24 +08:00 |
yangxiao
|
01e0192a2d
|
reset
|
2014-08-04 14:29:55 +08:00 |
huangshiwu
|
efcb8b9962
|
wp8 glview hook solution 1
|
2014-08-04 14:17:14 +08:00 |
minggo
|
405be168b0
|
Merge pull request #7650 from andyque/fixTestUnicode
fix windows utf8 source code file can not compile erorr
|
2014-08-04 13:58:16 +08:00 |
yangxiao
|
d6d3ea6b18
|
fix template
|
2014-08-04 13:12:59 +08:00 |