minggo
|
70f922d07a
|
Merge pull request #8030 from andyque/fixButtonScaleIssue
fix button scale issue
|
2014-09-15 09:49:06 +08:00 |
minggo
|
0d412b1e5e
|
Merge pull request #8027 from slackmoehrle/patch-1
Added git clone instructions and git submodule update --init
|
2014-09-15 09:48:22 +08:00 |
andyque
|
2f85310348
|
adjust registering ui module before extension module
|
2014-09-15 09:46:07 +08:00 |
minggo
|
6bcab3b05d
|
Merge pull request #7920 from rny/audio_win32
win32 can not stop looping sound effect
|
2014-09-15 09:37:11 +08:00 |
minggo
|
788f3c5c38
|
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
|
2014-09-15 09:36:36 +08:00 |
minggo
|
8b1e928741
|
Merge pull request #8026 from super626/v3
Transparent Mesh support
|
2014-09-15 09:36:17 +08:00 |
minggo
|
2b16a29627
|
Merge pull request #8029 from kskkbys/ssl_verification
HttpClient SSL verification
|
2014-09-15 09:35:51 +08:00 |
minggo
|
3e124222d9
|
Merge pull request #8034 from minggo/change-template-folder-name
[ci skip]res->Resources src->Classes for cpp template
|
2014-09-15 09:34:47 +08:00 |
andyque
|
7b0f41ed7b
|
remove auto scale text
|
2014-09-15 09:28:56 +08:00 |
Dhilan007
|
51c19d4b06
|
update project for lua bindings of AudioEngine
|
2014-09-14 23:17:39 +08:00 |
Dhilan007
|
51e3b1af7b
|
Add lua test case of AudioEngine
|
2014-09-14 22:54:48 +08:00 |
Dhilan007
|
cf2a60898f
|
Lua bindings of AudioEngine.
|
2014-09-14 22:54:04 +08:00 |
Dhilan007
|
28af7999e5
|
update test case of AudioEngine
|
2014-09-14 22:49:27 +08:00 |
Dhilan007
|
f6992b94de
|
fix crash in AudioEngine
|
2014-09-14 22:48:41 +08:00 |
joewan
|
93fdcf1f04
|
fix memory leak when use menu_selector.
|
2014-09-14 21:41:19 +08:00 |
Keisuke Kobayashi
|
c4d2c5eaed
|
Rename setSSLVerification
|
2014-09-14 00:28:11 +09:00 |
andyque
|
880929f102
|
fix button scale issue
|
2014-09-13 22:08:02 +08:00 |
Jeff Wang
|
f59c3e02cd
|
Merge pull request #9 from cocos2d/v3
update
|
2014-09-13 21:12:27 +08:00 |
Keisuke Kobayashi
|
6b0879fe93
|
HttpClient SSL verification
|
2014-09-13 20:37:36 +09:00 |
minggo
|
a9232a14ea
|
res->Resources src->Classes for cpp template
|
2014-09-13 17:50:02 +08:00 |
slackmoehrle
|
0dfd272180
|
Added git clone instructions and git submodule update --init
Added git clone instructions and git submodule update --init
|
2014-09-12 10:01:48 -07:00 |
minggo
|
2b3bdbf56d
|
[ci skip]
|
2014-09-12 18:06:33 +08:00 |
yangxiao
|
2e0e4e58c8
|
support transparent object
|
2014-09-12 17:57:54 +08:00 |
minggo
|
0f42d9bbd8
|
Merge pull request #8022 from Dhilan007/v3-labelfix
Label:It may display incorrectly with outline feature enabled.
|
2014-09-12 17:54:02 +08:00 |
yangxiao
|
df5da80439
|
Merge branch 'newcode' into v3
|
2014-09-12 17:43:05 +08:00 |
minggo
|
92325d30e5
|
[ci skip]
|
2014-09-12 17:17:28 +08:00 |
minggo
|
34a015895d
|
Merge pull request #8020 from dabingnn/v3_MaterialIDBug
fix bug for MeshCommand materialID generation
|
2014-09-12 17:15:49 +08:00 |
andyque
|
02d2282b83
|
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
|
2014-09-12 17:07:06 +08:00 |
andyque
|
d4b2e8d154
|
remove deprecated warning
|
2014-09-12 17:06:13 +08:00 |
minggo
|
ba7c0475ba
|
Merge pull request #8023 from CocosRobot/update_lua_bindings_1410509636
[AUTO]: updating luabinding automatically
|
2014-09-12 16:21:49 +08:00 |
CocosRobot
|
29f9cbfd6a
|
[AUTO]: updating luabinding automatically
|
2014-09-12 08:15:54 +00:00 |
minggo
|
35a481f36b
|
Merge pull request #8021 from huangshiwu/v3_shadercompilefix
V3 shadercompilefix
|
2014-09-12 16:10:01 +08:00 |
Dhilan007
|
23f1b740bf
|
Label:It may display incorrectly with outline feature enabled.
|
2014-09-12 16:03:01 +08:00 |
Huabing.Xu
|
1571367042
|
fix bug for MeshCommand materialID generation
|
2014-09-12 15:43:10 +08:00 |
huangshiwu
|
0addaf3912
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
|
2014-09-12 15:38:29 +08:00 |
huangshiwu
|
f1f6373b6e
|
fix Cocos2dShaderCompile's compile error --use chipmunk static library
|
2014-09-12 15:29:10 +08:00 |
minggo
|
7256865f76
|
[ci skip]
|
2014-09-12 15:19:31 +08:00 |
minggo
|
55783b66c2
|
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
V3 drawnode prbk
|
2014-09-12 15:17:49 +08:00 |
minggo
|
2f5a3b6f8c
|
[ci skip]
|
2014-09-12 15:09:50 +08:00 |
minggo
|
52d16afd12
|
Merge pull request #8016 from minggo/template-fix
fix template compiling error
|
2014-09-12 15:07:02 +08:00 |
minggo
|
cecdab4d62
|
Merge pull request #8015 from andyque/fixButtonIssue
Fix text only button can't be touched issue
|
2014-09-12 15:06:33 +08:00 |
minggo
|
11f9eaa4a0
|
fix template compiling error
|
2014-09-12 15:02:18 +08:00 |
huangshiwu
|
11d8829b3a
|
Deprecate DrawPrimitives and enhance DrawNode --little modify
|
2014-09-12 14:50:41 +08:00 |
andyque
|
294271682b
|
change return const value to value
|
2014-09-12 14:39:22 +08:00 |
andyque
|
c81cfc1ecf
|
fix text doesn't scale with button issue
|
2014-09-12 14:24:27 +08:00 |
andyque
|
ed22792a72
|
fix text only button issue
|
2014-09-12 13:50:13 +08:00 |
huangshiwu
|
6182a872c6
|
Deprecate DrawPrimitives and enhance DrawNode --more modify
|
2014-09-12 11:12:20 +08:00 |
yangxiao
|
9eb62ed1f6
|
Merge branch 'newcode' into v3
|
2014-09-12 10:00:13 +08:00 |
Jeff Wang
|
ec4ae7e238
|
Merge pull request #7 from cocos2d/v3
update
|
2014-09-12 09:59:32 +08:00 |
Ricardo Quesada
|
db1505ca1a
|
Merge pull request #8013 from ricardoquesada/more_cmake_fixes
even more cmake fixes
|
2014-09-11 18:36:10 -07:00 |