James Chen
|
eb8f621ab0
|
closed #3597: Uses !xxx.empty() instead of xxx.size() > 0.
|
2014-01-08 10:47:27 +08:00 |
James Chen
|
685b80796b
|
Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist
|
2014-01-08 10:36:51 +08:00 |
minggo
|
6529380b77
|
Merge pull request #4988 from dumganhar/develop
If this.ctor was not found, output a log.
|
2014-01-07 06:41:53 -08:00 |
James Chen
|
65b5a7c031
|
If this.ctor was not found, output a log.
|
2014-01-07 22:39:14 +08:00 |
James Chen
|
20f2f7255e
|
Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 06:28:04 -08:00 |
CocosRobot
|
a650ddf88b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 14:27:34 +00:00 |
minggo
|
ac8a7b4ce1
|
Merge pull request #4983 from dabingnn/develop_layerColorBug
fix layerColor occlude sprite bug on android
|
2014-01-07 06:25:59 -08:00 |
samuele3hu
|
a61f9fce27
|
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
|
2014-01-07 22:16:07 +08:00 |
Huabing.Xu
|
b1d9d5e55e
|
fix layerColor occlude sprite bug on android
|
2014-01-07 22:08:00 +08:00 |
James Chen
|
01745f5ba6
|
Merge pull request #4980 from CocosRobot/updategeneratedsubmodule_1389101321
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 05:46:08 -08:00 |
James Chen
|
1d852788e2
|
[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.
|
2014-01-07 21:40:06 +08:00 |
CocosRobot
|
6fd72db513
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 13:28:43 +00:00 |
James Chen
|
9387e516be
|
[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer.
|
2014-01-07 21:19:51 +08:00 |
James Chen
|
c7639319ee
|
Fix Armature::init() crashes
|
2014-01-07 20:53:44 +08:00 |
James Chen
|
e90f35daa6
|
Merge pull request #4975 from chengstory/fix_UIAction_play_error
fixed UIAction play error.
|
2014-01-07 03:17:41 -08:00 |
zhangcheng
|
bf8187fee2
|
fixed UIAction play error.
|
2014-01-07 19:04:18 +08:00 |
James Chen
|
54cbfe938b
|
Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 02:41:53 -08:00 |
CocosRobot
|
ab84228037
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 10:40:28 +00:00 |
James Chen
|
18963b46f5
|
Merge pull request #4971 from Dhilan007/develop_crash
update liblua vs project for add miss file.
|
2014-01-07 02:31:58 -08:00 |
Dhilan007
|
ba4833e070
|
update liblua vs project for add miss file.
|
2014-01-07 18:30:12 +08:00 |
James Chen
|
ac3697db19
|
fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS?
|
2014-01-07 18:28:46 +08:00 |
James Chen
|
5391024399
|
Adds override keyword.
|
2014-01-07 18:27:04 +08:00 |
James Chen
|
26efb4bf5c
|
long —> ssize_t for some classes.
|
2014-01-07 18:26:31 +08:00 |
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 |