minggo
|
659ba68199
|
Merge pull request #7942 from andyque/deleteRedundantCode
remove dead code
|
2014-09-04 13:45:12 +08:00 |
minggo
|
0021b39e37
|
Merge pull request #7945 from CocosRobot/update_cocosfiles_1409809341
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-04 13:44:04 +08:00 |
minggo
|
cbe357bbca
|
Merge pull request #7943 from Dhilan007/v3
fix compile error on android.
|
2014-09-04 13:43:39 +08:00 |
CocosRobot
|
4b21972d8b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-04 05:42:22 +00:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +08:00 |
minggo
|
a416eb7298
|
[ci skip]
|
2014-09-04 13:40:40 +08:00 |
minggo
|
9cd21f19c9
|
[ci skip]
|
2014-09-04 13:39:17 +08:00 |
minggo
|
7b1be80eb8
|
Merge pull request #7192 from kezhuw/bugfix_http_client
bugfix: condition variable sleep on unrelated mutex
|
2014-09-04 13:34:33 +08:00 |
yangxiao
|
7ec104ab06
|
Merge branch 'newcode' into v3
|
2014-09-04 13:23:09 +08:00 |
Jeff Wang
|
c1c942d673
|
Merge pull request #1 from cocos2d/v3
update
|
2014-09-04 11:39:10 +08:00 |
Huabing.Xu
|
4ae2d6fc90
|
Merge branch 'v3' into v3_trianglesCommand
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-09-04 11:27:12 +08:00 |
Huabing.Xu
|
6f03e97a6d
|
add trianglesCommand head file to cocos2d
remove invoking of base class constructor
|
2014-09-04 11:20:43 +08:00 |
Dhilan007
|
64d926a75f
|
fix compile error on android.
|
2014-09-04 11:04:50 +08:00 |
andyque
|
a1edd4a819
|
remove dead code
|
2014-09-04 11:00:48 +08:00 |
minggo
|
7d5b1ba74f
|
Merge pull request #7941 from CocosRobot/update_cocosfiles_1409799384
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-04 10:57:00 +08:00 |
CocosRobot
|
071aedaa51
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-04 02:56:25 +00:00 |
minggo
|
99f3b371ed
|
Merge pull request #7744 from lite3/customguireader
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
|
2014-09-04 10:53:00 +08:00 |
andyque
|
3451672365
|
restore some configs
|
2014-09-04 10:49:45 +08:00 |
minggo
|
83719db8d4
|
Merge pull request #7934 from wohaaitinciu/loc_ver
fix: win32 cpp-tests sometimes cannot display font correctly
|
2014-09-04 10:49:30 +08:00 |
minggo
|
0d777bfa95
|
Merge pull request #7099 from newnon/v3_edit_box_fixes
EditBox fixes & improvements
|
2014-09-04 10:34:44 +08:00 |
minggo
|
cef9a21324
|
[ci skip]
|
2014-09-04 10:10:26 +08:00 |
minggo
|
139af3faa8
|
Merge pull request #7938 from super626/v3
fix bundle
|
2014-09-04 10:03:15 +08:00 |
Sergey
|
14853d46f2
|
setPlaceholderFontSize fix
|
2014-09-03 23:38:44 +04:00 |
Sergey
|
89ed897f47
|
getAllTouches() in GLView
|
2014-09-03 23:25:30 +04:00 |
Ricardo Quesada
|
047025696c
|
Merge pull request #7680 from andyque/fixNormalizedPosition
fix normalizedPosition bug
|
2014-09-03 10:07:22 -07:00 |
Kezhu Wang
|
925fb9aa38
|
bugfix: condition variable sleep on unrelated mutex
|
2014-09-03 23:56:54 +08:00 |
Dhilan007
|
a352a10d38
|
Add test case for new audio engine.
|
2014-09-03 18:20:31 +08:00 |
Dhilan007
|
d5c023740f
|
Implement logical codes of new audio engine on android.
|
2014-09-03 18:19:47 +08:00 |
Dhilan007
|
fc9a0f9be9
|
Implement logical codes of new audio engine on IOS.
|
2014-09-03 18:19:21 +08:00 |
yangxiao
|
4e65d070a1
|
rename BillBoard Model
|
2014-09-03 18:19:12 +08:00 |
Dhilan007
|
ca652cefee
|
New audio engine API[2d]
|
2014-09-03 18:18:47 +08:00 |
XiaoYang
|
58f4e84b9a
|
Merge pull request #126 from songchengjiang/billboard
Billboard
|
2014-09-03 18:12:08 +08:00 |
songchengjiang
|
114de83a0b
|
Added View_Oriented and View_Plane_Oriented Mode
|
2014-09-03 18:04:48 +08:00 |
andyque
|
87af0ecdd6
|
add back libbox2d and libspine project to our solution
|
2014-09-03 17:37:34 +08:00 |
minggo
|
5cca8cc87d
|
remove Node::_setLocalZOrder()
|
2014-09-03 17:26:50 +08:00 |
songchengjiang
|
68ce6449e8
|
repaired camera orientation
Testing RotateBy action
|
2014-09-03 17:17:57 +08:00 |
yangxiao
|
bb90fe48ef
|
merge cocos
|
2014-09-03 16:54:17 +08:00 |
yangxiao
|
8c5f928456
|
Merge branch 'newcode' into v3
|
2014-09-03 16:28:04 +08:00 |
minggo
|
290238f6e1
|
Merge pull request #7936 from andyque/fixWarning
fxi compile warning
|
2014-09-03 16:19:04 +08:00 |
XiaoYang
|
f03c4d4790
|
Merge pull request #125 from liuliang2004/Meshv3
Set the node name
|
2014-09-03 15:59:49 +08:00 |
liuliang
|
c167ed17ee
|
Set the node name
|
2014-09-03 15:55:11 +08:00 |
yangxiao
|
1bd09f21d0
|
merge cocos
|
2014-09-03 15:42:58 +08:00 |
cocoscodeide
|
da057b5a68
|
Merge pull request #69 from cocos2d/v3
update v3
|
2014-09-03 15:30:40 +08:00 |
yangxiao
|
5a85cb405e
|
fix billboard face
|
2014-09-03 15:28:15 +08:00 |
minggo
|
5fa3e11613
|
Merge pull request #7937 from samuele3hu/v3_template_fix
Fix the crash of project which was created by the lua-template-runtime
|
2014-09-03 15:12:36 +08:00 |
samuele3hu
|
45f08d54cb
|
Fix the member name error in the `vec4_to_luaval `
|
2014-09-03 15:07:31 +08:00 |
andyque
|
58f219fc20
|
test extension::Scale9Sprite and remove unused file compile flags
|
2014-09-03 15:00:09 +08:00 |
samuele3hu
|
d681bdce92
|
Fix the crash of project which was created by the lua-template-runtime
|
2014-09-03 14:54:58 +08:00 |
andyque
|
7493c7bf3e
|
fxi compile warning
|
2014-09-03 14:47:04 +08:00 |
minggo
|
1b9e9d2291
|
Merge pull request #7935 from CocosRobot/update_cocosfiles_1409722664
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 14:16:03 +08:00 |