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

30019 Commits

Author SHA1 Message Date
Hao Wu 02d18a6bf5 Merge pull request #10 from fusijie/fix_spritepolygon2 
fix conflicts.
 2015-06-10 10:27:56 +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
Hao Wu db07e21a71 Merge pull request #9 from fusijie/fix_spritepolygon2 
fix memory leakage about operation=
 2015-06-10 10:08:28 +08:00
子龙山人 1897eef05d Merge pull request #12267 from oscr/fix_download_deps 
Capitalize default option in download-deps.py
 2015-06-10 09:45:57 +08:00
子龙山人 e1cb308f1d Merge pull request #12234 from MSOpenTech/v3-winrt-ogg 
Added OGG support to winrt audio
 2015-06-10 09:44:32 +08:00
Oscar Utbult 76a3db6f29 Capitalize default option in download-deps.py 2015-06-09 23:58:56 +02:00
anniruddh.koppal 3f4d1c4ed3 Fixed merge conflict issue 2015-06-09 14:06:24 -07:00
yangxiao 7f26ccb9ba code style 2015-06-09 14:06:09 -07:00
tangziwen fc34881ab9 fix Terrain::getIntersectionPoint 2015-06-09 13:23:33 -07:00
Dale Stammen 0cb2f87d3e Merge branch 'v3' into v3-winrt-ogg 2015-06-09 08:21:09 -07:00
子龙山人 a202387800 Merge pull request #12247 from stari4ek/v3-outline-inner-holes 
improve rendering of letter's inner shapes when outline is used
 2015-06-09 23:11:39 +08:00
Jacky 88b3fc3c7e fix memory leakage about operation= 2015-06-09 18:45:55 +08:00
子龙山人 b40113d6c5 Merge pull request #12255 from xiaofeng11/v3_xiaofeng 
Fix issue 10258 & 10408
 2015-06-09 17:57:28 +08:00
XiaoFeng 20a6151f4c Fix indent 2015-06-09 17:40:42 +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
子龙山人 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
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
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
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
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
子龙山人 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