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 |
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 |
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 |
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 |