yangxiao
|
e2f1b91117
|
remove unused variable
|
2014-09-25 22:25:43 +08:00 |
yangxiao
|
90523fc3d5
|
fix light check
|
2014-09-25 22:24:47 +08:00 |
yangxiao
|
02489ecad6
|
add light to cocos2d.h
|
2014-09-25 22:18:50 +08:00 |
minggo
|
b0212ad62a
|
Merge pull request #8159 from CocosRobot/update_cocosfiles_1411639554
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-25 18:37:03 +08:00 |
yangxiao
|
ca9eb3d203
|
support ambient light without normal & optimaze code
|
2014-09-25 18:32:33 +08:00 |
CocosRobot
|
1f2fc054fe
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-25 10:05:55 +00:00 |
minggo
|
615b367277
|
Merge pull request #8158 from dabingnn/v3_neon
V3 neon
|
2014-09-25 18:02:46 +08:00 |
yangxiao
|
8f3f37c2bb
|
auto switch shader according to light status
|
2014-09-25 17:13:46 +08:00 |
Huabing.Xu
|
af0c9ce2fa
|
reverse target=android-10 on android
|
2014-09-25 16:54:33 +08:00 |
yangxiao
|
bf84aba47e
|
do not add ambient color by default
|
2014-09-25 16:27:31 +08:00 |
yangxiao
|
2317720fd2
|
move uniformnames to cpp
|
2014-09-25 16:18:55 +08:00 |
Huabing.Xu
|
ed9848a782
|
neon works on android(only on armeabi-v7a)
|
2014-09-25 16:09:28 +08:00 |
yangxiao
|
eab0951c2d
|
reset
|
2014-09-25 16:07:57 +08:00 |
yangxiao
|
567c632d98
|
config max support light number in shader
|
2014-09-25 15:29:32 +08:00 |
samuele3hu
|
38530772ae
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 15:26:03 +08:00 |
samuele3hu
|
3e5638fe91
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua
|
2014-09-25 15:17:55 +08:00 |
samuele3hu
|
23fb2062c9
|
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
|
2014-09-25 15:05:42 +08:00 |
minggo
|
22d27fca3b
|
Merge pull request #8155 from CocosRobot/update_lua_bindings_1411627694
[AUTO]: updating luabinding automatically
|
2014-09-25 14:56:55 +08:00 |
CocosRobot
|
7192681618
|
[AUTO]: updating luabinding automatically
|
2014-09-25 06:50:06 +00:00 |
minggo
|
d36e57f129
|
[ci skip]Update Authors
|
2014-09-25 14:49:51 +08:00 |
minggo
|
e281f9f6b3
|
[ci skip] Update CHANGELOG
|
2014-09-25 14:47:03 +08:00 |
minggo
|
9509f4cf9a
|
Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
|
2014-09-25 14:44:28 +08:00 |
minggo
|
df7685d237
|
[ci skip] Update CHANGELOG
|
2014-09-25 13:52:20 +08:00 |
CocosRobot
|
1da8986291
|
[AUTO]: updating luabinding automatically
|
2014-09-25 05:48:32 +00:00 |
minggo
|
d491d9e6db
|
Merge pull request #8149 from andyque/fixIOS8EditBox
fix ios8 EditBox orientation problem
|
2014-09-25 13:47:23 +08:00 |
minggo
|
26cbfaa29b
|
[ci skip]
|
2014-09-25 13:46:12 +08:00 |
minggo
|
b0f2fd965a
|
Merge pull request #8151 from CocosRobot/update_cocosfiles_1411623783
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-25 13:45:19 +08:00 |
minggo
|
ebc632fd1f
|
[ci skip]
|
2014-09-25 13:45:00 +08:00 |
minggo
|
f9fb673df9
|
[ci skip]
|
2014-09-25 13:43:12 +08:00 |
CocosRobot
|
e0d14458a5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-25 05:43:04 +00:00 |
minggo
|
2620592d62
|
Merge pull request #7975 from newnon/v3_openUrl
openUrl function for all platform but on windows RT empty function
|
2014-09-25 13:41:08 +08:00 |
minggo
|
9510d6d946
|
Merge pull request #8136 from andyque/moveWinEditBox
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
|
2014-09-25 13:38:19 +08:00 |
minggo
|
aec6cf1e81
|
Merge pull request #8143 from cocoscodeide/v3
read config.json may failed caused by syntax error
|
2014-09-25 13:36:08 +08:00 |
honghui
|
206e158596
|
performance improvement for lua runtime on Run mode
|
2014-09-25 12:01:16 +08:00 |
andyque
|
34fbca9c50
|
fix ios8 EditBox orientation problem
|
2014-09-25 11:46:42 +08:00 |
yangxiao
|
56313aa895
|
merge cocos
|
2014-09-25 11:05:02 +08:00 |
minggo
|
b56b0d1eae
|
[ci skip]
|
2014-09-25 10:55:18 +08:00 |
Huabing.Xu
|
ab19c81371
|
add neon64 implementation
|
2014-09-25 10:53:44 +08:00 |
minggo
|
260cdd4eaa
|
[ci skip]
|
2014-09-25 10:53:34 +08:00 |
Huabing.Xu
|
a897f23023
|
refactor neon code
|
2014-09-25 10:46:25 +08:00 |
samuele3hu
|
2cc48d1f81
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 10:40:31 +08:00 |
minggo
|
6a437d79b1
|
Merge pull request #8138 from MSOpenTech/wp8-v3.3
WP8 v3.3 bug fixes
|
2014-09-25 10:39:37 +08:00 |
XiaoYang
|
d419fd64c2
|
Merge pull request #133 from songchengjiang/light_new
Modified Light Shader
|
2014-09-25 09:59:50 +08:00 |
minggo
|
efa1c86fc5
|
Merge pull request #8103 from cpascal/fix_no_physics
Fixed compile error when I turned off physics definitions.
|
2014-09-25 09:56:45 +08:00 |
honghui
|
8079722aff
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-09-25 09:55:00 +08:00 |
minggo
|
cebde4181b
|
[ci skip]
|
2014-09-25 09:43:11 +08:00 |
minggo
|
04aa44aeea
|
Merge pull request #8141 from huangshiwu/v3_wp8test
fix Class TextFieldTTF's keyboard input bug on WP8 platform
|
2014-09-25 09:40:10 +08:00 |
huanghsiwu
|
49f1927d5d
|
fix Class TextFieldTTF's keyboard input bug on WP8 platform
|
2014-09-25 07:41:51 +08:00 |
toma
|
d1faf75b58
|
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
|
2014-09-25 01:46:17 +09:00 |
Dale Stammen
|
1146f1a8db
|
use CCGLViewImpl.h
|
2014-09-24 08:38:48 -07:00 |