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 |
huangshiwu
|
9c87522199
|
little more modefy
|
2014-08-04 17:34:50 +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 |
huangshiwu
|
9a3f231771
|
merge v3 into v3_wp8glviewhookpr
|
2014-08-04 16:49:42 +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 |
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 |
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 |
yangxiao
|
4452d9579a
|
merge cocos2d, fix lua
|
2014-08-04 12:07:27 +08:00 |
zii
|
825209dd04
|
Update ccUtils.cpp
|
2014-08-04 11:48:23 +08:00 |
zii
|
97f06306e3
|
Update ccUtils.cpp
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
|
2014-08-04 11:45:50 +08:00 |
samuele3hu
|
c5c394846c
|
Adjust iOS and Mac tempts for Lua
|
2014-08-04 10:25:17 +08:00 |
samuele3hu
|
6f4cafcc1b
|
Add module register functions and adjust iOS and Mac test cases
|
2014-08-04 09:39:42 +08:00 |
takaken1994
|
9692dfdc67
|
Update : added function for setting min/max scale
Fix to remove unused params.
|
2014-08-03 21:25:55 +09:00 |
huangshiwu
|
372479d812
|
wp8 GLView Hook
|
2014-08-02 16:31:16 +08:00 |
xuzhiqiang
|
85dd898319
|
bug fix
|
2014-08-02 08:04:29 +08:00 |
andyque
|
5af4657fbb
|
fix windows utf8 source code file can not compile erorr
|
2014-08-01 21:20:27 +08:00 |
andyque
|
d7b17c598d
|
fix potential crash when user remove self in widgets callback
|
2014-08-01 20:58:42 +08:00 |
minggo
|
f74626e946
|
Merge pull request #7648 from CocosRobot/update_cocosfiles_1406879885
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-01 15:59:03 +08:00 |
CocosRobot
|
ea1d9d4657
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-01 07:58:06 +00:00 |
minggo
|
6d6864056d
|
Merge pull request #7646 from CocosRobot/update_lua_bindings_1406879478
[AUTO]: updating luabinding automatically
|
2014-08-01 15:56:09 +08:00 |
CocosRobot
|
fda11428bf
|
[AUTO]: updating luabinding automatically
|
2014-08-01 07:53:19 +00:00 |
minggo
|
2ca623a26a
|
Merge pull request #7630 from huangshiwu/v3_pr
GLView Hook
|
2014-08-01 15:47:45 +08:00 |
huangshiwu
|
575c9787c0
|
Merge branch 'v3' into v3_pr
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-01 15:11:34 +08:00 |
andyque
|
6dee943352
|
fix mac EditBox callback issue
|
2014-08-01 14:56:47 +08:00 |
kaile.yin
|
3dcdb1cde4
|
remove some update condition of Frame::apply function
|
2014-08-01 14:40:42 +08:00 |
Ningyu
|
137de84b05
|
add test case
|
2014-08-01 14:39:45 +08:00 |
andyque
|
630c41e4a3
|
Merge branch 'patch-1' of https://github.com/yongkangchen/cocos2d-x into testPR7549
|
2014-08-01 13:37:27 +08:00 |
minggo
|
e5aad1fa39
|
Merge pull request #7641 from CocosRobot/update_lua_bindings_1406865618
[AUTO]: updating luabinding automatically
|
2014-08-01 12:04:18 +08:00 |
minggo
|
80eaca9d84
|
Merge pull request #7640 from CocosRobot/update_cocosfiles_1406865528
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-01 12:02:48 +08:00 |