Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,345 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

30345 Commits

Author SHA1 Message Date
子龙山人 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
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
Hao Wu 9e01874fe8 Merge pull request #7 from fusijie/fix_spritepolygon2 
remove unused file and code.
 2015-06-08 09:28:32 +08:00
CocosRobot f97a3474b2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-07 10:55:19 -07:00
Ricardo Quesada c5c2f04ff0 samplers are treated as uniforms 2015-06-07 10:55:13 -07:00
Furkan Üzümcü 6433a69ed1 Update CMakeLists.txt 
Add WIN32 property to add_executable function to prevent the following error on Windows
`MSVCRTD.lib(crtexe.obj)👎 error: LNK2019: unresolved external symbol _main referenced in function ___tmainCRTStartup`
 2015-06-07 20:44:39 +03:00
Furkan Üzümcü 3269df546c Update CMakeLists.txt 
Extend the include directories to prevent compilation errors on Windows
 2015-06-07 20:34:15 +03:00
Oscar Utbult 3be686cee7 Fix clone URL in README.md 2015-06-07 13:29:32 +02:00
Huabing.Xu 133ef90c09 Merge branch 'v3Viewport' into v3FrameBufferObject 
# Conflicts:
#	cocos/renderer/CCFrameBufferObject.h
 2015-06-06 18:16:22 +08:00
Jacky 3e62dd0473 remove unused file and code. 2015-06-06 13:31:25 +08:00
pandamicro 6176a939f6 Update web ref 2015-06-06 11:25:02 +08:00
Ricardo Quesada 0030340542 Merge pull request #12219 from CocosRobot/update_lua_bindings_1433545622 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-05 16:30:51 -07:00
CocosRobot 835e56e80a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 23:13:03 +00:00
Dale Stammen d4c9a81908 Merge branch 'v3' into v3-winrt-ogg 2015-06-05 16:03:54 -07:00