CocosRobot
|
6967caeff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:47:05 +00:00 |
CocosRobot
|
7e142d79f7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:05:07 +00:00 |
James Chen
|
44a02ba466
|
Merge pull request #4958 from edwardzhou/rename_UIHelper
rename UIHelper to Helper for consistency
|
2014-01-07 00:57:35 -08:00 |
minggo
|
feb4ac1cdb
|
Merge pull request #4959 from minggo/actionprogress-fade-tint
ActionProgress has fade and tint effect
|
2014-01-07 00:32:43 -08:00 |
minggo
|
1275d03c77
|
add override
|
2014-01-07 16:30:12 +08:00 |
minggo
|
6bb4f9822a
|
ActionProgress has fade and tint effect
|
2014-01-07 16:23:58 +08:00 |
edwardzhou
|
e1c21aa9cb
|
rename UIHelper to Helper for consistency
|
2014-01-07 16:22:18 +08:00 |
James Chen
|
d733556270
|
Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 00:00:19 -08:00 |
James Chen
|
49ca35fc3d
|
Merge pull request #4956 from dumganhar/move-temp-obj
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
|
2014-01-06 23:58:42 -08:00 |
CocosRobot
|
f8e7f570f3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 07:54:58 +00:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
James Chen
|
2a3481f20c
|
Moves temp files to CURRENT_BINARY_DIR.
|
2014-01-06 23:44:36 -08:00 |
Ricardo Quesada
|
aa2168f66f
|
RenderQuad with bigger size
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
|
2014-01-06 23:41:01 -08:00 |
James Chen
|
2eb8691f6a
|
Merge pull request #4946 from dumganhar/linux-template-fix
Linux template update
|
2014-01-06 20:57:28 -08:00 |
Zhe Wang
|
9b6027d284
|
Merge pull request #4947 from walzer/develop
udpate copyrights for the new year 2014 and Chukong.
|
2014-01-06 19:50:18 -08:00 |
James Chen
|
b4da4071e7
|
Merge pull request #4943 from CocosRobot/updategeneratedsubmodule_1389065122
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-06 19:48:36 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
minggo
|
49d314363f
|
Merge pull request #4945 from dabingnn/develop_label_shaderBug
fix label fnt bug for wrong shader
|
2014-01-06 19:44:06 -08:00 |
Huabing.Xu
|
6c6da4cf77
|
fix label fnt bug for wrong shader
|
2014-01-07 11:39:55 +08:00 |
James Chen
|
c965131a08
|
Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt.
|
2014-01-06 19:33:28 -08:00 |
CocosRobot
|
641255e3ef
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 03:25:39 +00:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
f7c88a8134
|
issue #3401: update cmake project set
|
2014-01-07 11:09:40 +08:00 |
minggo
|
721181632b
|
Merge pull request #4930 from Dhilan007/develop_crash
fix error for load spriteFrames from plist in CCAnimationCache class.
|
2014-01-06 18:57:47 -08:00 |
James Chen
|
465b33f162
|
Merge pull request #4941 from samuele3hu/developNewUI
Fix:Resolve the release version of lua test sample compile error
|
2014-01-06 18:29:38 -08:00 |
boyu0
|
8e64ef6d6d
|
issue #3401: add physics lua auto generate to android.mk
|
2014-01-07 10:20:59 +08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
samuele3hu
|
c553fd2b73
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 10:10:17 +08:00 |
samuele3hu
|
01013195d3
|
Fix:Resolve the release lua test sample compile error
|
2014-01-07 10:08:58 +08:00 |
CaiWenzhi
|
8cfc6fcafb
|
Remove useless samples
|
2014-01-07 09:47:46 +08:00 |
boyu0
|
eaa3041a97
|
issue #3401: physical lua banding script, add testlua->physics test
|
2014-01-06 22:19:40 +08:00 |
Dhilan007
|
aec4045797
|
fix error for load spriteFrames from plist in CCAnimationCache class.
|
2014-01-06 20:23:45 +08:00 |
James Chen
|
559e5b771f
|
Merge pull request #4928 from dumganhar/more-warning-fix
More warning fixes
|
2014-01-06 04:18:22 -08:00 |
James Chen
|
75804ac8a2
|
Warning fix in ccUTF8.cpp/h
|
2014-01-06 20:04:09 +08:00 |
James Chen
|
1bd0f90437
|
Warning fix in js_manual_conversions.cpp/h
|
2014-01-06 20:02:01 +08:00 |
James Chen
|
dd0e157c74
|
Warning fix in CCTextFieldTTF.cpp.
|
2014-01-06 20:01:28 +08:00 |
James Chen
|
ea60dbb640
|
Fixing ‘ActionTest->AnimationTest’ crashes. It should return empty ValueMap/ValueVector when Value::asValueVector/Map is invoked in empty Value.
|
2014-01-06 19:55:59 +08:00 |
James Chen
|
2818677795
|
Merge pull request #4913 from nutty898/develop_nutty_modify_framework_fixedmemleak
Develop nutty modify framework fixedmemleak
|
2014-01-06 00:24:36 -08:00 |
minggo
|
9b44e80cf2
|
Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug
init shader on construction instead of draw in class CCSpriteBatchNode
|
2014-01-06 00:11:59 -08:00 |
CaiWenzhi
|
60b340f2cd
|
Modify wrong codes
|
2014-01-06 15:59:21 +08:00 |
CaiWenzhi
|
81836d8aeb
|
Merge branch 'develop' into develop_nutty_modify_framework_fixedmemleak
|
2014-01-06 15:57:19 +08:00 |
James Chen
|
34bd322a10
|
Merge pull request #4911 from chengstory/fixesBugs_Develop
Fixes bugs on cocos2dx 3.x
|
2014-01-05 23:13:30 -08:00 |
CaiWenzhi
|
4d1d225bd1
|
Fixed bugs and memory leak
|
2014-01-06 15:07:04 +08:00 |
chengstory
|
e44d28ea7b
|
replace CC_SAFE_RELEASE to CC_SAFE_RELEASE_NULL
|
2014-01-06 13:27:19 +08:00 |
CaiWenzhi
|
63fbec05e9
|
Modify wrong codes
|
2014-01-06 12:19:59 +08:00 |
CaiWenzhi
|
2450841a5f
|
Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping
|
2014-01-06 12:13:24 +08:00 |
minggo
|
e4bec7d1ef
|
Merge pull request #4902 from Dhilan007/develop_crash
fix TextInput not show IME on android.
|
2014-01-05 19:50:19 -08:00 |
Dhilan007
|
5b317196c8
|
fix TextInput not show IME on android.
|
2014-01-06 11:45:18 +08:00 |
CaiWenzhi
|
99d842d954
|
Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping
|
2014-01-06 11:39:01 +08:00 |
Huabing.Xu
|
381be48c56
|
init shader on construction instead of draw in class CCSpriteBatchNode
|
2014-01-06 11:26:00 +08:00 |