yangxiao
|
79a55286ce
|
refactor to new model
|
2014-08-18 11:13:08 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
songchengjiang
|
9b3a02f350
|
Added Light Test
Added Point Light
|
2014-08-17 21:33:33 +08:00 |
yangxiao
|
7159914248
|
old model work
|
2014-08-16 16:56:04 +08:00 |
songchengjiang
|
2b1efc59cb
|
GLProgram Added Light Shader
GLProgram Added Normal Matrix
|
2014-08-15 19:15:14 +08:00 |
andyque
|
0517ceb0dc
|
add scrollView nested tests
|
2014-08-15 16:21:27 +08:00 |
minggo
|
f2f8035724
|
Merge pull request #7708 from super626/obb
AABB, OBB
|
2014-08-15 15:32:14 +08:00 |
andyque
|
0e637b4d9f
|
add swallow touch and propagation customization to UIWidgets
|
2014-08-15 15:28:28 +08:00 |
minggo
|
8364e179a4
|
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
add customization to UIButton and UIPageView
|
2014-08-15 15:16:12 +08:00 |
songchengjiang
|
1e9c02dfa3
|
Added Light Class
|
2014-08-15 14:51:23 +08:00 |
minggo
|
db17084b6d
|
fix warnings
|
2014-08-15 12:06:16 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |
minggo
|
ae11f24cc8
|
Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline
V3 fix skinned outline
|
2014-08-14 11:26:35 +08:00 |
andyque
|
18851d3e81
|
add customization to UIButton and UIPageView
|
2014-08-14 11:14:24 +08:00 |
Huabing.Xu
|
a9a403013c
|
fix skinned outline effect
|
2014-08-14 10:44:03 +08:00 |
Huabing.Xu
|
5d49afec0e
|
fix ios running error
|
2014-08-14 10:04:01 +08:00 |
minggo
|
a88504b153
|
Merge pull request #7756 from andyque/fixTestCase
fix custom particle tests position
|
2014-08-14 09:44:16 +08:00 |
minggo
|
0b86e129b0
|
Merge pull request #7762 from andyque/addAlignmentToUILabel
add UITextField color & place hold color, fix double delete bug
|
2014-08-14 09:38:57 +08:00 |
yangxiao
|
6ce3b5c20a
|
add mirror test
|
2014-08-13 17:38:16 +08:00 |
andyque
|
e2d609c05d
|
add UITextField color & place hold color, fix double delete bug
|
2014-08-13 11:28:37 +08:00 |
minggo
|
d223629477
|
Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture
add callback for RenderTexture::saveToFile
|
2014-08-13 10:05:08 +08:00 |
andyque
|
e269ad49c1
|
fix custom particle tests position
|
2014-08-13 09:56:37 +08:00 |
minggo
|
cc37780861
|
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
V3 add skinned outline
|
2014-08-12 15:07:21 +08:00 |
boyu0
|
e4bb0ad3c8
|
fix some merge errors.
|
2014-08-12 11:39:56 +08:00 |
boyu0
|
5a2564755c
|
change NULL->nullptr
|
2014-08-12 11:29:37 +08:00 |
Huabing.Xu
|
3a7b673164
|
add callback for RenderTexture::saveToFile
|
2014-08-12 10:50:57 +08:00 |
boyu0
|
790ef9e818
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
|
2014-08-12 10:20:34 +08:00 |
Huabing.Xu
|
e387caf763
|
add create(modelPath) interface for EffectSprite3D
|
2014-08-12 09:56:25 +08:00 |
Huabing.Xu
|
0dff45cfc2
|
adjust SkinnedEffectCode
|
2014-08-12 09:51:03 +08:00 |
Huabing.Xu
|
e66d1f6f69
|
add skinned outline effect
|
2014-08-11 18:11:15 +08:00 |
minggo
|
b34e97cfd6
|
Merge pull request #7729 from andyque/fixCascadedColor
fixed Widget's Children reload textures change RGBA issue
|
2014-08-11 15:33:36 +08:00 |
andyque
|
cdb2b9f59f
|
fixed Widget's Children reload textures change RGBA issue
|
2014-08-11 15:04:00 +08:00 |
yangxiao
|
6d15c26a61
|
move create default camera to Scene::initWithSize
|
2014-08-11 10:55:14 +08:00 |
yangxiao
|
933439c6ca
|
fix linux
|
2014-08-09 09:27:48 +08:00 |
yangxiao1
|
014b6d06e4
|
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb
|
2014-08-08 18:26:34 +08:00 |
yangxiao1
|
e904ee646a
|
windows work
|
2014-08-08 18:25:36 +08:00 |
yangxiao
|
6d5b63ec6a
|
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb
|
2014-08-08 18:15:01 +08:00 |
yangxiao
|
504ef32b97
|
linux
|
2014-08-08 18:14:41 +08:00 |
Huabing.Xu
|
7e1adeb3e9
|
add new test case
|
2014-08-08 18:01:36 +08:00 |
lvlong
|
8101e2ff1a
|
1. move drawnode3d to Sprite3DTest
2. add getAABB to sprite3D and mesh
|
2014-08-08 17:54:39 +08:00 |
yangxiao
|
ceb6549ec8
|
merge cocos2d
|
2014-08-08 16:25:52 +08:00 |
minggo
|
213f2f5a6c
|
Merge pull request #7702 from super626/v3_merge
Camera and Camera test
|
2014-08-08 15:56:38 +08:00 |
yangxiao
|
7408250113
|
add drawline
|
2014-08-08 15:01:24 +08:00 |
andyque
|
d00e3349a3
|
fixed loadingBar change direction affect position issue
|
2014-08-08 11:17:17 +08:00 |
lvlong
|
28769c9b15
|
add obb sample
|
2014-08-08 11:16:33 +08:00 |
yangxiao
|
3c9483899e
|
camera, cameratest, drawNode3D squash
|
2014-08-07 15:23:31 +08:00 |
samuele3hu
|
cf0aa36c15
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
|
2014-08-07 14:02:50 +08:00 |
samuele3hu
|
aa4f407851
|
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
|
2014-08-07 13:53:13 +08:00 |
minggo
|
4542b1882d
|
Merge pull request #7617 from rny/SpriteFrameCache
SpriteFrameCache load from plist file content data
|
2014-08-07 10:20:36 +08:00 |
minggo
|
cc75a8e860
|
Merge pull request #7632 from super626/v3
SubMesh and AttachMement
|
2014-08-05 09:59:38 +08:00 |
andyque
|
f44906d56c
|
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
|
2014-08-05 08:11:37 +08:00 |
yangxiao
|
11a13ce9e2
|
Merge branch 'newcode' into v3
|
2014-08-04 15:41:21 +08:00 |
yangxiao
|
4452d9579a
|
merge cocos2d, fix lua
|
2014-08-04 12:07:27 +08:00 |
andyque
|
5af4657fbb
|
fix windows utf8 source code file can not compile erorr
|
2014-08-01 21:20:27 +08:00 |
huangshiwu
|
575c9787c0
|
Merge branch 'v3' into v3_pr
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-01 15:11:34 +08:00 |
Ningyu
|
137de84b05
|
add test case
|
2014-08-01 14:39:45 +08:00 |
yangxiao
|
e03d284e26
|
merge cocos2d
|
2014-07-31 18:55:41 +08:00 |
minggo
|
2851bd9193
|
Merge pull request #7627 from andyque/fixScale9Sprite
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
|
2014-07-31 16:58:56 +08:00 |
minggo
|
0e7eb3614e
|
Merge pull request #7618 from dabingnn/v3_buildAllTarget
add target to build All target
|
2014-07-31 14:25:37 +08:00 |
minggo
|
a77b8e7320
|
Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
add utf8 support for TextField widget
|
2014-07-31 13:41:57 +08:00 |
yangxiao
|
cd379ab412
|
add axe model
|
2014-07-31 11:26:27 +08:00 |
andyque
|
1de2b78d61
|
refactor, optimize Scale9Sprite
|
2014-07-31 11:07:20 +08:00 |
yangxiao
|
44c501ca2a
|
merge cocos2d
|
2014-07-31 09:56:23 +08:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
Huabing.Xu
|
65775f2d30
|
remove CC_CONSTUCTOR_ACCESS fow win32 release
|
2014-07-30 16:39:21 +08:00 |
Huabing.Xu
|
428e9b1b1a
|
Merge branch 'v3' into v3_buildAllTarget
|
2014-07-30 14:12:28 +08:00 |
andyque
|
f2b0528cc9
|
refactor
|
2014-07-30 10:45:35 +08:00 |
andyque
|
7abea5dc58
|
add utf8 support for UITextField
|
2014-07-30 10:34:37 +08:00 |
andyque
|
955da5d3cc
|
move utf8_substr to ui::helper class.
|
2014-07-30 10:34:37 +08:00 |
Huabing.Xu
|
d86cc0a811
|
decouple libcocos2d and cocosdenshion
|
2014-07-29 18:08:40 +08:00 |
andyque
|
5a22636441
|
fix windows compile error
|
2014-07-29 17:51:34 +08:00 |
andyque
|
c5ca0dbf10
|
fix android and linux compile error
|
2014-07-29 16:24:27 +08:00 |
andyque
|
1daaea1410
|
remove extension::Scale9Sprite dependency
|
2014-07-29 16:24:27 +08:00 |
andyque
|
ebf05d1acc
|
add UIScale9Sprite tests
|
2014-07-29 16:24:27 +08:00 |
minggo
|
5d63ce17ad
|
Merge pull request #7610 from dabingnn/v3_windowChangeModule
V3 window change module
|
2014-07-29 14:29:01 +08:00 |
Huabing.Xu
|
c722c0fcd0
|
libcocostudio for windows
|
2014-07-29 11:31:37 +08:00 |
boyu0
|
1b6cda488a
|
add ParticleResetTotalParticles test.
|
2014-07-29 11:21:11 +08:00 |
Huabing.Xu
|
d53ce4d664
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:17 +08:00 |
Huabing.Xu
|
6d0b8852d1
|
libSpine rename for windows
|
2014-07-29 10:53:39 +08:00 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +08:00 |
Huabing.Xu
|
eacf003eed
|
change libExtensions for windows
|
2014-07-29 10:07:46 +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
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
minggo
|
b2e705acd8
|
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
fix remove self in Widget touch callback issue
|
2014-07-28 14:04:20 +08:00 |
Huabing.Xu
|
2795c10627
|
rename box2d->libbox2d
|
2014-07-28 12:05:58 +08:00 |
Huabing.Xu
|
7f5782c207
|
chang module name for windows project file
|
2014-07-28 09:20:02 +08:00 |
andyque
|
7353f8685a
|
Simplify Widget ContentSize cascade change algorithm
|
2014-07-25 14:59:58 +08:00 |
andyque
|
e56e015be2
|
minor modification of tests
|
2014-07-25 14:40:58 +08:00 |
andyque
|
3502cb0a23
|
fix remove self in Widget touch callback issue
|
2014-07-25 14:23:04 +08:00 |
minggo
|
20e3a61524
|
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
mac custom font fix v2
|
2014-07-25 11:38:38 +08:00 |
minggo
|
b0c922d91e
|
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
Refactor #5580: Add new file&directory apis into FileUtils and test cases
|
2014-07-24 22:18:10 +08:00 |
Sergey
|
92ac809bfe
|
Mac fonts tests
|
2014-07-24 12:27:17 +04:00 |
Huabing.Xu
|
c7bfc934fd
|
windows works now
|
2014-07-24 12:57:39 +08:00 |
andyque
|
21f1624462
|
minor fix of RichText
|
2014-07-23 14:10:00 +08:00 |
minggo
|
524d9cb8af
|
Merge pull request #7552 from andyque/fixScale9Sprite
fix scale9Sprite addChild zorder issue
|
2014-07-22 18:39:04 +08:00 |
andyque
|
1f4c289db4
|
fix scale9Sprite addChild zorder issue
|
2014-07-22 16:26:40 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
pandamicro
|
d2c6602dea
|
Refactor #5580: Merge createDirectories to createDirectory
|
2014-07-21 16:51:48 +08:00 |