WenhaiLin
|
45de0b650a
|
[ci skip]Fixed resources.
|
2015-06-19 16:26:03 +08:00 |
子龙山人
|
869e3c5243
|
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
Label:Fixed line wrap error without space.
|
2015-06-19 15:08:13 +08:00 |
WenhaiLin
|
d32a317ea0
|
Label:Fixed line wrap error without space.
|
2015-06-19 13:39:19 +08:00 |
pandamicro
|
ca989e2aed
|
Fix physics3d js test issue
|
2015-06-19 10:35:45 +08:00 |
pandamicro
|
c6d4f283bb
|
Fix compilation issue in navmesh conversion
|
2015-06-19 08:11:45 +08:00 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +08:00 |
pandamicro
|
b757837239
|
Move NavMesh to jsb namespace
|
2015-06-18 22:57:41 +08:00 |
Bin Zhang
|
a4ecfdb7e2
|
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 22:00:57 +08:00 |
VisualSJ
|
3da67d3358
|
change the seek to time
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
a98b493151
|
Update UIS9NinePatchTest for jsb
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
cbfa92d3fd
|
Add a new line.
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
496ce50ff5
|
issue #12414:Add UIS9NinePatchTest for js
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
77c3e9bdde
|
issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 22:00:54 +08:00 |
VisualSJ
|
0a526875a8
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 22:00:54 +08:00 |
VisualSJ
|
82c09e8d0c
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 22:00:54 +08:00 |
pandamicro
|
cd7252014a
|
Merge pull request #12432 from pandamicro/v3
Change physics3d api to jsb namespace
|
2015-06-18 21:53:39 +08:00 |
pandamicro
|
10a8adad53
|
Change physics3d api to jsb namespace
|
2015-06-18 20:39:40 +08:00 |
pandamicro
|
491d89baec
|
Merge pull request #12429 from natural-law/v3
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 20:28:52 +08:00 |
jianglong0156
|
4fe1542d17
|
add navmesh tests
|
2015-06-18 19:22:27 +08:00 |
Bin Zhang
|
d288b13957
|
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 17:22:30 +08:00 |
pandamicro
|
aa566a3722
|
Merge pull request #12424 from pandamicro/physics3d
Fix Physics3D test and js bindings
|
2015-06-18 16:09:49 +08:00 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
pandamicro
|
9dc52ba72f
|
Merge pull request #12403 from VisualSJ/v3-aa
[ci skip]Fixed some bug
|
2015-06-18 12:31:27 +08:00 |
pandamicro
|
000be8316b
|
Merge pull request #12415 from samuele3hu/v3_7_ui
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 12:30:28 +08:00 |
tangziwen
|
1989de7a04
|
fix terraintest and Terrain::getInstersectionPoint()
|
2015-06-18 12:20:44 +08:00 |
pandamicro
|
7952477469
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
|
2015-06-18 12:05:01 +08:00 |
VisualSJ
|
44c37c676e
|
change the seek to time
|
2015-06-18 11:54:25 +08:00 |
Vincent Yang
|
27bf636eab
|
Fix bug: spine animition can't show in Scene3DTest.
|
2015-06-18 11:45:17 +08:00 |
samuele3hu
|
6c749a77f2
|
Fix the bugs about the Physics3DTest for Lua.
|
2015-06-18 11:17:08 +08:00 |
tangziwen
|
4187ea2241
|
fix Scene3D test
|
2015-06-18 10:17:46 +08:00 |
samuele3hu
|
7f21731bb1
|
Update UIS9NinePatchTest for jsb
|
2015-06-18 10:08:13 +08:00 |
Vincent Yang
|
0e0c8cf72e
|
Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away.
|
2015-06-18 09:54:48 +08:00 |
samuele3hu
|
31ce264c6a
|
Add a new line.
|
2015-06-18 09:44:47 +08:00 |
samuele3hu
|
8c01d94945
|
issue #12414:Add UIS9NinePatchTest for js
|
2015-06-18 09:43:05 +08:00 |
samuele3hu
|
31aae38fac
|
issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 09:41:16 +08:00 |
VisualSJ
|
400b2d7663
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 09:23:15 +08:00 |
pandamicro
|
3ffc0e6be6
|
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
|
2015-06-18 09:20:37 +08:00 |
pandamicro
|
3975d44d3b
|
Chain NavMeshTest
|
2015-06-18 00:58:03 +08:00 |
pandamicro
|
bcf9659408
|
Merge branch 'v3' into navmesh
|
2015-06-18 00:36:37 +08:00 |
pandamicro
|
5b23e8b381
|
Fix resource issue
|
2015-06-18 00:24:01 +08:00 |
pandamicro
|
85e8a407b1
|
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
|
2015-06-17 19:58:24 +08:00 |
samuele3hu
|
683812d817
|
Update Physics3D test for js.
|
2015-06-17 18:50:55 +08:00 |
jianglong0156
|
b265033a41
|
add testcase and manual bindings
|
2015-06-17 18:38:18 +08:00 |
jianglong0156
|
897b5fd0e9
|
add navmesh test project file and binding file
|
2015-06-17 18:37:19 +08:00 |
VisualSJ
|
010cb23ead
|
Fixed a bug that xhr cross-domain error
|
2015-06-17 17:10:31 +08:00 |
pandamicro
|
4fa1cdc302
|
Update submodules
|
2015-06-17 15:43:35 +08:00 |
pandamicro
|
ddc820eb42
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-17 15:33:34 +08:00 |
子龙山人
|
fd508a0198
|
Merge pull request #12381 from VisualSJ/v3-aa
[ci skip]Fix some simple bug
|
2015-06-17 15:11:08 +08:00 |
VisualSJ
|
0a223adf7c
|
After exiting should restore settings
|
2015-06-17 14:43:41 +08:00 |
子龙山人
|
dc33a8d66e
|
Merge pull request #12243 from Wu-Hao/fix_spritepolygon2
Fix spritepolygon
|
2015-06-17 14:40:30 +08:00 |
VisualSJ
|
fba76b11cd
|
Fixed path bug
|
2015-06-17 14:07:07 +08:00 |
pandamicro
|
3a076b6508
|
Merge pull request #12387 from samuele3hu/v3_navigation
[ci skip]Update the Physics3DTest for js and Lua by synchronizing the API.
|
2015-06-17 14:01:21 +08:00 |
samuele3hu
|
9c550e0a11
|
Update the Physics3DTest for js and Lua by synchronizing the API.
|
2015-06-17 13:58:05 +08:00 |
Jacky
|
3c5ab4f518
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-17 13:04:24 +08:00 |
VisualSJ
|
6669f1df5e
|
Fixed widgetFromJsonFile bug(#20035)
|
2015-06-17 11:49:27 +08:00 |
子龙山人
|
0915565b8d
|
Merge pull request #12373 from samuele3hu/v3_navigation
Add the Lua bindings for NavMesh and the related test case.
|
2015-06-17 11:36:52 +08:00 |
VisualSJ
|
d855066472
|
Fixed a bug that control's default resource error #20037
|
2015-06-17 11:19:06 +08:00 |
VisualSJ
|
164fb3a058
|
If json have the back button, then use this button
|
2015-06-17 11:16:44 +08:00 |
samuele3hu
|
2da760b655
|
Update the NavMesh test case
|
2015-06-17 09:49:31 +08:00 |
VisualSJ
|
ab34c1de89
|
Change the path(UIVideoPlayerTest.js)
|
2015-06-16 17:30:48 +08:00 |
pandamicro
|
d51fd2397c
|
Fix js test ES6 usage issue
|
2015-06-16 15:01:52 +08:00 |
samuele3hu
|
a547d6aa33
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
Conflicts:
tools/bindings-generator
|
2015-06-16 11:36:11 +08:00 |
WuHao
|
aeeed0f4ab
|
Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
# external/config.json
|
2015-06-16 11:19:20 +08:00 |
Dale Stammen
|
74f4d29fa9
|
added missing librecast
|
2015-06-15 20:06:54 -07:00 |
Dale Stammen
|
8d8e7d6cb9
|
Merge branch 'v3' into v3-winrt-librecast
|
2015-06-15 19:27:40 -07:00 |
Dale Stammen
|
0781978788
|
added librecast. Updated build properties
|
2015-06-15 18:44:14 -07:00 |
andyque
|
b8826d9de4
|
improve the enum naming
|
2015-06-16 09:42:06 +08:00 |
Dale Stammen
|
e14fdedf67
|
added missing NavMeshTest files
|
2015-06-15 18:19:51 -07:00 |
Ricardo Quesada
|
b167ab3e78
|
StateBlock() is public
|
2015-06-15 17:43:37 -07:00 |
Ricardo Quesada
|
ca3da86da7
|
StateBlock::restore() is public
It is possible to restore to default state
|
2015-06-15 14:12:44 -07:00 |
pandamicro
|
ccd15b3da7
|
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
|
2015-06-16 00:56:58 +08:00 |
pandamicro
|
4f8bd25a83
|
Add js test cases for sprite polygon
|
2015-06-16 00:56:08 +08:00 |
andyque
|
c1108db31e
|
Improve ui::Slider
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
|
2015-06-15 18:31:21 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
Hao Wu
|
b4ca8c1489
|
Merge pull request #15 from pandamicro/spritepolygon
Add SpritePolygon JSB bindingsJSB bindings
|
2015-06-15 15:47:02 +08:00 |
pandamicro
|
0216d05eee
|
Merge pull request #12102 from super626/navigation2
3D Navigation
|
2015-06-15 13:39:05 +08:00 |
pandamicro
|
cd7f39d823
|
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
|
2015-06-15 13:22:38 +08:00 |
pandamicro
|
34954c2600
|
Add PolygonSprite Test1
|
2015-06-15 13:21:49 +08:00 |
yangxiao
|
97ef7974bb
|
create agent in the onEnter
|
2015-06-15 11:57:05 +08:00 |
pandamicro
|
852b9b42b9
|
Remove jsb_cocos2dx_experimental_manual
|
2015-06-15 10:46:57 +08:00 |
jianglong0156
|
5ff0825468
|
modify android res copy
|
2015-06-15 09:55:10 +08:00 |
jianglong0156
|
393ad49481
|
add win32 project resource copy
|
2015-06-15 09:55:05 +08:00 |
jianglong0156
|
6310f74533
|
modify resource to res/resjs
|
2015-06-15 09:54:00 +08:00 |
jianglong0156
|
f9df298401
|
modify copy resource to res/resjs
|
2015-06-15 09:53:53 +08:00 |
Ricardo Quesada
|
a8cf72dc43
|
pass bits to invalidate
|
2015-06-12 17:14:09 -07:00 |
Ricardo Quesada
|
4278bf51b1
|
Adds RenderState::StateBlock::invalidate();
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
|
2015-06-12 16:47:08 -07:00 |
Ricardo Quesada
|
d9b0b2ca38
|
more fixes
|
2015-06-12 15:28:29 -07:00 |
pandamicro
|
9806c09b0e
|
Merge pull request #12299 from WenhaiLin/v3-label-cropped
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
|
2015-06-12 21:33:09 +08:00 |
pandamicro
|
f9057b3f32
|
Merge pull request #12284 from pandamicro/v3
Fix template android compilation issue on physics3d
|
2015-06-12 21:10:40 +08:00 |
子龙山人
|
c01d1fe00a
|
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
|
2015-06-12 16:44:12 +08:00 |
Jacky
|
29c108bdef
|
Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-12 16:28:41 +08:00 |
pandamicro
|
f3765a4c5f
|
Fix physics 3d macro include issue
|
2015-06-12 15:58:43 +08:00 |
pandamicro
|
e9d648f151
|
Fix physics 3d macro include issue
|
2015-06-12 15:41:46 +08:00 |
WenhaiLin
|
4d97d5075b
|
Add test case for issue12310.
|
2015-06-12 15:39:57 +08:00 |
pandamicro
|
c3aba0392d
|
Update auto conversion for sprite polygon
|
2015-06-12 13:00:49 +08:00 |
子龙山人
|
7a9b48bd83
|
Merge pull request #12214 from andyque/optimize-ui-memory-usage
Optimize ui memory usage
|
2015-06-12 10:11:21 +08:00 |
pandamicro
|
1a9056cf14
|
Merge pull request #12300 from jianglong0156/textFieldShowString
[ci skip]add textfield show textString
|
2015-06-11 19:33:21 +08:00 |
WenhaiLin
|
5aa31ea83a
|
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
|
2015-06-11 17:16:44 +08:00 |
pandamicro
|
902f1696e8
|
Merge pull request #12290 from jianglong0156/issue#2928texture2d
[ci skip]add pr#2928 test case, load same remote img. can callback the function
|
2015-06-11 16:51:59 +08:00 |
子龙山人
|
43555272d5
|
Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-11 16:34:45 +08:00 |
yangxiao
|
44c2b0d5ad
|
merge cocos
|
2015-06-11 15:54:42 +08:00 |
WenhaiLin
|
aff2f8c2c4
|
Fixed compile error.
|
2015-06-11 14:42:03 +08:00 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
jianglong0156
|
f97955682a
|
add pr#2928 test case, load same remote img. can callback the function
|
2015-06-11 11:11:51 +08:00 |
jianglong0156
|
96ce3ec22c
|
add textfield show textString
|
2015-06-10 16:15:09 +08:00 |
Jacky
|
b41c60dbdb
|
Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
# Conflicts:
# external/config.json
|
2015-06-10 10:23:43 +08:00 |
Huabing.Xu
|
10352c40b2
|
Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
# cocos/2d/CCCamera.h
|
2015-06-10 10:16:42 +08:00 |
Huabing.Xu
|
3e331128c6
|
file rename CCFrameBufferObject->CCFrameBuffer
|
2015-06-09 15:32:12 +08:00 |
Huabing.Xu
|
97b387560b
|
revert some accidental changes
|
2015-06-09 14:06:11 +08:00 |
Jacky
|
562d4b9a78
|
fix on the windows.
|
2015-06-09 11:23:37 +08:00 |
Huabing.Xu
|
9acab65e4f
|
rename FrameBufferObject->FrameBuffer
Move FrameBufferObject related class to experimental namespace
|
2015-06-09 10:59:43 +08:00 |
WuHao
|
a67e570ef7
|
deleted more leftover comments, placed polygon test further down the tests
|
2015-06-08 15:40:18 +08:00 |
WuHao
|
2650de030c
|
modified tests to show current epsilon
|
2015-06-08 15:08:16 +08:00 |
WuHao
|
0808b6aff9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
cocos/2d/MarchingSquare.cpp
|
2015-06-08 13:59:26 +08:00 |
WenhaiLin
|
784f142f91
|
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-08 11:06:02 +08:00 |
Jacky
|
3e62dd0473
|
remove unused file and code.
|
2015-06-06 13:31:25 +08:00 |
Dale Stammen
|
d4c9a81908
|
Merge branch 'v3' into v3-winrt-ogg
|
2015-06-05 16:03:54 -07:00 |
Ricardo Quesada
|
453a3d93bc
|
samplers are treated as uniforms
|
2015-06-05 14:55:33 -07:00 |
Dale Stammen
|
f1a067ee75
|
removed e option from xcopy of cpp template files
|
2015-06-05 09:21:52 -07:00 |
Dale Stammen
|
bc1ea87adf
|
updated app guid and disables auto version increment for App Cert tests
|
2015-06-05 06:21:03 -07:00 |
Dale Stammen
|
47b5085ade
|
Merge branch 'v3' into v3-winrt-ogg
|
2015-06-05 05:36:15 -07:00 |
andyque
|
56b7037c5f
|
optimize uislider memory usage
|
2015-06-05 17:16:10 +08:00 |
pandamicro
|
399ecfcb9f
|
Merge pull request #12176 from super626/fixphysics3d
rename syncToNode and syncToPhysics
|
2015-06-05 16:02:45 +08:00 |
andyque
|
6390f063fe
|
optimize UILoadingBar memory usage
|
2015-06-05 15:57:39 +08:00 |
yangxiao
|
d50c1823d4
|
merge cocos
|
2015-06-05 14:25:37 +08:00 |
andyque
|
a7141bab38
|
improve imageView memory usage
|
2015-06-05 14:19:05 +08:00 |
pandamicro
|
fa71a6e352
|
Merge pull request #12204 from jianglong0156/issue1756
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
|
2015-06-05 13:17:53 +08:00 |
jianglong0156
|
33beab2d81
|
add gzip test
|
2015-06-05 11:40:29 +08:00 |
andyque
|
91ddb802e1
|
optimize ui::CheckBox memory consumption
|
2015-06-05 10:32:22 +08:00 |
Dale Stammen
|
3f3ace05a7
|
added ogg support for Windows 10 UWP
|
2015-06-04 14:42:11 -07:00 |
pandamicro
|
2da754dcf2
|
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
Add onEnter and onExit of components to CCNode's onEnter and onExit function
|
2015-06-04 18:39:52 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
WuHao
|
5b572ab803
|
Polyinfo is no longer a pointer
|
2015-06-04 16:20:00 +08:00 |
WuHao
|
0a51c9bd27
|
Finished AutoPolygon and Sprite
|
2015-06-04 15:43:31 +08:00 |
zhangcheng
|
8d3d3a0348
|
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
|
2015-06-04 14:06:31 +08:00 |
yangxiao
|
8b5333a5c9
|
Merge branch 'newcode' into navigation2
|
2015-06-04 12:44:39 +08:00 |
yangxiao
|
73d815b0ab
|
rename syncToNode and syncToPhysics
|
2015-06-04 12:04:41 +08:00 |
Huabing.Xu
|
ad1f7c472c
|
add render buffer render target for color attachment
|
2015-06-04 11:18:35 +08:00 |
samuele3hu
|
3bae5620d6
|
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
|
2015-06-04 09:40:54 +08:00 |
子龙山人
|
95934bf310
|
Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix
V3: Fixes for Windows 8.1 Universal App JavaScript
|
2015-06-04 09:22:21 +08:00 |
Ricardo Quesada
|
6a19661a80
|
Merge pull request #12150 from ricardoquesada/material_custom_uniforms
Material custom uniforms
|
2015-06-03 13:08:04 -07:00 |
Dale Stammen
|
808de7b475
|
removed e option from xcopy
|
2015-06-03 09:54:43 -07:00 |
Dale Stammen
|
21de1825ac
|
removed e option from xcopy
|
2015-06-03 09:47:55 -07:00 |
Dale Stammen
|
18ce48dc2a
|
/NODEFAULTLIB:MSVCRT to fix linker warning
|
2015-06-03 09:26:15 -07:00 |
samuele3hu
|
0cccd6e765
|
Fix compile error on the Linux and update the test cases
|
2015-06-03 18:12:21 +08:00 |
zhukaixy
|
76ad42bb0b
|
configure recast project for win8.1 project
|
2015-06-03 14:31:12 +08:00 |
Ricardo Quesada
|
ff81078062
|
fixes bug when calculating the dynamic values
|
2015-06-02 17:48:50 -07:00 |
Chris Hannon
|
6bcf325630
|
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:34 -04:00 |
Chris Hannon
|
fb10217e2b
|
[v3-update-sio] updates SocketIO tests and examples for using the SocketIO extension
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:33 -04:00 |
Ricardo Quesada
|
5f6f38616a
|
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
|
2015-06-02 17:05:05 -07:00 |
Ricardo Quesada
|
87a3a1844a
|
Adds support for Autobindings in Shader
...part of Material
|
2015-06-02 16:56:59 -07:00 |
samuele3hu
|
a20681aa21
|
Add Lua-bindings for NavMesh
|
2015-06-02 18:37:57 +08:00 |
pandamicro
|
613e0f73b7
|
Merge pull request #12095 from jianglong0156/videoplayer
add videoplayer jsb
|
2015-06-02 17:35:56 +08:00 |
jianglong0156
|
6eddf97416
|
fix the platform judge error
|
2015-06-02 17:29:36 +08:00 |
jianglong0156
|
0c821379f8
|
modify video mp4 formate
|
2015-06-02 17:07:11 +08:00 |
jianglong0156
|
4abaa51e12
|
webview and videoplayer only play in android, ios and web
|
2015-06-02 15:06:44 +08:00 |
yangxiao
|
3d4606921b
|
merge cocos
|
2015-06-02 14:27:31 +08:00 |
jianglong0156
|
c46fea1f7a
|
Merge branch 'v3' into videoplayer
|
2015-06-02 11:26:48 +08:00 |
jianglong0156
|
97d0265e32
|
gzip test
|
2015-06-02 10:23:30 +08:00 |
pandamicro
|
4c6f67fd7e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
tools/bindings-generator
web
|
2015-06-02 10:12:22 +08:00 |
WuHao
|
3c5326ba1f
|
removed spritePolygon, merge into sprite and draft of AutoPolygon
|
2015-06-02 10:10:09 +08:00 |
pandamicro
|
fdec552ed7
|
Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader
|
2015-06-02 10:08:13 +08:00 |
samuele3hu
|
be870bd42a
|
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
|
2015-06-01 11:26:08 +08:00 |
yangxiao
|
a0adf507c0
|
getTriangleList instead of load obj
|
2015-06-01 10:56:17 +08:00 |
Dale Stammen
|
494a7079d3
|
fixed test for Windows 10 CC_PLATFORM_WINRT
|
2015-05-29 09:35:53 -07:00 |
Dale Stammen
|
a16d51cad9
|
keyboard events now available in Windows Universal Apps
|
2015-05-29 08:15:04 -07:00 |
Dale Stammen
|
e0c65c203a
|
Merge branch 'v3' into v3-uwp
|
2015-05-29 08:09:05 -07:00 |
samuele3hu
|
c3ea65e66b
|
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
|
2015-05-29 18:25:15 +08:00 |
WuHao
|
3d62805d04
|
Merge branch 'v3' into fix_spritepolygon
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
|
2015-05-29 18:10:41 +08:00 |
yangxiao
|
c782d63bef
|
add 3d navigation
|
2015-05-29 16:45:33 +08:00 |
Huabing.Xu
|
b5e76c7521
|
Merge branch 'v3_origin' into v3FrameBufferObject
|
2015-05-29 15:59:38 +08:00 |
Jacky
|
8df4920f6e
|
fixed file name.
|
2015-05-29 15:03:36 +08:00 |
子龙山人
|
b39006432f
|
Merge pull request #12091 from joshuastray/properties
[ci skip]fix material test
|
2015-05-29 14:22:36 +08:00 |
Jialong Zhai
|
9cf5c1b636
|
fix material test
|
2015-05-29 13:54:29 +08:00 |
子龙山人
|
a968bc2d15
|
Merge pull request #12062 from jianglong0156/jsWebviewTest
Js webview test
|
2015-05-29 11:35:30 +08:00 |
jianglong0156
|
8b52563a8a
|
add videoplayer config ini and fix the url bug
|
2015-05-29 11:10:39 +08:00 |
Huabing.Xu
|
22ddf53539
|
Merge branch 'v3FrameBufferObject' into v3
|
2015-05-29 10:38:42 +08:00 |
Huabing.Xu
|
df09bef567
|
use a different size to create fbo
|
2015-05-29 10:00:48 +08:00 |
Dale Stammen
|
2f943aa7b1
|
updated properties
|
2015-05-28 15:30:17 -07:00 |
Dale Stammen
|
d702012972
|
don't auto update version number for each windows app certification test
|
2015-05-28 15:04:09 -07:00 |
Dale Stammen
|
2a71407501
|
fixed double to float conversion compiler warning
|
2015-05-28 15:00:49 -07:00 |
Dale Stammen
|
dadbbc18d6
|
added Windows 10 UWP project files
|
2015-05-28 13:51:25 -07:00 |
Dale Stammen
|
736de4e37c
|
fixed compiler warning for double to float conversion
|
2015-05-28 13:32:40 -07:00 |
Dale Stammen
|
7623ee390b
|
disable CURL and AssetsManager for Windows 10 UWP
|
2015-05-28 13:32:08 -07:00 |
jianglong0156
|
9a62d06091
|
add video player test and auto bindings
|
2015-05-28 18:10:07 +08:00 |
Huabing.Xu
|
727231a888
|
change test cases
|
2015-05-28 17:04:49 +08:00 |
MAUSMAUSgames
|
847cba026c
|
added _flags to Action, change API to stopActionsByFlags
|
2015-05-28 09:52:49 +02:00 |
jianglong0156
|
379f536330
|
improve test case, remove the invalid testcase
|
2015-05-28 14:02:07 +08:00 |
samuele3hu
|
a89e000f80
|
Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest .
|
2015-05-28 10:46:44 +08:00 |
jianglong0156
|
c0b42fdfec
|
modify addEventListener to setEventListener
|
2015-05-28 10:12:58 +08:00 |
Dale Stammen
|
9ee4b4af1e
|
Merge branch 'v3' into v3-winrt-audio
|
2015-05-27 11:54:21 -07:00 |
jianglong0156
|
e105c47cb0
|
improve testcase
|
2015-05-27 18:23:56 +08:00 |
andyque
|
74f0b3b436
|
add bmfont test
|
2015-05-27 16:58:52 +08:00 |
子龙山人
|
62832586d0
|
Merge pull request #12049 from samuele3hu/v3_material
issue #12046: Add Lua bindings for material systems and related test cases
|
2015-05-27 16:26:26 +08:00 |
samuele3hu
|
9934d73548
|
issue #12046: Add Lua bindings for material systems and related test cases.
|
2015-05-27 15:37:59 +08:00 |
子龙山人
|
c8d8a9cfd2
|
Merge pull request #12022 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-27 15:05:32 +08:00 |
子龙山人
|
4cd5d479c0
|
Merge pull request #12028 from samuele3hu/v3_issue10302
issue #10302: Remove duplicated test cases
|
2015-05-27 15:05:10 +08:00 |
子龙山人
|
4a1c5954a3
|
Merge pull request #12045 from andyque/v3
fix iOS 64bit implicit conversion error.
|
2015-05-27 15:04:41 +08:00 |
andyque
|
452248c0dd
|
fix iOS 64bit implicit conversion error.
|
2015-05-27 13:45:07 +08:00 |
子龙山人
|
fc8f556f98
|
Merge pull request #12027 from jianglong0156/modifyShaderSample
rename shader file name
|
2015-05-27 13:33:02 +08:00 |
jianglong0156
|
e898a680e2
|
Merge branch 'modifyTestResource' into jsWebviewTest
|
2015-05-27 11:49:23 +08:00 |
jianglong0156
|
521ce15cb6
|
add webview autobindings. modify webtest. adapt the web interface
|
2015-05-27 11:46:26 +08:00 |
Huabing.Xu
|
471547e0b0
|
refactor FrameBufferObject to FrameBufferObject and RenderTarget
|
2015-05-27 11:40:12 +08:00 |
jianglong0156
|
c3aae69fc0
|
modify proj.android-studio copy resource path
|
2015-05-27 10:08:03 +08:00 |
jianglong0156
|
9cd2b16ad0
|
modify js resource name
|
2015-05-27 09:52:44 +08:00 |
Vincent Yang
|
8105e9c714
|
Fix bug: terrain can't move to other position except origin point.
|
2015-05-26 17:51:26 +08:00 |
jianglong0156
|
7820610f13
|
Merge branch 'modifyTestResource' into jsWebviewTest
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
|
2015-05-26 17:49:17 +08:00 |
jianglong0156
|
4d6b763eb6
|
rename shader file name
|
2015-05-26 17:21:35 +08:00 |
jianglong0156
|
5b7cf14384
|
rename shader file name
|
2015-05-26 17:20:48 +08:00 |
samuele3hu
|
ea75e222ba
|
issue #10302: Remove duplicated test cases
|
2015-05-26 17:20:46 +08:00 |
jianglong0156
|
fb4d638231
|
copy resources in linux
|
2015-05-26 16:34:04 +08:00 |
jianglong0156
|
60e3b5390d
|
copy resources in android
|
2015-05-26 16:33:47 +08:00 |
jianglong0156
|
6f67ec1e6c
|
Merge branch '2d-xv3' into modifyTestResource
|
2015-05-26 16:23:25 +08:00 |
jianglong0156
|
e117d62b13
|
add js-test resource copy command
|
2015-05-26 14:47:49 +08:00 |
jianglong0156
|
fe677f32dd
|
delete js resource
|
2015-05-26 14:28:53 +08:00 |
jianglong0156
|
ae4c8d9798
|
fix opengl resource error
|
2015-05-26 14:26:45 +08:00 |
jianglong0156
|
95e8212727
|
add js cocosbuilder resource
|
2015-05-26 14:08:51 +08:00 |
jianglong0156
|
fd05998b5f
|
fix the bug: shader in jsb can not run correctly.
|
2015-05-25 17:48:34 +08:00 |
jianglong0156
|
f1145139ac
|
fix js resource path in code
|
2015-05-25 17:02:26 +08:00 |
Bin Zhang
|
c491b6a5c1
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-25 17:01:29 +08:00 |
Huabing.Xu
|
c22a8e81ce
|
Merge branch 'v3' into v3FrameBufferObject
|
2015-05-25 16:56:22 +08:00 |
Bin Zhang
|
3298145eb5
|
Support build & run Android Studio project in console.
|
2015-05-25 16:53:36 +08:00 |
jianglong0156
|
6e27825dec
|
add web shader resource
|
2015-05-25 16:51:58 +08:00 |
jianglong0156
|
82c5fbbc76
|
add js resource for web tests
|
2015-05-25 16:50:27 +08:00 |
minggo
|
bcc1bf8d32
|
Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
use trianglescommand for sprite
|
2015-05-25 16:48:22 +08:00 |
samuele3hu
|
074216bef9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
|
2015-05-24 22:46:05 +08:00 |
anniruddh.koppal
|
b2eb946c14
|
Added MP3 support
|
2015-05-23 19:13:12 -07:00 |
andyque
|
07eb116fb6
|
fix lua tests release mode linker issue
|
2015-05-23 08:48:53 +08:00 |
andyque
|
73902a4063
|
fix simulator vs2015 support
|
2015-05-22 17:47:48 +08:00 |
Huabing.Xu
|
6d9f850e2c
|
use trianglescommand for sprite
|
2015-05-22 15:54:56 +08:00 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +08:00 |
minggo
|
e1823fb66d
|
Merge pull request #11968 from jianglong0156/rebuildAutoBindingCons
add the notification node test in sceneTest
|
2015-05-22 14:43:01 +08:00 |
minggo
|
698428e0a1
|
Merge pull request #11971 from joshuastray/physics
Physics3d js binding
|
2015-05-22 14:42:34 +08:00 |
jianglong0156
|
6915213b86
|
add jsb binding parms which can support null object.
add the notification node test in sceneTest
|
2015-05-22 11:01:39 +08:00 |
minggo
|
d5d329b74f
|
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
add Android 9-patch image format support
|
2015-05-22 09:52:12 +08:00 |
minggo
|
1a1860e126
|
Merge pull request #11949 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-22 09:49:08 +08:00 |
minggo
|
10fb660fca
|
Merge pull request #11947 from dabingnn/v3_bugForCameraVisitingScene
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-22 09:47:18 +08:00 |
Dale Stammen
|
7d0ca21167
|
use stringstream instead to to_string
|
2015-05-21 12:39:00 -07:00 |
Dale Stammen
|
8bb393f16f
|
use stringstream instead to to_string
|
2015-05-21 12:20:43 -07:00 |
Dale Stammen
|
52546112a5
|
added tests for saving cocos2d::Data buffers
|
2015-05-21 11:22:37 -07:00 |
joshuastray
|
342734e3b5
|
Merge remote-tracking branch 'upstream/v3' into physics
|
2015-05-21 21:15:42 +08:00 |
Bin Zhang
|
94e2e1cb00
|
Modify the configuration for android studio support in console.
|
2015-05-21 18:27:30 +08:00 |
jianglong0156
|
cf5f3c321c
|
fix invalid native object error
|
2015-05-21 18:10:00 +08:00 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
jianglong0156
|
9ed290e64e
|
Merge branch 'jsTest' into modifyTestResource
|
2015-05-21 17:35:13 +08:00 |
Huabing.Xu
|
2d147f0b97
|
[ci skip] and an empty line at the end of file
|
2015-05-21 17:12:35 +08:00 |
Huabing.Xu
|
c202cad712
|
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-21 16:57:13 +08:00 |
Bin Zhang
|
41792caa6b
|
Add files & configuration for android studio support in console.
|
2015-05-21 16:34:03 +08:00 |
jianglong0156
|
f2b41971d0
|
modify js test resource path
|
2015-05-21 16:21:45 +08:00 |