Jacky
88b3fc3c7e
fix memory leakage about operation=
2015-06-09 18:45:55 +08:00
iris-wy
79b3d70b60
fix bug #12200
...
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
2015-06-09 18:43:46 +08:00
子龙山人
b40113d6c5
Merge pull request #12255 from xiaofeng11/v3_xiaofeng
...
Fix issue 10258 & 10408
2015-06-09 17:57:28 +08:00
Huabing.Xu
67a94c4485
compiles on android and linux
2015-06-09 17:57:07 +08:00
XiaoFeng
20a6151f4c
Fix indent
2015-06-09 17:40:42 +08:00
Huabing.Xu
b79eec0b20
fix grid bug for viewport
2015-06-09 17:24:30 +08:00
Huabing.Xu
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
Hao Wu
5f4b506d3a
Merge pull request #8 from fusijie/fix_spritepolygon2
...
fix to all platform
2015-06-09 16:17:40 +08:00
Jacky
d8369dda94
fix on the wp8 universal.
2015-06-09 16:00:51 +08:00
Huabing.Xu
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
WenhaiLin
6fec9c40b0
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-09 15:07:35 +08:00
子龙山人
62e563fded
Merge pull request #12237 from CocosRobot/update_lua_bindings_1433734219
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-09 15:04:48 +08:00
pandamicro
062fd56f11
Merge pull request #12253 from ZLester/patch-1
...
Fix typo in AUTHORS.txt
2015-06-09 14:44:20 +08:00
XiaoFeng
f6083f3490
Fix issue 10258 & 10408
2015-06-09 14:38:48 +08:00
Zachary Lester
f3afd51ff5
Fix typo in AUTHORS.txt
...
Altered sentence explaining how authors were ordered so as to fix its grammar and more clearly convey its meaning.
2015-06-08 23:28:30 -07:00
Huabing.Xu
97b387560b
revert some accidental changes
2015-06-09 14:06:11 +08:00
yangxiao
e433ad305b
decopule physics and navmesh from Director
2015-06-09 13:49:07 +08:00
Jacky
74aed5ae85
fix on the android.
2015-06-09 13:47:29 +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
Justin Hawkwood
eca488b85a
Fails if file does not exist
...
This adds a callback with nullptr if the file does not exists. Checking this before checking cache means that if a file is cached then deleted, the async call will fail. To allow a cached but deleted file to return the texture, move the isFileExist check to ALTERNATIVE.
If leaving check where it is, on failure should it also check if the file was cached and remove it?
2015-06-08 17:14:15 -07:00
Dale Stammen
a2b677d300
Merge branch 'v3' into v3-winrt-ogg
2015-06-08 08:22:46 -07:00
Michael Sotnikov
dae8f788c1
improve rendering of inner shapes when outline is used
2015-06-08 12:56:43 +03:00
子龙山人
a364d6ecfc
Merge pull request #12246 from andyque/update-changelog-v3
...
[ci skip]Update changelog v3
2015-06-08 17:31:41 +08:00
andyque
9721621ecc
update changelog and authors
2015-06-08 17:30:59 +08:00
andyque
f4d6d05787
update changelog
2015-06-08 17:28:00 +08:00
子龙山人
57e92df8ee
Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path
...
Fixed : #12097 VideoPlayer on Android ignores search paths
2015-06-08 17:22:14 +08:00
子龙山人
54e23f15e6
Merge pull request #12179 from WenhaiLin/v3-37-physics-ap
...
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-08 16:12:56 +08:00
VisualSJ
3306c7b072
Fixed control LayoutComponent positioning bug
2015-06-08 15:41:33 +08:00
WuHao
a67e570ef7
deleted more leftover comments, placed polygon test further down the tests
2015-06-08 15:40:18 +08:00
WuHao
e175815c70
deleted some leftover comments in sprite
2015-06-08 15:17:46 +08:00
WuHao
2650de030c
modified tests to show current epsilon
2015-06-08 15:08:16 +08:00
子龙山人
272f40a3cf
Merge pull request #12242 from CocosRobot/update_lua_bindings_1433744214
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-08 14:27:50 +08:00
pandamicro
1b75d4a192
Merge pull request #12212 from super626/sprite3d
...
call setTransparent
2015-06-08 14:21:40 +08:00
CocosRobot
4fc0366e4d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-08 06:21:14 +00:00
子龙山人
03892caed5
Merge pull request #12206 from super626/fixphysics3d2
...
3D Physics: remove addChildToPhysics
2015-06-08 14:13:38 +08:00
WuHao
a555b2fb52
added documentation for auto polygon
2015-06-08 13:59:44 +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
VisualSJ
060ab85f22
Fixed UIText color settings bug
2015-06-08 13:58:08 +08:00
yangxiao
3fa17c28df
add comment
2015-06-07 22:02:23 -07:00
yangxiao
f9cc7fec0e
code style
2015-06-07 22:02:15 -07:00
yangxiao
076c3a8d90
get set gravity
2015-06-07 22:02:06 -07:00
tangziwen
87dab42255
fix Terrain::getIntersectionPoint
2015-06-07 22:01:38 -07:00
CocosRobot
5b8c51c22f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-08 03:35:39 +00:00
子龙山人
c5ba7eef8b
Merge pull request #12019 from super626/v3
...
getIntersectionPoint failed when there is no intersection on the terrain
2015-06-08 11:26:19 +08:00
Dale Stammen
30d28142cd
Merge branch 'v3-winrt-ogg' of github.com:MSOpenTech/cocos2d-x into v3-winrt-ogg
2015-06-07 20:21:27 -07:00
Dale Stammen
4e5f746b4b
updated version to v3-deps-62
2015-06-07 20:20:57 -07:00
Dale Stammen
2002054463
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-ogg
2015-06-07 20:19:52 -07:00
WenhaiLin
784f142f91
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
2015-06-08 11:06:02 +08:00
子龙山人
8ee6613175
Merge pull request #12230 from oscr/fix_readme
...
Fix clone URL in README.md
2015-06-08 10:00:08 +08:00