samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
samuele3hu
|
70cba1f64a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
cocos/Android.mk
|
2014-08-22 14:01:17 +08:00 |
samuele3hu
|
2f60e610a2
|
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
|
2014-08-22 13:49:21 +08:00 |
minggo
|
a0b19db670
|
Merge pull request #7840 from minggo/fix-warning
fix warnings
|
2014-08-22 13:41:31 +08:00 |
minggo
|
2afbc7a698
|
fix warnings
|
2014-08-21 16:21:23 +08:00 |
pandamicro
|
34b93a24ff
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
|
2014-08-21 16:07:19 +08:00 |
pandamicro
|
9544482058
|
Fix Android.mk s
|
2014-08-21 15:40:42 +08:00 |
pandamicro
|
485dd1f7da
|
Update #3897: Refactor missed protected constructors
|
2014-08-21 15:40:22 +08:00 |
lite3
|
679d525453
|
Merge branch 'v3' into customguireader
|
2014-08-21 01:22:07 +08:00 |
lite3
|
9f348962c7
|
Merge branch 'v3' into customguireader
|
2014-08-21 00:18:30 +08:00 |
minggo
|
74fba21fc0
|
Merge pull request #7825 from 2youyouo2/v3
remove cascade color for CorlorFrame
|
2014-08-20 10:23:15 +08:00 |
minggo
|
cdd67be77a
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
kaile.yin
|
d884054ec9
|
remove cascade color for CorlorFrame
|
2014-08-19 15:19:47 +08:00 |
kaile.yin
|
6abaf27b14
|
fixed ArmatureAnimation::setSpeedScale
|
2014-08-18 16:19:54 +08:00 |
Daisuke Hashimoto
|
5b620fbfe1
|
use fileName for _actionDic key
|
2014-08-14 21:10:51 +09:00 |
yangxiao
|
032ba062a9
|
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
|
2014-08-14 10:26:37 +08:00 |
yangxiao
|
4629d257e1
|
rename checkCameraMask to isVisibleByVisitingCamera
|
2014-08-14 09:58:11 +08:00 |
yangxiao
|
76329f9e53
|
add camera mask check to visit
|
2014-08-13 12:06:51 +08:00 |
lite3
|
8f59d8ac93
|
add GUIReader::registerTypeAndCallBack for std::function
|
2014-08-12 17:19:52 +08:00 |
lite3
|
69e2b815ed
|
fix: copy map when getParseCallBackMap() and getParseObjectMap()
|
2014-08-12 17:05:23 +08:00 |
kaile.yin
|
358b1f6736
|
fixed bone rotation isn't right
|
2014-08-11 19:53:51 +08:00 |
martell
|
75911658aa
|
Make CMake More Robust
|
2014-08-06 15:43:19 +01:00 |
kaile.yin
|
3dcdb1cde4
|
remove some update condition of Frame::apply function
|
2014-08-01 14:40:42 +08:00 |
kaile.yin
|
2fc082cac1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-31 17:52:49 +08:00 |
kaile.yin
|
170e1a5d7b
|
init widget properties
|
2014-07-31 17:48:45 +08:00 |
Huabing.Xu
|
65775f2d30
|
remove CC_CONSTUCTOR_ACCESS fow win32 release
|
2014-07-30 16:39:21 +08:00 |
Huabing.Xu
|
c722c0fcd0
|
libcocostudio for windows
|
2014-07-29 11:31:37 +08:00 |
Huabing.Xu
|
e91fa0e9fc
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:02 +08:00 |
Huabing.Xu
|
eacf003eed
|
change libExtensions for windows
|
2014-07-29 10:07:46 +08:00 |
Huabing.Xu
|
bf287252df
|
change libnetwork and libSpine
|
2014-07-29 09:31:52 +08:00 |
Huabing.Xu
|
d6bc2f4998
|
liuGUI->libui for windows
|
2014-07-28 22:12:07 +08:00 |
Huabing.Xu
|
c6956504bf
|
change CocosDenshion to libcocosdenshion
|
2014-07-28 21:35:16 +08:00 |
Huabing.Xu
|
8f9ce2e282
|
change cocosbuilder to lowercase
|
2014-07-28 21:09:43 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
Huabing.Xu
|
7f5782c207
|
chang module name for windows project file
|
2014-07-28 09:20:02 +08:00 |
minggo
|
fa1d9ecf0c
|
Merge pull request #7568 from 2youyouo2/v3
fixed init Armature blendfunc state
|
2014-07-24 17:44:56 +08:00 |
Huabing.Xu
|
c7bfc934fd
|
windows works now
|
2014-07-24 12:57:39 +08:00 |
kaile.yin
|
3b1ee96aef
|
fixed armature blendfunc effect
|
2014-07-23 21:35:08 +08:00 |
kaile.yin
|
01d85340ad
|
fixed black edge in Armature
|
2014-07-23 20:07:33 +08:00 |
Huabing.Xu
|
61ff03ab45
|
windows cpp-tests works now
|
2014-07-23 18:34:49 +08:00 |
kaile.yin
|
bdad6d9b67
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-23 15:24:36 +08:00 |
kaile.yin
|
5aae024a7b
|
fixed cannot set blendfunc to Armature
|
2014-07-23 15:21:20 +08:00 |
minggo
|
2e56a4ce21
|
Merge pull request #7546 from nutty898/v3_nutty_modifynodereader
Fixed bug of NodeReader
|
2014-07-22 18:34:36 +08:00 |
cai wenzhi
|
d14522880d
|
Fixed bug of NodeReader
|
2014-07-21 22:45:33 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
minggo
|
aef1e01ce5
|
Merge pull request #7518 from natural-law/android-dependencies
Android dependencies
|
2014-07-18 17:57:42 +08:00 |
zhangcheng
|
24d87ad05b
|
1. fixes ActionManagerEx crashes.
|
2014-07-17 17:24:41 +08:00 |
minggo
|
a653d0eb28
|
Merge pull request #7440 from boyu0/add_utils_atof
Add utils::atof(), fix bug: particle not shown on android.
|
2014-07-17 09:59:15 +08:00 |
zhangcheng
|
1530ba4a90
|
1、fixes Trigger condition value can't be export.
|
2014-07-16 16:12:55 +08:00 |
zhangcheng
|
80de57be39
|
1、 fixes lua TriggerTest bug.
|
2014-07-16 14:50:35 +08:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
zhangbin
|
14f3d6f230
|
Adjust the dependencies of extensions & cocostudio on android.
|
2014-07-16 13:47:57 +08:00 |
zhangcheng
|
8bf4c8b6c9
|
1. Fixes CCTimeLine warning.
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
|
2014-07-15 18:07:33 +08:00 |
pandamicro
|
216af377d0
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans
|
2014-07-15 11:32:12 +08:00 |
pandamicro
|
db8f0ea3ab
|
Fixed #5724: Use correct transform in CCSkin's updateTransform function
|
2014-07-15 11:31:10 +08:00 |
pandamicro
|
67c07f94f4
|
Issue #5724: Correction of property name in CCBone
|
2014-07-15 11:30:36 +08:00 |
boyu0
|
c7fec217ba
|
Change atof() to utils::atof()
|
2014-07-14 20:45:24 +08:00 |
zhangbin
|
e4319bf534
|
Adjust the dependencies of cocosbuilder & cocostudio on android.
|
2014-07-14 09:48:16 +08:00 |
zhangbin
|
b0c465d96b
|
Adjust the dependencies between modules on android.
|
2014-07-14 09:48:16 +08:00 |
geron-cn
|
64408a5d8f
|
fix bug: crash in ui csbs
|
2014-07-11 19:02:14 +08:00 |
andyque
|
d4122d616a
|
fix text reader binray version setFontName
|
2014-07-11 13:58:08 +08:00 |
andyque
|
43255e2b96
|
Merge branch 'v3' into addStudio1.4
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
|
2014-07-11 13:55:13 +08:00 |
minggo
|
d1d84e0d1f
|
Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError
1. fixes TextReader load default font error.
|
2014-07-11 13:40:16 +08:00 |
andyque
|
646f7c7e3f
|
Merge branch 'v3' into addStudio1.4
|
2014-07-11 13:39:34 +08:00 |
minggo
|
4895e6d54a
|
Merge pull request #7362 from geron-cn/chukongv3
Chukongv3
|
2014-07-10 21:17:19 +08:00 |
zhangcheng
|
a0ecae21c3
|
1. fixes TextReader load default font error.
|
2014-07-10 19:29:39 +08:00 |
geron-cn
|
1c4cb78745
|
deal with null in string
|
2014-07-10 18:24:11 +08:00 |
kaile.yin
|
04c63cc370
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:51:02 +08:00 |
kaile.yin
|
42f2302866
|
fixed call Bone::setRotation has no effect
|
2014-07-10 17:50:38 +08:00 |
andyque
|
f76f71eb5d
|
fix win32 & win8 compile error
|
2014-07-10 16:37:15 +08:00 |
andyque
|
41ccd5e465
|
add v1.4 tests
|
2014-07-10 16:37:15 +08:00 |
Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
minggo
|
7d74be3158
|
Merge pull request #7356 from 2youyouo2/v3
fixed Armature blend func effect
|
2014-07-09 18:37:15 +08:00 |
kaile.yin
|
c53cb42e83
|
fixed Armature blend func effect
|
2014-07-09 14:25:51 +08:00 |
zhangcheng
|
af0613cf32
|
1、fixes warning.
|
2014-07-09 00:09:35 +08:00 |
kaile.yin
|
f01b249880
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-08 10:21:00 +08:00 |
kaile.yin
|
d5a79f17ab
|
fixed set color to parent, it will effect its children
|
2014-07-08 10:13:15 +08:00 |
Dale Stammen
|
fa62f4273f
|
fixed missing zlib.h header path
|
2014-07-07 10:14:57 -07:00 |
andyque
|
037a7dc882
|
fix TextReader TTF font Reader issue
|
2014-07-07 15:22:14 +08:00 |
andyque
|
0483c64286
|
fix widget ignoreContentSize issue
|
2014-07-07 15:21:14 +08:00 |
minggo
|
a942aae84f
|
Merge pull request #7316 from cocoscodeide/v3
lua runtime template 1.2
|
2014-07-04 18:33:36 +08:00 |
chuanweizhang2013
|
39b03de8a9
|
revert Android.mk
|
2014-07-04 15:39:07 +08:00 |
andyque
|
c8165bb2d9
|
fix indent problems
|
2014-07-04 11:53:06 +08:00 |
andyque
|
a429182765
|
fix windows compile and running error
|
2014-07-04 11:22:36 +08:00 |
minggo
|
eb97b9ad45
|
Merge pull request #7305 from andyque/fixLayoutReader
fix layout background image default color & opacity
|
2014-07-03 17:16:56 +08:00 |
andyque
|
f82e96daf0
|
fix layout background image default color & opacity
|
2014-07-03 16:56:05 +08:00 |
minggo
|
0be6d27271
|
Merge pull request #7295 from minggo/support-regular-expression
Support regular expression
|
2014-07-03 15:20:06 +08:00 |
andyque
|
32724e559d
|
fix container default color issue
|
2014-07-03 14:38:45 +08:00 |
minggo
|
fffdfb3711
|
Merge pull request #7290 from chengstory/v3_OpBinaryParse
V3 op binary parse
|
2014-07-03 14:00:01 +08:00 |
minggo
|
2cfea323b0
|
Merge pull request #7300 from 2youyouo2/v3
fixed add relative data bug
|
2014-07-03 13:56:04 +08:00 |
minggo
|
6cc600ccce
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
zhangcheng
|
d1db470cf2
|
Merge branch 'macLoader' into v3_OpBinaryParse
|
2014-07-02 16:11:02 +08:00 |
zhangcheng
|
2b1ef55ea9
|
1. fixes scene parse crash.
|
2014-07-02 15:58:42 +08:00 |
zhangcheng
|
9204ac28df
|
1. merge v3
|
2014-07-02 15:37:15 +08:00 |
zhangcheng
|
cf9b049926
|
1. fixes same name warning.
|
2014-07-02 10:53:35 +08:00 |
minggo
|
5b282e338f
|
Merge pull request #7279 from andyque/fixTextReader
fix Text reader font name
|
2014-07-02 10:04:00 +08:00 |
andyque
|
fb3e499d9d
|
fix Text reader font name
|
2014-07-02 10:08:04 +08:00 |
minggo
|
d9a1f76755
|
fix effect of spine
|
2014-07-02 09:58:07 +08:00 |