andyque
|
b00a7b3b38
|
add Node normalizedPosition bug test
|
2014-09-03 09:16:31 +08:00 |
andyque
|
a79d35d08b
|
remove NodeNormalizedPositionTest
|
2014-09-03 09:16:31 +08:00 |
andyque
|
fab9a0052b
|
fix normalizedPosition bug
|
2014-09-03 09:16:31 +08:00 |
songchengjiang
|
18d06015c6
|
Added More Models
Code optimization
|
2014-09-02 11:24:19 +08:00 |
andyque
|
85ce801fdd
|
remove ccscale9sprite , cceditBox
|
2014-09-01 17:06:22 +08:00 |
andyque
|
0076953f97
|
fix iOS compile error
|
2014-09-01 15:55:09 +08:00 |
andyque
|
aef0f5e729
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
|
2014-09-01 15:26:25 +08:00 |
yangxiao
|
538fe2e543
|
Merge branch 'newcode' into transition
|
2014-09-01 15:14:30 +08:00 |
Ricardo Quesada
|
2c068cd1f5
|
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
Adds MARK: TODO: FIXME: in code
|
2014-08-29 12:55:14 -07:00 |
Ricardo Quesada
|
c149bfca00
|
Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
|
2014-08-29 12:54:24 -07:00 |
yangxiao
|
a039d6b0fc
|
animate3d transition
|
2014-08-29 18:25:42 +08:00 |
songchengjiang
|
9f715e4e00
|
Added Sprite3D Model
|
2014-08-29 18:18:19 +08:00 |
songchengjiang
|
0d75998027
|
pressure test
|
2014-08-29 17:58:20 +08:00 |
songchengjiang
|
4aa4287d28
|
test on Android
|
2014-08-29 17:29:15 +08:00 |
songchengjiang
|
34070677ad
|
Added testing Model Number
|
2014-08-29 17:11:18 +08:00 |
songchengjiang
|
71d722854c
|
added mesh command
|
2014-08-29 12:08:28 +08:00 |
songchengjiang
|
701d70fb6c
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-29 10:58:04 +08:00 |
andyque
|
cd031c4493
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
|
2014-08-29 10:25:24 +08:00 |
songchengjiang
|
f5ea9a2219
|
tab format
|
2014-08-29 09:33:28 +08:00 |
songchengjiang
|
06e3eb955f
|
repaired BillBoard Depth Test
|
2014-08-29 09:30:59 +08:00 |
songchengjiang
|
ac8158c60b
|
Tab Format
|
2014-08-29 09:14:54 +08:00 |
songchengjiang
|
e16fb5977e
|
Finished BillBorad
|
2014-08-29 09:14:22 +08:00 |
songchengjiang
|
e6f055f3fd
|
calculated Z in View
Transparent Render
|
2014-08-28 19:22:01 +08:00 |
minggo
|
6a8270f33b
|
Merge pull request #7900 from minggo/setposition-optimize
not create Vec as possible for setting position
|
2014-08-28 14:31:54 +08:00 |
minggo
|
681c3c06f1
|
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
stopAllActionsByTag && removeAllActionsByTag
|
2014-08-28 14:24:37 +08:00 |
minggo
|
2fd6cf8f43
|
fix compiling error
|
2014-08-28 13:59:56 +08:00 |
minggo
|
9fb977ff99
|
not create Vec as possible for setting position
|
2014-08-28 11:41:18 +08:00 |
songchengjiang
|
014ba0d12e
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
|
2014-08-28 10:17:32 +08:00 |
songchengjiang
|
5067741140
|
Deleted Plane Model
|
2014-08-28 10:16:15 +08:00 |
yangxiao
|
d0943afb62
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
|
2014-08-28 09:24:04 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +08:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
Ricardo Quesada
|
dbdd2b3e13
|
Adds ClippingNode bug test case
|
2014-08-27 10:54:15 -07:00 |
songchengjiang
|
26dc7de802
|
Repaired Light Shader BUG On ios
|
2014-08-27 21:03:52 +08:00 |
songchengjiang
|
731d1165c3
|
Spot Light Shader optimization
|
2014-08-27 17:09:20 +08:00 |
minggo
|
d0ca9a4da5
|
remove unneeded include header files
|
2014-08-27 13:39:50 +08:00 |
yangxiao
|
c5515874d5
|
merge cocos
|
2014-08-27 11:00:14 +08:00 |
andyque
|
4597de069d
|
improve test case and make program more robust
|
2014-08-27 08:02:22 +08:00 |
andyque
|
84c5542a0e
|
Merge branch 'v3' into addWebView
|
2014-08-26 22:11:35 +08:00 |
andyque
|
9449152caf
|
finish WebView Tests
|
2014-08-26 22:03:55 +08:00 |
andyque
|
15815118a2
|
finish android version
|
2014-08-26 16:53:37 +08:00 |
yangxiao
|
7d6b8ea706
|
merge cocos
|
2014-08-26 14:58:58 +08:00 |
yangxiao
|
03390a4f46
|
merge cocos
|
2014-08-26 14:05:59 +08:00 |
andyque
|
e12db46866
|
fix style
|
2014-08-26 12:08:26 +08:00 |
andyque
|
2226d4b420
|
change WebView namespace and add WebViewTest
|
2014-08-26 11:39:56 +08:00 |
songchengjiang
|
3d59aaf86e
|
Replaced Tab Format
|
2014-08-26 09:43:11 +08:00 |
yangxiao
|
cff5b65314
|
Merge branch 'newcode' into v3
|
2014-08-25 21:20:49 +08:00 |
yangxiao
|
dd93439c4b
|
replace model
|
2014-08-25 19:25:51 +08:00 |
songchengjiang
|
00085c157f
|
Added skeleton Model
Light On/Off
|
2014-08-25 16:32:15 +08:00 |
songchengjiang
|
1a1ccda3ed
|
repaired Action BUG
|
2014-08-25 13:58:15 +08:00 |
yangxiao
|
8bfd56c080
|
use normal walk
|
2014-08-25 11:31:38 +08:00 |
minggo
|
dcea3b6134
|
Merge pull request #7843 from huangshiwu/v3_glviewattrs
V3 glviewattrs
|
2014-08-25 09:46:19 +08:00 |
minggo
|
0701fe1dfb
|
Merge pull request #7853 from super626/v3
Better reskin model support
|
2014-08-22 19:18:47 +08:00 |
huangshiwu
|
07af58c0c2
|
OpenGL context attributions setting revise -2
|
2014-08-22 16:22:16 +08:00 |
yangxiao
|
1db3d14896
|
reset bone number to 60, put test in alphabetical order
|
2014-08-22 16:06:36 +08:00 |
yangxiao
|
1938817187
|
reset girl name
|
2014-08-22 14:24:40 +08:00 |
minggo
|
aba973b1ea
|
Merge pull request #7834 from andyque/improveUI
add click event listener to all Widget classes
|
2014-08-22 14:00:10 +08:00 |
yangxiao
|
d90572fc10
|
engine refactor hide concept of submesh
|
2014-08-22 13:52:03 +08:00 |
minggo
|
a0b19db670
|
Merge pull request #7840 from minggo/fix-warning
fix warnings
|
2014-08-22 13:41:31 +08:00 |
yangxiao
|
2d5431353a
|
engine adjust
|
2014-08-22 13:25:26 +08:00 |
andyque
|
84cf0ee834
|
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
|
2014-08-22 11:49:39 +08:00 |
huangshiwu
|
7dec715288
|
OpenGL context attributions setting revise
|
2014-08-22 10:55:39 +08:00 |
minggo
|
2afbc7a698
|
fix warnings
|
2014-08-21 16:21:23 +08:00 |
songchengjiang
|
5bad6e216b
|
Added No Normal Shader
|
2014-08-21 10:33:16 +08:00 |
andyque
|
3f51926c5d
|
add click event listener to Widget
|
2014-08-21 10:21:07 +08:00 |
huangshiwu
|
2369a5900d
|
merge v3 to v3_glviewattrs
|
2014-08-21 10:18:55 +08:00 |
huangshiwu
|
2a03bea1a4
|
OpenGL context attributions setting
|
2014-08-21 09:35:32 +08:00 |
yangxiao
|
bd4aec4bcd
|
support multi-attribs
|
2014-08-20 18:20:19 +08:00 |
songchengjiang
|
26cb5d8bae
|
Replace Tab Format
|
2014-08-20 16:43:01 +08:00 |
songchengjiang
|
3a1c0583fb
|
optimization
|
2014-08-20 16:41:45 +08:00 |
andyque
|
2d8bec2ba9
|
remove Extension EditBox
|
2014-08-20 16:20:57 +08:00 |
songchengjiang
|
8b5bd3dbb6
|
Repaired the errors of Shader PassValue On Android
Light modification
|
2014-08-20 16:20:22 +08:00 |
andyque
|
46f3ab9b57
|
add Scale9Sprite to create method of ui::EditBox
|
2014-08-20 16:08:28 +08:00 |
songchengjiang
|
58abc4c08f
|
Light Shader modification for Android
|
2014-08-19 19:24:19 +08:00 |
andyque
|
a8ab1a85b7
|
fix linux compile error
|
2014-08-19 17:42:17 +08:00 |
Sergey
|
b7fa3624cf
|
stopAllActionsByTag test
|
2014-08-19 13:31:19 +04:00 |
songchengjiang
|
4cf1c6a47c
|
deleted redundant code
Replace Tab Format
|
2014-08-19 16:32:49 +08:00 |
songchengjiang
|
d9bf2c2b7e
|
Finished Light And Test
|
2014-08-19 15:51:30 +08:00 |
yangxiao
|
54423efe9f
|
fix reskin
|
2014-08-19 15:25:00 +08:00 |
XiaoYang
|
9f444b7010
|
Merge pull request #104 from liuliang2004/Meshv3
Modification is compatible with the old model
|
2014-08-19 14:32:05 +08:00 |
liuliang
|
94be97f724
|
Modify change interface
|
2014-08-19 14:30:27 +08:00 |
liuliang
|
06dfaf9db5
|
Modify change interface
|
2014-08-19 14:21:48 +08:00 |
liuliang
|
9d3bab3810
|
Modification is compatible with the old model
|
2014-08-19 14:03:41 +08:00 |
songchengjiang
|
680f089ae1
|
Shader: Light struct modification
|
2014-08-19 13:54:30 +08:00 |
andyque
|
8d1c422ac5
|
merge extension EditBox to ui module
|
2014-08-19 10:28:24 +08:00 |
minggo
|
38fdef614a
|
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
add swallow touch and propagation to parent widgets customization
|
2014-08-18 23:16:22 +08:00 |
yangxiao
|
3fd122391c
|
reset sprite3dtest
|
2014-08-18 18:01:57 +08:00 |
songchengjiang
|
10afb9b9af
|
Finished Point Light
Finished Directional Light
Finished Spot Light
|
2014-08-18 17:10:07 +08:00 |
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 |
songmiao
|
08a4ebba06
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
|
2014-08-15 17:43:04 +08:00 |
andyque
|
0517ceb0dc
|
add scrollView nested tests
|
2014-08-15 16:21:27 +08:00 |
songmiao
|
361770e0f3
|
add BillBorad and BillBoardTest
|
2014-08-15 16:15:29 +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
|
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 |
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 |
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 |
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
|
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
|
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 |
boyu0
|
1b6cda488a
|
add ParticleResetTotalParticles test.
|
2014-07-29 11:21:11 +08:00 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +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 |
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 |
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 |
minggo
|
21647839b6
|
Merge pull request #7515 from Dhilan007/v3-320final
fixed warn and replace 'printf' with 'log';
|
2014-07-18 13:56:54 +08:00 |
LinWenhai
|
c10e49201d
|
fixed compil
|
2014-07-18 13:44:07 +08:00 |
Dhilan007
|
5d22bca240
|
fixed warn and replace 'printf' with 'log';
|
2014-07-18 10:20:37 +08:00 |
Dale Stammen
|
88da5d5fdb
|
disabled custom shader tests for WP8
|
2014-07-17 08:13:49 -07:00 |
andyque
|
7ff78c61ba
|
fix richText UTF8
|
2014-07-17 18:36:09 +08:00 |
minggo
|
578af01ef1
|
Merge pull request #7499 from andyque/fixRichTextUTF8
fix richText utf8 error
|
2014-07-17 17:57:41 +08:00 |
andyque
|
fc2ab110cc
|
fix richText utf8 error
|
2014-07-17 17:58:40 +08:00 |
zhangcheng
|
6d0bf8e143
|
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
|
2014-07-17 17:25:32 +08:00 |
zhangcheng
|
24d87ad05b
|
1. fixes ActionManagerEx crashes.
|
2014-07-17 17:24:41 +08:00 |
minggo
|
c482e2e14f
|
Merge pull request #7491 from Dhilan007/v3-320final
fixed text line wrap issue in UITextField.
|
2014-07-17 16:48:41 +08:00 |
Dhilan007
|
8ac1398037
|
fixed text line wrap issue in UITextField.
|
2014-07-17 16:23:38 +08:00 |
geron-cn
|
4e9a710053
|
fix binary test crash bug
|
2014-07-17 16:16:49 +08:00 |
geron-cn
|
441f0ebca8
|
fix binary test crash bug
|
2014-07-17 16:13:12 +08:00 |
geron-cn
|
1a2caaeebf
|
fix binary test crash bug
|
2014-07-17 16:09:17 +08:00 |
geron-cn
|
8212ed3822
|
fix binary test crash bug
|
2014-07-17 16:01:03 +08:00 |
andyque
|
4f5cd2a368
|
change FastTileMap to TileMap
|
2014-07-17 14:09:53 +08:00 |
minggo
|
c6349ef246
|
Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix
disable FastTileMapTest on WP8
|
2014-07-17 13:35:52 +08:00 |
vision
|
c29766a4ad
|
disable FastTileMapTest on WP8
|
2014-07-17 12:56:58 +08:00 |
minggo
|
5a5b245e84
|
Merge pull request #7474 from andyque/fixFastTileMap
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:52:40 +08:00 |
andyque
|
880c2c4c3f
|
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:46:20 +08:00 |
minggo
|
4c7d777f25
|
Merge pull request #7471 from visiblelight/wp8_shader_update
Wp8 shader update
|
2014-07-17 10:14:54 +08:00 |
vision
|
40951d586c
|
update
|
2014-07-17 10:10:33 +08:00 |
vision
|
c47d844d20
|
update the buildin shaders on WP8. Disable the effect 3d test.
|
2014-07-17 10:08:49 +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
|
8bf4c8b6c9
|
1. Fixes CCTimeLine warning.
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
|
2014-07-15 18:07:33 +08:00 |
andyque
|
714048059c
|
fix loading bar switch loading method issue
|
2014-07-15 17:03:35 +08:00 |
andyque
|
52596dc97f
|
fix Text line wrap issue
|
2014-07-15 11:46:53 +08:00 |
boyu0
|
c7fec217ba
|
Change atof() to utils::atof()
|
2014-07-14 20:45:24 +08:00 |
minggo
|
6d063fb97b
|
Merge pull request #7431 from andyque/addTextFieldTTFTest
add TextField TrueTypeFont tests
|
2014-07-14 16:31:36 +08:00 |
Dhilan007
|
a5317dde87
|
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
|
2014-07-14 15:50:20 +08:00 |
andyque
|
4fe3723edf
|
add TextField TrueTypeFont tests
|
2014-07-14 14:29:28 +08:00 |
minggo
|
3b59b41116
|
3D:Sprite3D -> Node:Sprite3D
|
2014-07-12 22:26:46 +08:00 |
vision
|
7495a611ea
|
fix conflict
|
2014-07-11 16:03:40 +08:00 |
Dhilan007
|
d8cdb75851
|
Fix compile errors on WP8
|
2014-07-11 15:10:19 +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
|
6c37541657
|
Merge pull request #7363 from Dhilan007/v3-event-clear
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
|
2014-07-11 13:36:52 +08:00 |
andyque
|
f76f71eb5d
|
fix win32 & win8 compile error
|
2014-07-10 16:37:15 +08:00 |
andyque
|
eec40ff2a8
|
fix linux and android compile
|
2014-07-10 16:37:15 +08:00 |
andyque
|
6de47ea53a
|
update ccs-res and add custom ImageView and custom particle widget support
|
2014-07-10 16:37:15 +08:00 |
andyque
|
8b42eb4ce9
|
add Cocostudio 1.3,1.4, 1.5 ui tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
41ccd5e465
|
add v1.4 tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
937b0ab52a
|
add cocostudio parser test template
|
2014-07-10 16:37:15 +08:00 |
minggo
|
831b0b332b
|
Merge pull request #7371 from minggo/enumerateChildren-fix
Node::enumerateChildren just searches from itself
|
2014-07-10 15:46:04 +08:00 |
minggo
|
c7856b21fd
|
Merge pull request #7366 from Dhilan007/v3-fixed-warn
fixed warn and replace NULL with nullptr.
|
2014-07-10 15:42:02 +08:00 |
minggo
|
316564d58a
|
Node::enumerateChildren just searches from itself
|
2014-07-10 11:07:39 +08:00 |
Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
Dhilan007
|
dbcb20b886
|
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
Make clear EVENT_COME_TO_FOREGROUND event.
|
2014-07-09 23:03:04 +08:00 |
yangxiao
|
7b35f36ba3
|
Merge branch 'newcode' into v3
|
2014-07-09 09:56:23 +08:00 |
yangxiao
|
90b6841e25
|
adjust api according feedback
|
2014-07-09 09:53:15 +08:00 |
pandamicro
|
85d29ec803
|
Refactor #5580: Refactor Hungary style code in test case
|
2014-07-09 09:52:21 +08:00 |
minggo
|
0f7968de89
|
Merge pull request #7339 from super626/v3
fix android, add 3d files to cocos2d.h and remove unused resources
|
2014-07-08 22:09:50 +08:00 |
minggo
|
f7af8938bd
|
Merge pull request #7277 from darkdukey/fix_rotation3D
Fix setRotation3D
|
2014-07-08 22:05:27 +08:00 |
andyque
|
2a2184331e
|
fix opacity issue when replace Widget textures
|
2014-07-08 11:30:27 +08:00 |
yangxiao
|
b19ca902ce
|
Merge branch 'newcode' into v3
|
2014-07-08 11:19:26 +08:00 |
yangxiao
|
75ee088631
|
resolve conflict Bone in cocos2d and cocostudio
|
2014-07-08 11:03:29 +08:00 |
minggo
|
3344ebbcdd
|
Merge pull request #7267 from andyque/addBinaryFileTests
add tests to GUI
|
2014-07-08 09:51:17 +08:00 |
andyque
|
9a77ea9d57
|
add nested layout
|
2014-07-07 15:48:50 +08:00 |
andyque
|
6f33e4b84f
|
add UIPageView button tests
|
2014-07-07 15:31:06 +08:00 |
minggo
|
8b00e72f33
|
Merge pull request #7311 from andyque/fixWindowsError
fix windows compile and running error
|
2014-07-04 13:44:55 +08:00 |
andyque
|
fc3caa1845
|
initialize member variable
|
2014-07-04 11:48:55 +08:00 |
minggo
|
95fe74a34b
|
Merge pull request #7299 from dabingnn/fast_tmx
Fast tmx
|
2014-07-04 09:49:30 +08:00 |
heliclei
|
3e75a10362
|
merge upstream/v3
|
2014-07-03 16:15:01 +08:00 |
heliclei
|
1f768f80aa
|
update curl test url
|
2014-07-03 16:08:34 +08:00 |
minggo
|
0be6d27271
|
Merge pull request #7295 from minggo/support-regular-expression
Support regular expression
|
2014-07-03 15:20:06 +08:00 |
Huabing.Xu
|
f3863eb072
|
add hex tile map test back
|
2014-07-03 11:31:30 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
zhangcheng
|
9204ac28df
|
1. merge v3
|
2014-07-02 15:37:15 +08:00 |
Huabing.Xu
|
187646ef3f
|
Merge branch 'v3' into fast_tmx
|
2014-07-02 11:38:19 +08:00 |
Dhilan007
|
bcf2b0e2b6
|
fixed no response in test case of curl.
|
2014-07-02 10:18:07 +08:00 |
andyque
|
3304bba017
|
add switch method to all the GUI tests
|
2014-07-02 10:00:34 +08:00 |
andyque
|
21b11cc3c6
|
add switch method to LoadingBar, ListView , pageView and scrollView
|
2014-07-02 10:00:34 +08:00 |
andyque
|
f492643755
|
add switch method to UILayout and UIIamgeView
|
2014-07-02 10:00:34 +08:00 |
andyque
|
7fdc37a70e
|
add switch method to checkBoxTest
|
2014-07-02 10:00:34 +08:00 |
andyque
|
3326941939
|
add switch loading method to buttonTest
|
2014-07-02 10:00:34 +08:00 |
andyque
|
c3a5692e84
|
add test frame to UIScene_Editor
|
2014-07-02 10:00:33 +08:00 |
Nite Luo
|
4cb59683e4
|
Add Sprite3DRotation test
|
2014-07-01 12:36:53 -07:00 |
minggo
|
ca7e95b342
|
Merge pull request #7274 from Dhilan007/v3-320beta
fixed crash cause by addChild on win 7.
|
2014-07-01 22:15:26 +08:00 |
Dhilan007
|
6294a3024f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter
|
2014-07-01 19:10:15 +08:00 |
Dhilan007
|
6ba111cbff
|
fixed crash cause by addChild on win 7.
|
2014-07-01 18:23:20 +08:00 |
zhangcheng
|
02c7c93e43
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
|
2014-07-01 16:36:37 +08:00 |
zhangcheng
|
4b8f818a1d
|
1、Update binary parse lib.
|
2014-07-01 16:31:17 +08:00 |
minggo
|
cc3a9d0737
|
fix crash caused by std::regex()
|
2014-07-01 16:09:25 +08:00 |
Huabing.Xu
|
e1d97ecb59
|
Merge branch 'v3' into v3_fix
|
2014-07-01 14:54:28 +08:00 |
Huabing.Xu
|
75c7777999
|
fix Effect3dSprite memory leak
|
2014-07-01 14:48:46 +08:00 |
minggo
|
80204e3048
|
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
Cleanup binary loader add scene binary parse
|
2014-07-01 13:47:35 +08:00 |
andyque
|
9ef0544953
|
call parent onExit method
|
2014-06-30 18:22:58 +08:00 |
Huabing.Xu
|
98d3e22777
|
re add commented test case back
|
2014-06-30 11:23:41 +08:00 |
Huabing.Xu
|
47471e202d
|
Merge branch 'v3' into fast_tmx
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
|
2014-06-29 20:23:43 +08:00 |
minggo
|
4f79176da2
|
Merge pull request #7234 from boyu0/iss5614_physics_transform
closed #5614: add transform support for physics
|
2014-06-29 17:23:20 +08:00 |
Huabing.Xu
|
3771654e66
|
remove deprecated function
rename enum to static const member of class
remove hex tile map(we do not support it yet)
|
2014-06-27 18:00:06 +08:00 |
boyu0
|
fccc517eef
|
add test for physics transform.
|
2014-06-27 17:30:50 +08:00 |
yangxiao
|
4685a8654e
|
Animate3D transition
|
2014-06-27 17:02:08 +08:00 |
yangxiao
|
2a6ce26335
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-27 16:36:36 +08:00 |
yangxiao
|
343ef9ae55
|
update sprite3d test
|
2014-06-27 16:36:01 +08:00 |
lvlong
|
fac17097a0
|
add a new model and change girl model to it
|
2014-06-27 11:44:44 +08:00 |
yangxiao
|
392a769c8f
|
merge cocos2d v3
|
2014-06-26 22:48:42 +08:00 |
yangxiao
|
ccb39e51b2
|
animation3d transition not finished
|
2014-06-26 18:35:12 +08:00 |
minggo
|
768eb4e1d0
|
Merge pull request #7222 from minggo/warnings-fix
fix warnings
|
2014-06-26 17:24:13 +08:00 |
minggo
|
dc635db163
|
fix warnings
|
2014-06-26 16:15:02 +08:00 |
minggo
|
e0e9d3379c
|
Merge pull request #6948 from lite3/v3
Add immediate send request
|
2014-06-26 16:05:58 +08:00 |
minggo
|
2917596d5e
|
add utils::findChildren()
|
2014-06-26 14:05:30 +08:00 |
zhangcheng
|
a6d6287b29
|
1. remove hungary style.
2. fixes build error.
|
2014-06-26 10:08:17 +08:00 |
andyque
|
a4bd3879ac
|
fix ListView addChild problem
|
2014-06-25 16:17:16 +08:00 |
zhangcheng
|
bdf7be6fa0
|
1. add classname = "" log.
|
2014-06-25 14:32:38 +08:00 |
minggo
|
7eb6ed75b8
|
Merge pull request #7197 from andyque/dimissListViewFocus
dimiss ListView focus tests
|
2014-06-25 14:11:36 +08:00 |
andyque
|
634f1b58c4
|
add todo to reminder me
|
2014-06-25 14:10:53 +08:00 |
andyque
|
1902fdc9f4
|
dimiss ListView focus tests
|
2014-06-25 14:04:32 +08:00 |
andyque
|
6df8079fd7
|
closed #5591, fix UIButton setTitleColor & getTitleColor not match
|
2014-06-25 13:47:29 +08:00 |
lvlong
|
7331ef49b6
|
don't rotate girl model
|
2014-06-25 13:29:45 +08:00 |
zhangcheng
|
644b61e261
|
1. add SceneBinary to 2.x
|
2014-06-25 11:58:36 +08:00 |
Huabing.Xu
|
290897af14
|
Merge branch 'v3' into fast_tmx
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-25 10:10:08 +08:00 |
minggo
|
63d0f66553
|
Merge pull request #7189 from andyque/feature5161
replace size with contentSize
|
2014-06-24 18:43:33 +08:00 |
pandamicro
|
9d450d6513
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
|
2014-06-24 14:57:12 +08:00 |
pandamicro
|
415f97b00f
|
Refactor #5580: Add test case for FileUtils' file and directory manipulations
|
2014-06-24 14:51:35 +08:00 |
lvlong
|
dc0101737c
|
test for tony
|
2014-06-24 14:43:20 +08:00 |
lvlong
|
431378a41e
|
commit for tony test
|
2014-06-24 14:10:03 +08:00 |
minggo
|
4bb6545250
|
Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
closed #5541: Add rotation action support for physics.
|
2014-06-24 10:46:10 +08:00 |
andyque
|
199ad9c623
|
issue #5161, replace deprecated methods
|
2014-06-24 10:18:01 +08:00 |
andyque
|
312ab4f396
|
Merge branch 'v3' into feature5161
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
|
2014-06-24 09:51:18 +08:00 |
yangxiao
|
c65e5d6872
|
simplify shader, bath sprite3D render
|
2014-06-23 19:08:26 +08:00 |
minggo
|
fc7b42c0e5
|
Merge pull request #7157 from 2youyouo2/v3
update action timeline
|
2014-06-23 18:38:46 +08:00 |
andyque
|
7eae7625c1
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-23 18:30:03 +08:00 |
andyque
|
e72d89ba2f
|
fix windows tests compile error
|
2014-06-23 15:21:25 +08:00 |
boyu0
|
c40c461848
|
closed #5541: add warning code and comment.
|
2014-06-23 13:55:52 +08:00 |
andyque
|
c9bcbfb265
|
fix addEventListener hidden problem
|
2014-06-23 12:09:49 +08:00 |
andyque
|
5624da5448
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
|
2014-06-23 09:37:39 +08:00 |
lite3
|
ebbcb3ea33
|
change immediateSend to sendImmediate
|
2014-06-22 11:39:39 +08:00 |
lite3
|
7c65968b56
|
add immediateSend test
|
2014-06-22 00:11:20 +08:00 |
yangxiao
|
1e319bc1f8
|
fix compile bug
|
2014-06-20 22:38:09 +08:00 |
boyu0
|
2fa266e917
|
closed #5541: change PhysicsActionTest for rotate action.
|
2014-06-20 18:42:36 +08:00 |
lvlong
|
478ea8949a
|
Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3
Conflicts:
tools/bindings-generator
tools/cocos2d-console
|
2014-06-20 16:14:46 +08:00 |
lvlong
|
69436ddd65
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
|
2014-06-20 16:02:22 +08:00 |
lvlong
|
e4bbfad773
|
1. binary loader is OK.
2. add some comment.
|
2014-06-20 15:30:08 +08:00 |
andyque
|
5f5b705bee
|
refactor setSize to setContentSize and deprecated the old interface
|
2014-06-20 14:03:33 +08:00 |
yinkaile
|
1aa07906a1
|
add new line at the end of the file
|
2014-06-20 11:36:48 +08:00 |
andyque
|
4ca184b58a
|
issue #5161, deprecated getSize
|
2014-06-20 11:18:53 +08:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
boyu0
|
5f10ff2c29
|
issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
|
2014-06-19 15:57:13 +08:00 |
lvlong
|
8493c4579b
|
before switch branch save
|
2014-06-19 15:43:02 +08:00 |
minggo
|
e60e3c217d
|
Merge pull request #7046 from Dhilan007/v3-label-improve
1.Support setting up the line height and additional kerning of label.
|
2014-06-19 09:44:51 +08:00 |
geron-cn
|
797085574c
|
add binary read to test-cpp
|
2014-06-18 20:13:06 +08:00 |
geron-cn
|
6abc9aba0e
|
add binary read to test-cpp
|
2014-06-18 20:09:12 +08:00 |
geron-cn
|
d2746f64a6
|
cpp-tests
|
2014-06-18 18:11:21 +08:00 |
Dhilan007
|
9351172baf
|
add test case for new API of Label.
|
2014-06-18 18:01:55 +08:00 |
andyque
|
aa5df68b96
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
|
2014-06-18 15:13:34 +08:00 |
andyque
|
f614e9a89b
|
fix tests
|
2014-06-18 15:06:45 +08:00 |
andyque
|
95f1bd7e72
|
update loader
|
2014-06-18 11:54:25 +08:00 |
minggo
|
6ecca08340
|
Merge pull request #7039 from minggo/get-child-by-name
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-18 11:30:14 +08:00 |
andyque
|
2cef0cb437
|
update ccs-res
|
2014-06-18 11:26:26 +08:00 |
2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
andyque
|
ca24ad6768
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-18 11:19:19 +08:00 |
minggo
|
df798baa8b
|
Merge pull request #7059 from Rumist/v3
BUG FIX : #5553
|
2014-06-18 11:18:33 +08:00 |
2youyou2
|
806d74b6f9
|
add change play section test
|
2014-06-17 15:57:30 +08:00 |
yangxiao
|
17854cd922
|
change speed
|
2014-06-17 13:45:58 +08:00 |
2youyou2
|
d2a6782a9e
|
fixed start frame not right
|
2014-06-17 11:45:57 +08:00 |
minggo
|
53963a2441
|
issue #4693:enumerateChildren() support regular expression
|
2014-06-17 11:43:03 +08:00 |
2youyou2
|
7ee90b4114
|
add performance test
|
2014-06-17 11:13:46 +08:00 |
andyque
|
9ab45744bb
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-17 09:45:16 +08:00 |
yangxiao
|
9acd373a0e
|
make girl up
|
2014-06-16 19:41:10 +08:00 |
lvlong
|
32cc5b12d6
|
ready
|
2014-06-16 19:30:45 +08:00 |
lvlong
|
4b7f6a6185
|
static Sprite3D is ok
|
2014-06-16 19:08:43 +08:00 |
yangxiao
|
bc31d6b082
|
merge lv
|
2014-06-16 16:45:43 +08:00 |
lvlong
|
2840409933
|
for tony test
|
2014-06-16 14:09:41 +08:00 |
2youyou2
|
fda54a21f1
|
change test title
|
2014-06-16 09:45:44 +08:00 |
yangxiao
|
79d2de3b67
|
make character up
|
2014-06-16 00:31:31 +08:00 |
yangxiao
|
dd8f66ce57
|
merge loader
|
2014-06-16 00:01:38 +08:00 |
yangxiao
|
9dd7241176
|
load c3t animation work 90%
|
2014-06-15 22:45:56 +08:00 |
andyque
|
1d01fe8bbc
|
refactor
|
2014-06-15 16:12:24 +08:00 |
lvlong
|
4ae01d148f
|
11
|
2014-06-13 19:26:46 +08:00 |
2youyou2
|
369ed3e6d3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-13 18:00:01 +08:00 |
2youyou2
|
2031e0e92d
|
change TimelineAction to ActionTimeline
|
2014-06-13 16:03:03 +08:00 |
2youyou2
|
1c5d9ba212
|
remove resource to use armature resource
|
2014-06-13 14:41:28 +08:00 |
elsanide
|
4b7b32e81e
|
BUG FIX : #5553
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
|
2014-06-13 15:24:37 +09:00 |
Huabing.Xu
|
4e94eaabed
|
Merge branch 'v3' into v3Animation
|
2014-06-13 12:06:11 +08:00 |
2youyou2
|
f63939945d
|
change NodeCache to NodeReader
|
2014-06-12 19:34:22 +08:00 |
lvlong
|
14f4b6430f
|
modify 3dloader, you can run animation.
|
2014-06-12 18:26:42 +08:00 |
2youyou2
|
e4f1ac6126
|
add hd resource
|
2014-06-12 17:38:26 +08:00 |
2youyou2
|
7eda0ae999
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-12 16:43:04 +08:00 |
lvlong
|
1ca69d2689
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
|
2014-06-12 16:28:36 +08:00 |
2youyou2
|
f536020d26
|
remove unused files
|
2014-06-12 16:21:41 +08:00 |
lvlong
|
742ea7f2df
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
|
2014-06-12 15:53:41 +08:00 |
boyu0
|
acb87f414e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
|
2014-06-12 14:44:28 +08:00 |
yangxiao
|
e37c6ab7ee
|
test action sequence
|
2014-06-12 14:20:38 +08:00 |
minggo
|
6845a69655
|
issue #4693: remove unneede codes
|
2014-06-12 14:00:41 +08:00 |
minggo
|
990c491746
|
issue #4693: add test case for getName, setName, getChildByName and enumerateChildren
|
2014-06-12 13:55:23 +08:00 |
boyu0
|
1df80a8ce4
|
closed #5537: add test case
|
2014-06-12 12:57:29 +08:00 |
vision
|
97b578185d
|
new parameter for setting blur shader effect
|
2014-06-12 09:49:48 +08:00 |
2youyou2
|
4d1bf0c1a2
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
|
2014-06-12 09:42:20 +08:00 |
youyou
|
28ae57c5fc
|
add AsyncReader
|
2014-06-12 00:38:23 +08:00 |
2youyou2
|
aa06fab776
|
support relative path for reading json
|
2014-06-11 21:11:22 +08:00 |
Huabing.Xu
|
65acec013b
|
Merge branch 'v3' into v3Animation
|
2014-06-11 17:45:31 +08:00 |
andyque
|
5515c43bb2
|
improve lasers
|
2014-06-11 15:16:08 +08:00 |
Huabing.Xu
|
18663609b4
|
add interface for speed and playback in animate
|
2014-06-11 15:07:37 +08:00 |
vision
|
e2c75c1f11
|
New shader for the blur effect, the old one is ineffecient and difficult to maintain.
|
2014-06-11 14:54:14 +08:00 |
andyque
|
2f6f1b7151
|
improve binary format
|
2014-06-11 14:45:35 +08:00 |
andyque
|
7a8f27ee0b
|
remove unused parser code
|
2014-06-11 14:15:34 +08:00 |
samuele3hu
|
54379f48a9
|
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
|
2014-06-11 11:24:17 +08:00 |
2youyou2
|
09a2ceb7df
|
add TimelineAction
|
2014-06-11 11:10:07 +08:00 |
andyque
|
b895018765
|
update parser
|
2014-06-11 09:35:24 +08:00 |
yangxiao
|
6d09b50699
|
animation bug
|
2014-06-10 19:53:06 +08:00 |
andyque
|
48f7743daa
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-10 15:08:10 +08:00 |
yangxiao
|
a991940268
|
debug Sprite3D with .c3t
|
2014-06-09 18:37:58 +08:00 |
minggo
|
29ac8d746d
|
Merge pull request #7012 from Dhilan007/v3-testcast
update test cast of label.
|
2014-06-09 16:32:32 +08:00 |
andyque
|
c387ae3bc7
|
add text effect test
|
2014-06-09 14:34:46 +08:00 |
Dhilan007
|
791737befa
|
update test cast of label.
|
2014-06-09 13:41:32 +08:00 |
vision
|
361bfad5f8
|
initilization missed.
|
2014-06-09 11:39:19 +08:00 |
vision
|
ae16c88538
|
Save the bound texture unit so that the sampler can be updated dynamiclly.
|
2014-06-09 10:58:28 +08:00 |
yangxiao
|
0c95fe1fbd
|
animation test
|
2014-06-06 19:12:08 +08:00 |
boyu0
|
fc5e58b521
|
issue #4437: add dirty tag.
|
2014-06-06 18:03:44 +08:00 |
boyu0
|
560053d23c
|
issue #4437: add test and fix transform.
|
2014-06-06 17:33:27 +08:00 |
minggo
|
6cee3fe830
|
Merge pull request #6979 from visiblelight/TextureOptimize
Texture Optimize
|
2014-06-06 11:38:49 +08:00 |
vision
|
39f2669886
|
remove the new images and use the old ones.
|
2014-06-06 10:37:45 +08:00 |
vision
|
f7d5d837bf
|
add new tests for different pixel formats
|
2014-06-05 16:33:42 +08:00 |
andyque
|
c96a6086c3
|
improve parsing code
|
2014-06-05 11:43:43 +08:00 |
andyque
|
3dc6e86c25
|
add binary file parsing into ui tests
|
2014-06-05 10:25:45 +08:00 |
Ricardo Quesada
|
a11740ff29
|
ouch, more windows compile issues
|
2014-06-04 10:11:16 -07:00 |
Ricardo Quesada
|
59b966731e
|
Compiles on Windows and Android
|
2014-06-04 09:48:35 -07:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |
minggo
|
a495747a7c
|
Merge pull request #6971 from andyque/refactorUIFramework
refactor ObjectFactory
|
2014-06-04 17:08:27 +08:00 |
minggo
|
a31710973c
|
Merge pull request #6962 from visiblelight/AlphaIssues
Fix a crash in ParticleTest->PremultipliedAlphaTest
|
2014-06-04 15:10:54 +08:00 |
andyque
|
38e274de73
|
refact ui header file include
|
2014-06-04 14:56:33 +08:00 |
minggo
|
7bf2be6033
|
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
Bugfix autorelease pool manager
|
2014-06-04 14:31:30 +08:00 |
minggo
|
5432698674
|
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.
|
2014-06-04 13:52:43 +08:00 |
boyu0
|
368c5b0d3b
|
closed #5482: add a test case for bug 5482.
|
2014-06-04 11:59:15 +08:00 |
vision
|
ad230bb412
|
fix a crash in ParticleTest->PremultipliedAlphaTest
|
2014-06-04 10:39:18 +08:00 |
Kezhu Wang
|
dbca937835
|
add test case to break buggy code
|
2014-06-03 17:58:09 +08:00 |
minggo
|
691a77b148
|
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
|
2014-06-03 14:38:07 +08:00 |
Ricardo Quesada
|
b24c674d25
|
Little fixes for setNormalized
|
2014-05-30 21:50:39 -07:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
Huabing.Xu
|
2e42c77b9a
|
fix typo
|
2014-05-30 11:13:53 +08:00 |
Huabing.Xu
|
95b6fb52de
|
only use _backToForeGroundListner when on Android
|
2014-05-30 10:56:03 +08:00 |
Huabing.Xu
|
41d19007eb
|
Merge branch 'v3.1hotfix' into v3
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
|
2014-05-30 10:19:56 +08:00 |
minggo
|
bfb3567131
|
Merge pull request #6924 from minggo/remove-test-case
Remove test case
|
2014-05-29 14:54:28 +08:00 |
minggo
|
e48b14b55d
|
Merge pull request #6932 from Dhilan007/v3-labelfix
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
|
2014-05-29 14:54:16 +08:00 |
minggo
|
3182fd56b8
|
Merge pull request #6931 from VisualSJ/v3
Test case action name error
|
2014-05-29 14:07:23 +08:00 |
VisualSJ
|
dd2b7e036a
|
Test case action name error
|
2014-05-29 14:00:43 +08:00 |
Dhilan007
|
2a6158bae1
|
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
|
2014-05-29 14:00:38 +08:00 |
boyu0
|
91db87a2f6
|
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
|
2014-05-29 13:51:43 +08:00 |
Huabing.Xu
|
8633ab9c14
|
add background/foreground listener for EffectSprite/Effect framework test case
|
2014-05-29 12:43:04 +08:00 |
Huabing.Xu
|
ad3b1cf827
|
add background/foreground listener for Effectsprite3d/Effect3d test case
|
2014-05-28 21:07:12 +08:00 |
minggo
|
d7cca2a044
|
closed #4819: remove KeyboardTest
|
2014-05-28 18:31:00 +08:00 |
minggo
|
0acc4cd961
|
issue #4819: remove KeyPadTest
|
2014-05-28 18:17:22 +08:00 |
minggo
|
0ad0f9c405
|
issue #4819: remove AccelerometerTest
|
2014-05-28 18:10:37 +08:00 |
minggo
|
c44a5a2b3e
|
Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork
V3 refactor effect3 d frame work
|
2014-05-27 20:53:40 +08:00 |
minggo
|
99290b83c7
|
Merge pull request #6871 from asuuma/v3_Repeat_fix
Fix Repeat will run one more over in rare situations
|
2014-05-27 16:22:42 +08:00 |
Huabing.Xu
|
e59813476a
|
clclosed #5369: Fix wrong logic when setTarget to Effect3D
|
2014-05-27 15:08:38 +08:00 |
minggo
|
0b661d8192
|
Merge pull request #6907 from visiblelight/screenshot_refactor
adding comments for the new utility
|
2014-05-27 14:52:09 +08:00 |
Huabing.Xu
|
453ff81d2a
|
closed #5369: refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite
|
2014-05-27 14:50:46 +08:00 |
Ishiguro Yusuke
|
b8f9b1f20b
|
Add test case for reproducing Repeat bug
|
2014-05-27 15:40:38 +09:00 |
vision
|
e81db73b0a
|
adding comments for the new utility.
|
2014-05-27 14:29:52 +08:00 |
minggo
|
034e2c6f75
|
Merge pull request #6809 from heliclei/autotest-stop
Support autotest stop command
|
2014-05-27 14:01:38 +08:00 |
minggo
|
a01315e2f5
|
Merge pull request #6726 from visiblelight/screenshot
Add a new utility function to snap the screen
|
2014-05-27 11:18:25 +08:00 |
vision
|
363fd8dc2a
|
move the capturen screen interface from Director to ccUtils
|
2014-05-27 10:44:23 +08:00 |
andyque
|
9cef55d62c
|
issue #5176, refactor FocusNavigationController
|
2014-05-27 10:20:37 +08:00 |
andyque
|
d8d5139aaf
|
closed #5176, refactor UILayout and focus
|
2014-05-26 23:04:44 +08:00 |
vision
|
c72ae9e3c5
|
merge from the latest v3
|
2014-05-26 20:18:11 +08:00 |
vision
|
20bae53f4a
|
fixing typos
|
2014-05-26 16:32:13 +08:00 |
vision
|
28d30a5c40
|
fix a typo
|
2014-05-26 16:24:57 +08:00 |
andyque
|
40f2128acd
|
Merge branch 'v3' into 5176
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
|
2014-05-26 14:00:23 +08:00 |
vision
|
7edfe78f7d
|
remove the parameter rect
|
2014-05-26 13:42:47 +08:00 |
minggo
|
75cb686573
|
Merge pull request #6894 from andyque/refactor5183
refactor Layout, LayoutParameter and LayoutExecutant
|
2014-05-26 00:41:04 -05:00 |
andyque
|
634fea7c45
|
Merge remote-tracking branch 'upstream/v3' into refactor5183
|
2014-05-26 09:18:32 +08:00 |
vision
|
910099fbe5
|
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
|
2014-05-23 17:08:22 +08:00 |
Ricardo Quesada
|
5601048829
|
Fixes compiler warnings for mac and ios
|
2014-05-22 16:34:16 -03:00 |
andyque
|
1165ba8bc3
|
issue #5176, readd addChild methods into UIListView
|
2014-05-22 17:49:19 +08:00 |
heliclei
|
5e4f481ae5
|
capture this instead of reference in lambda
|
2014-05-22 14:52:19 +08:00 |
andyque
|
3b777646c4
|
issue #5176. fix UIScrollView
|
2014-05-22 11:01:58 +08:00 |
andyque
|
57d5e6f2d5
|
issue #5176, add ListView focus test
|
2014-05-22 11:01:58 +08:00 |
andyque
|
fa5d43741c
|
fix keypad test
|
2014-05-21 10:46:26 +08:00 |
andyque
|
b07e82f7c3
|
Revert "Revert "Merge pull request #6752 from andyque/refactorLayout""
This reverts commit 1ed9b9749e .
|
2014-05-20 16:17:10 +08:00 |
minggo
|
9a276c66a0
|
Merge pull request #6740 from zifter/FixProgressTo
Fix Progress Action. Not working with charging from 100 to 0.
|
2014-05-20 15:36:10 +08:00 |
andyque
|
1ed9b9749e
|
Revert "Merge pull request #6752 from andyque/refactorLayout"
This reverts commit ae118a9d22 , reversing
changes made to 6f2f2046c7 .
|
2014-05-20 14:36:29 +08:00 |
andyque
|
b6373b5303
|
Merge branch 'v3' into refactorLayout
|
2014-05-20 09:30:23 +08:00 |
minggo
|
cffd53ea94
|
accelerometer fix
|
2014-05-19 17:44:28 +08:00 |
andyque
|
ee24e137f7
|
issue #5183, refactor obscure functions
|
2014-05-19 17:18:04 +08:00 |
andyque
|
121d6d3109
|
issue #5183, refactor
|
2014-05-19 16:51:25 +08:00 |
heliclei
|
2ddfc45fee
|
support autotest stop
|
2014-05-19 13:46:17 +08:00 |
andyque
|
b89a073b90
|
replace texture resources
|
2014-05-19 12:09:55 +08:00 |
andyque
|
99f17ec88d
|
commnet out the Renderer test in PerformanceTest
|
2014-05-19 11:46:32 +08:00 |
Ricardo Quesada
|
6461e26c9f
|
Squashed commit of the following:
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94 5c5a6b9
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:33:01 2014 +0800
Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731
commit 5c5a6b9bde410027db948b539bc3111dc243cf0b
Merge: d4285e3 5f41732
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:23:58 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit d4285e336808699f828b82c6b90a83b1b0c0978c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:22:49 2014 -0700
remove empty lines
commit 5f4173271101e2411ffb6cbf600066e204df98d3
Merge: e272583 ac8cf25
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:15:44 2014 -0700
Merge pull request #33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 18:18:13 2014 -0700
Merge branch 'v3' into mesh3d_work
commit 6a1b847065a1b9d369892ab011478c47e80c9195
Merge: 4feae11 4ece4b3
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Fri May 16 17:15:39 2014 -0700
Merge pull request #31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:24:11 2014 -0700
Merge branch 'v3' into mesh3d_work
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d.vcxproj
cocos/2d/cocos2d.vcxproj.filters
cocos/Android.mk
cocos/CMakeLists.txt
cocos/renderer/CMakeLists.txt
commit 510fc0cea76bdedfae858bb930d98715ce54f7e9
Merge: e098ed7 7fea347
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:11:39 2014 -0700
Merge pull request #29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837cea
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:07:04 2014 -0700
Merge branch 'v3' into mesh3d_work
commit 213bbb0c289e579895e92620153b95a8cf374521
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:55:28 2014 -0700
add mesh.h in cocos2d.h
commit 94d789610c9d4426b14e655a73197c652afc74f6
Merge: fa69e09 9af9da5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:24 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:20:01 2014 -0700
Merge branch 'v3' into mesh3d_work
commit ff15926f47edfbb1250440b060c1d887cfecd033
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 09:11:36 2014 -0700
warning more than one texture
commit 5debbf8d6de4563361974b67aa52e572f7df9dd6
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 08:45:03 2014 -0700
remove redundant line
commit ed357e7484a63bc3eb208d589943f802b7832e4d
Merge: a1e2306 25dd07e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:53:10 2014 -0700
Merge pull request #24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:48:19 2014 -0700
Merge branch 'v3' into mesh3d_work
commit d6f6f633927eb00df984ec4239555f9ce2c7e44d
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 14:26:40 2014 -0700
Merge pull request #18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:31:14 2014 -0700
Merge branch 'v3' into mesh3d_work
commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc
Merge: da24c48 5a2127d
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 00:25:47 2014 -0700
vertex attrib
commit da24c48c981029493900bcd2143495e546faa75e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 23:49:09 2014 -0700
mesh vertex attribute
commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd
Merge: d98adb7 5148f76
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 19:06:38 2014 -0700
Merge pull request #11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 15:56:46 2014 -0700
Merge branch 'v3' into mesh3d_work
commit da7d6a087f22f4a11827ff3410fbcd2561f155fc
Merge: 0caad32 f413b4e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 14:19:24 2014 -0700
Merge pull request #8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 10:50:14 2014 -0700
Merge branch 'v3' into newcode
commit 23a5232fe5bb4c0b0bc821d1945426486dafe253
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 09:44:41 2014 -0700
3d mesh initial code
|
2014-05-18 14:49:16 -07:00 |
vision
|
81ddbaa7b1
|
update the calculation of device pixel resolution
|
2014-05-19 01:12:56 +08:00 |
Ricardo Quesada
|
7e4597508c
|
Does not crash on Mac if the .ttf file is not found
|
2014-05-15 17:22:53 -07:00 |