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 |
Dhilan007
|
ca652cefee
|
New audio engine API[2d]
|
2014-09-03 18:18:47 +08:00 |
minggo
|
290238f6e1
|
Merge pull request #7936 from andyque/fixWarning
fxi compile warning
|
2014-09-03 16:19:04 +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 |
CocosRobot
|
1ec9933045
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 05:37:45 +00:00 |
minggo
|
66943eec98
|
Merge pull request #7932 from minggo/remove-unneeded-files
remove unneeded files
|
2014-09-03 13:36:31 +08:00 |
minggo
|
1ddd7149ee
|
Merge pull request #7933 from CocosRobot/update_cocosfiles_1409717115
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 13:36:12 +08:00 |
CocosRobot
|
61a3c80cb9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 04:05:23 +00:00 |
minggo
|
61f2efbc1b
|
Merge pull request #7931 from CocosRobot/update_lua_bindings_1409714881
[AUTO]: updating luabinding automatically
|
2014-09-03 12:03:24 +08:00 |
minggo
|
cb64b11781
|
Merge pull request #7930 from CocosRobot/update_cocosfiles_1409714789
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 12:03:06 +08:00 |
minggo
|
b37ef4e1c3
|
remove unneeded files
|
2014-09-03 11:52:19 +08:00 |
CocosRobot
|
ffb36d577e
|
[AUTO]: updating luabinding automatically
|
2014-09-03 03:29:43 +00:00 |
minggo
|
8fd8ba97db
|
[ci skip]
|
2014-09-03 11:27:45 +08:00 |
CocosRobot
|
2dea7c3a18
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 03:26:30 +00:00 |
minggo
|
eee9ac626a
|
Merge pull request #7815 from andyque/mergeExtensionEditBox
merge extension EditBox to ui module
|
2014-09-03 11:25:10 +08:00 |
minggo
|
9351caaa58
|
Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer
fix transition scene stencil buffer
|
2014-09-03 10:26:28 +08:00 |
minggo
|
4881ca31d5
|
Merge pull request #7929 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-02 18:17:30 +08:00 |
andyque
|
dafbf28283
|
fix release mode compile error
|
2014-09-02 16:42:23 +08:00 |
andyque
|
fadfa87afd
|
fix vs2013 compile error
|
2014-09-02 16:42:04 +08:00 |
andyque
|
a429959e65
|
fix lua compile error
|
2014-09-02 01:31:02 -07:00 |
andyque
|
51e160beff
|
fix EditBox lua compile error
|
2014-09-02 17:37:55 +08:00 |
andyque
|
28f00df0cf
|
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
|
2014-09-02 16:14:16 +08:00 |
andyque
|
a0c28e49ac
|
remove exteion edtibox
|
2014-09-02 16:14:07 +08:00 |
andyque
|
2deeee2109
|
remove extension luabindings
|
2014-09-02 01:11:50 -07:00 |
andyque
|
8033b1f7bb
|
Merge branch 'v3' into mergeExtensionEditBox
|
2014-09-02 00:03:16 -07:00 |
minggo
|
4749205b61
|
Merge pull request #7917 from super626/v3
bundle code adjustment
|
2014-09-02 14:58:53 +08:00 |
minggo
|
a7c71470f9
|
Merge pull request #7928 from CocosRobot/update_lua_bindings_1409636609
[AUTO]: updating luabinding automatically
|
2014-09-02 14:18:41 +08:00 |
CocosRobot
|
dc15287ac3
|
[AUTO]: updating luabinding automatically
|
2014-09-02 05:45:07 +00:00 |
minggo
|
a6ec956bc7
|
[ci skip]
|
2014-09-02 13:43:14 +08:00 |
minggo
|
2aaae00e47
|
Merge pull request #7926 from kaishiqi/patch-1
Update CCGLViewImpl.cpp
|
2014-09-02 13:41:04 +08:00 |
andyque
|
dffdef1118
|
fix transition scene stencil buffer
|
2014-09-02 11:21:11 +08:00 |
kaishiqi
|
8f11dd7f8b
|
Update CCGLViewImpl.cpp
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
|
2014-09-02 11:13:30 +08:00 |
andyque
|
c13e7b7224
|
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
|
2014-09-02 10:06:17 +08:00 |
andyque
|
6dc45f86e4
|
fix windows compile error
|
2014-09-02 10:05:22 +08:00 |
minggo
|
88a80495df
|
Merge pull request #7923 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-09-02 09:41:41 +08:00 |
zhangbin
|
3e1053aa2a
|
Update the reference of submodule cocos2d-console.
|
2014-09-02 09:31:23 +08:00 |
andyque
|
fa33ab76fc
|
remove UIEditBox test
|
2014-09-01 18:23:45 +08:00 |
andyque
|
e24192aeb2
|
fix linux compile
|
2014-09-01 18:06:21 +08:00 |
andyque
|
ffee7b27d4
|
fix linux and android compile error
|
2014-09-01 17:43:40 +08:00 |
andyque
|
85ce801fdd
|
remove ccscale9sprite , cceditBox
|
2014-09-01 17:06:22 +08:00 |
andyque
|
0076953f97
|
fix iOS compile error
|
2014-09-01 15:55:09 +08:00 |
andyque
|
aef0f5e729
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
|
2014-09-01 15:26:25 +08:00 |
yangxiao
|
c24701ac79
|
Merge branch 'newcode' into v3
|
2014-09-01 15:11:27 +08:00 |