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

29370 Commits

Author SHA1 Message Date
songchengjiang f25c02f230 fix bugs of terrain 2015-05-11 12:02:32 +08:00
CocosRobot b5e9986d17 [AUTO]: updating luabinding & jsbinding automatically 2015-05-11 02:00:41 +00:00
minggo aaa3526ee2 Merge pull request #11770 from MSOpenTech/v3-winrt-fix 
V3: removed CC_PLATFORM_WP8 from source code
 2015-05-11 09:47:59 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
cpascal 382fd48b6a Fixed ogg filepath has unicode in Win32 
In Win32, you can't play ogg file if the path contains unicode.

mpg123 library accepts utf8 filepath, but ogg(Vorbisfile) library
accepts ACP(ANSI CodePage) in Win32 environment.
 2015-05-08 21:48:21 +09:00
dkorchinskiy a71ef98275 Fix web view leak on iOS 2015-05-08 15:19:14 +03:00
minggo 38b0cf7bf1 [ci skip]update CHANGELOG 2015-05-08 17:04:52 +08:00
minggo 60be9e0039 Merge pull request #11760 from CocosRobot/update_cocosfiles_1431075754 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-08 17:03:57 +08:00
CocosRobot 299e355152 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 09:02:36 +00:00
minggo 50dc2a3e49 Merge pull request #11758 from super626/physics3d2 
add physics3d support using bullet 2.82
 2015-05-08 16:58:28 +08:00
yangxiao c6d3991a03 wrong character 2015-05-08 15:56:48 +08:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
minggo 13199a0aac Merge pull request #11757 from andyque/v3 
improve jenkins workflow
 2015-05-08 15:32:35 +08:00
andyque 2575130b33 improve jenkins workflow 2015-05-08 14:44:43 +08:00
minggo f0e16bba71 Merge pull request #11756 from CocosRobot/update_cocosfiles_1431065607 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-08 14:20:46 +08:00
CocosRobot a3b8f6bcb1 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 06:13:28 +00:00
minggo bf93289718 Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012 
Remove vs2012 support in v3
 2015-05-08 14:11:13 +08:00
minggo 64de69f94a Merge pull request #11754 from CocosRobot/update_cocosfiles_1431053159 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-08 11:15:41 +08:00
samuele3hu adea931542 Update 3rd library to 50 2015-05-08 11:12:42 +08:00
minggo 1cfb8c88a6 [ci skip]update AUTHORS 2015-05-08 10:46:20 +08:00
CocosRobot 745fe13ecb [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 02:46:01 +00:00
minggo 82bcb171a2 Merge pull request #11747 from Dimon4eg/v3 
Fix crash in AssetsManager
 2015-05-08 10:44:06 +08:00
minggo b6ec472985 [ci skip]update CHANGELOG 2015-05-08 10:43:40 +08:00
minggo 14cebf7150 Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-08 10:42:31 +08:00
minggo d587ffd5c0 Merge pull request #11736 from samuele3hu/v3_7_js 
issue 10411:Bug in Physics manual Lua binding
 2015-05-08 10:04:55 +08:00
CocosRobot 4195c4b250 [AUTO]: updating luabinding & jsbinding automatically 2015-05-08 02:03:02 +00:00
minggo 5140afe24c Merge pull request #11715 from cnsoft/cnsoft-patch-1 
try to fix a nullptr bug.
 2015-05-08 09:55:13 +08:00
minggo 09ddf15b9f Merge pull request #11740 from joshuastray/fix-debu 
fix jsb debugger bug
 2015-05-08 09:29:40 +08:00
dkorchinskiy 0f30ad4f16 Fix crash in AssetsManager 2015-05-07 18:59:51 +03:00
Jialong Zhai be923b5901 fix jsb debugger bug 2015-05-07 18:24:30 +08:00
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
samuele3hu 0d53065476 issue 10411:Bug in Physics manual Lua binding 2015-05-07 16:15:24 +08:00
minggo 775236b531 Merge pull request #11729 from samuele3hu/v3_7_js 
Update the configure of js-tests and js-template on the win32 platform
 2015-05-07 15:48:35 +08:00
minggo 65ec7f9545 Merge pull request #11728 from WenhaiLin/v3-label-pos 
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
 2015-05-07 13:42:28 +08:00
samuele3hu 2385e68f72 Update the ini files for js binding 2015-05-07 13:00:57 +08:00
WenhaiLin 03bdb7055a Fixed typo 2015-05-07 11:48:55 +08:00
minggo a718c11eb6 Merge pull request #11724 from andyque/fix-binding-generator 
fix upstream compile error
 2015-05-07 11:47:20 +08:00
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +08:00
WenhaiLin 03a1167902 Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7 2015-05-07 11:31:59 +08:00
Wenhai Lin d09bd21da4 Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)` 2015-05-07 11:20:22 +08:00
minggo f76dd57bf7 Merge pull request #11727 from samuele3hu/v3_7_js 
Add $(EngineRoot)external for cocos2d_headers.props
 2015-05-07 11:17:10 +08:00
samuele3hu 87db3aba78 Add $(EngineRoot)external for cocos2d_headers.props 2015-05-07 11:11:33 +08:00
andyque db95034798 fix android compile error 2015-05-07 10:37:19 +08:00
minggo 83a887f6a0 Merge pull request #11714 from ryule/v3 
javaactivity-android.cpp needs JNIEXPORT for -fvisibility=hidden
 2015-05-07 09:37:58 +08:00
minggo 761a35cca2 [ci skip]update CHANGELOG 2015-05-07 09:36:49 +08:00
minggo b9925dad40 [ci skip]update AUTHORS 2015-05-07 09:35:51 +08:00
minggo fb112995d8 Merge pull request #11491 from milos1290/tween 
Adding FloatAction to animate any property over time.
 2015-05-07 09:34:44 +08:00
minggo 14f8c75c8c [ci skip]update CHANGELOG 2015-05-07 09:32:50 +08:00
minggo ba1e77d656 Merge pull request #11720 from WenhaiLin/v3-label-outline 
Label:Fixed outline doesn't match with the characters exactly.
 2015-05-07 09:30:37 +08:00
minggo b60a31f12d Merge pull request #11721 from samuele3hu/v3_7_js 
Fix the compile error for libSpine on the win32 platform
 2015-05-07 09:30:15 +08:00