CocosRobot
|
467177f45c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-11-28 06:31:21 +00:00 |
CocosRobot
|
a839e8d307
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-11-28 06:30:10 +00:00 |
zilongshanren
|
4fbe8a62bf
|
Update CHANGELOG
|
2015-11-28 14:29:40 +08:00 |
CocosRobot
|
3510228659
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-11-28 06:29:01 +00:00 |
zilongshanren
|
5e02b7f20a
|
Update CHANGELOG
|
2015-11-28 14:28:44 +08:00 |
zilongshanren
|
01e619f686
|
Merge pull request #14476 from cesarpachon/linuxAudioEngine
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
|
2015-11-28 14:27:15 +08:00 |
xiaofeng11
|
fdd3bacde1
|
Merge pull request #14509 from pmaloman/v3_Wrong_assert_in_ComponentContainer
Fixed assert statement. Added name to physic component.
|
2015-11-28 13:33:38 +08:00 |
XiaoFeng
|
89ef6da5b5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
Conflicts:
cocos/2d/CCFontFNT.h
|
2015-11-28 12:48:55 +08:00 |
zilongshanren
|
2571b87bda
|
Merge pull request #14505 from xiaofeng11/v3_iOSFix
Fix keyboard won't dismiss on iOS issue
|
2015-11-28 11:41:41 +08:00 |
pandamicro
|
43c68aa16b
|
Fix Chipmunk bindings issue
|
2015-11-27 22:38:16 +08:00 |
PavlOm
|
6e0525156b
|
no message
|
2015-11-27 23:33:20 +10:00 |
fnz
|
ca5ef5795e
|
fixes to local storage
|
2015-11-27 14:28:26 +03:00 |
XiaoFeng
|
150d907636
|
Add missing changes to Particle 3d
|
2015-11-27 19:01:30 +08:00 |
zilongshanren
|
f1ddef6fd9
|
Merge pull request #14508 from CocosRobot/update_lua_bindings_1448616961
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-27 18:37:05 +08:00 |
zilongshanren
|
2109ef8d56
|
Merge pull request #14507 from CocosRobot/update_lua_bindings_1448616906
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-27 18:36:54 +08:00 |
fnz
|
8c691430c1
|
conflicts resolved
|
2015-11-27 13:19:10 +03:00 |
CocosRobot
|
1d581264df
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-27 09:42:17 +00:00 |
CocosRobot
|
5c9084fd7d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-27 09:41:59 +00:00 |
zilongshanren
|
9639208ce3
|
Update CHANGELOG
|
2015-11-27 17:32:31 +08:00 |
zilongshanren
|
0f8c3e0c1c
|
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
Add Overflow to Label
|
2015-11-27 17:31:40 +08:00 |
xiaofeng11
|
0ce66160c0
|
Merge pull request #14503 from xpol/remove-log-in-ccs-loader
Remove boring logs in cocos studio supporting module.
|
2015-11-27 17:20:54 +08:00 |
fnz
|
c4b995fe59
|
updates to JniHelper, refactoring of existing JNI calls
|
2015-11-27 12:00:33 +03:00 |
XiaoFeng
|
71871bacf9
|
Add aabb dirty mark when load from file
|
2015-11-27 15:53:26 +08:00 |
肖峰
|
f0cc8e7f25
|
Fix keyboard won't dismiss on iOS issue
|
2015-11-27 15:44:35 +08:00 |
肖峰
|
8b631f5c9f
|
Fix compile failed on mobile platform
|
2015-11-27 15:19:50 +08:00 |
XiaoFeng
|
2d28b78e41
|
Add 3 missing class export
Change clearShader logic.
|
2015-11-27 14:58:18 +08:00 |
pandamicro
|
e13e0cb886
|
Fix getJSObject issues
|
2015-11-27 14:54:25 +08:00 |
Xpol Wan
|
d6ddb365b6
|
Remove boring logs in cocos studio supporting module.
They are helpless for debugging, we should use break points for debugging.
|
2015-11-27 14:43:25 +08:00 |
songchengjiang
|
b55f040ec6
|
fix macro definition error
|
2015-11-27 14:23:17 +08:00 |
minggo
|
2a877ff234
|
Merge pull request #14429 from xiaofeng11/v3_combine_misc
Combine Studio change for get program file full path.
|
2015-11-27 14:15:37 +08:00 |
XiaoFeng
|
8e4276469c
|
Add comment to new function
|
2015-11-27 14:08:27 +08:00 |
XiaoFeng
|
a61fe711e2
|
Update
|
2015-11-27 14:01:43 +08:00 |
songchengjiang
|
642e19baef
|
unify (No)Normal Mapping shaders
|
2015-11-27 13:15:33 +08:00 |
XiaoFeng
|
ec1d76b15e
|
Fix compile error
|
2015-11-27 13:08:22 +08:00 |
XiaoFeng
|
9e50c010e9
|
Fix win8.1 project compile error
|
2015-11-27 11:49:35 +08:00 |
XiaoYang
|
92d7ccfbca
|
Merge pull request #14471 from super626/v3
release default fbo
|
2015-11-27 11:33:07 +08:00 |
cesarpachon
|
40f6f76030
|
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
|
2015-11-26 22:22:05 -05:00 |
Neo Kim
|
3f9b40c093
|
Fix #14440
|
2015-11-26 22:22:04 -05:00 |
Xpol Wan
|
520aa9d351
|
Remove duplicated code by introduce a private doSetResponseCallback.
|
2015-11-26 22:22:04 -05:00 |
Xpol Wan
|
4bedfa4f14
|
Fixes boring deprecated warning.
I know I duplicated the code but there is no cpp for me to move body into.
|
2015-11-26 22:22:04 -05:00 |
zilongshanren
|
f5d2ea11b7
|
Update CHANGELOG
|
2015-11-27 10:58:48 +08:00 |
pandamicro
|
1ee7b11e31
|
Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject
|
2015-11-27 10:20:51 +08:00 |
pandamicro
|
955ddaafb7
|
Use rooted object for js_proxy new and get (missed)
|
2015-11-27 10:20:04 +08:00 |
pandamicro
|
8320c2f702
|
Use rooted object for js_proxy new and get
|
2015-11-27 10:19:13 +08:00 |
pandamicro
|
d23ffe4fc7
|
Fix some issue of js_type_class usage
|
2015-11-27 10:16:11 +08:00 |
songchengjiang
|
fc4c3ec650
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-11-27 09:34:31 +08:00 |
pandamicro
|
73c3a5dcf5
|
Activate DEBUG to test
|
2015-11-27 01:35:07 +08:00 |
pandamicro
|
ae2b75c8be
|
Fix issues causing by temporary RootedObject passed as function parameters
|
2015-11-27 01:35:06 +08:00 |
zilongshanren
|
c50d686319
|
Merge pull request #14493 from xiaofeng11/v3_button
Fix button texture loaded mark has set to wrong value bug
|
2015-11-26 21:45:47 +08:00 |
zilongshanren
|
6595075fb7
|
Merge pull request #14496 from CocosRobot/update_lua_bindings_1448517311
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-26 21:45:23 +08:00 |