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

30344 Commits

Author SHA1 Message Date
pandamicro 04ec7b2b9f Merge pull request #12420 from samuele3hu/v3_7_test 
Fix skip function error for Sprite.
 2015-06-18 13:33:49 +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
pandamicro c046c1bf2d Merge pull request #12418 from dabingnn/v3_fixLinuxCompileBug 
fix compile error for linux
 2015-06-18 12:04:33 +08:00
samuele3hu ef1bccd926 Fix the error skip function error for Sprite. 2015-06-18 12:03:30 +08:00
VisualSJ 44c37c676e change the seek to time 2015-06-18 11:54:25 +08:00
pandamicro 764b0b5f67 Merge pull request #12417 from samuele3hu/v3_7_test 
[ci skip]Fix the bugs about the Physics3DTest for Lua.
 2015-06-18 11:21:18 +08:00
samuele3hu 6c749a77f2 Fix the bugs about the Physics3DTest for Lua. 2015-06-18 11:17:08 +08:00
Huabing.Xu 92824537ac fix compile error for linux 2015-06-18 11:15:45 +08:00
samuele3hu 7f21731bb1 Update UIS9NinePatchTest for jsb 2015-06-18 10:08:13 +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 5a34133155 Merge pull request #12397 from pandamicro/v3 
Update submodules
 2015-06-18 08:13:58 +08:00
Ricardo Quesada 8c56859ca9 Merge pull request #12412 from MSOpenTech/v3-winrt-fix 
V3: Fix Windows 10 UWP build by adding missing external/clipper files
 2015-06-17 13:19:22 -07:00
Dale Stammen fd0605416e moved clipper files to external/clipper filter in VS solution 2015-06-17 11:48:56 -07:00
Dale Stammen 9ef92b71dd added missing external/clipper files. Removed obsolete files 2015-06-17 11:40:38 -07:00
pandamicro 5b23e8b381 Fix resource issue 2015-06-18 00:24:01 +08:00
pandamicro 6e7f1ce9dd Fix plugin compilation issue 2015-06-18 00:16:52 +08:00
pandamicro 153e9f7294 Fix plugin ref 2015-06-17 17:57:09 +08:00
pandamicro bb275351f0 Merge pull request #12363 from super626/v3 
Fix terrain lod computing bugs
 2015-06-17 17:49:39 +08:00
VisualSJ 010cb23ead Fixed a bug that xhr cross-domain error 2015-06-17 17:10:31 +08:00
yangxiao 12a352a1db add comment 2015-06-17 16:32:08 +08:00
XiaoYang 5dd2aa2884 Merge pull request #349 from tangziwen/v3 
fix camera position
 2015-06-17 16:01:02 +08:00
tangziwen e9c95229e0 fix camera position 2015-06-17 15:58:17 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
pandamicro b534f85679 Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 15:38:17 +08:00
pandamicro ddc820eb42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-17 15:33:34 +08:00
CocosRobot 22f04da582 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 07:18:18 +00:00
pandamicro 6f6c317f87 Merge pull request #12386 from WenhaiLin/v3-label-spacefix 
Label:Fixed wrong letter spacing with outline enabled
 2015-06-17 15:16:49 +08:00
pandamicro 5ee22c4142 Merge pull request #12174 from pajeroquan/v3 
Fix JNI object memory leak!
 2015-06-17 15:14:36 +08:00
子龙山人 f4eb82d5b1 Merge pull request #12393 from CocosRobot/update_cocosfiles_1434525074 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-17 15:14:11 +08:00
CocosRobot c7ad47908e [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 07:11:15 +00:00
子龙山人 fd508a0198 Merge pull request #12381 from VisualSJ/v3-aa 
[ci skip]Fix some simple bug
 2015-06-17 15:11:08 +08:00
pandamicro b1831ea5fb Merge pull request #12384 from chengstory/GBKToUTF8_v3 
GBKToUTF8
 2015-06-17 15:09:15 +08:00
子龙山人 dd86da0545 Merge pull request #12392 from CocosRobot/update_lua_bindings_1434524084 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 15:02:28 +08:00
CocosRobot ab1530168b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:59:51 +00:00
子龙山人 041f7c7e54 Merge pull request #12390 from CocosRobot/update_cocosfiles_1434523357 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-17 14:50:28 +08:00
子龙山人 31eabf4294 Merge pull request #12391 from CocosRobot/update_lua_bindings_1434523444 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 14:50:08 +08:00
子龙山人 9deaa9bcc9 Merge pull request #12374 from natural-law/framework 
Optimize framework-compile.
 2015-06-17 14:49:43 +08:00
CocosRobot 55c7de75e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:48:41 +00:00
VisualSJ 0a223adf7c After exiting should restore settings 2015-06-17 14:43:41 +08:00
CocosRobot 734382026a [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 06:42:39 +00: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
Wenhai Lin cbd428f6ac Label:Fixed wrong letter spacing with outline enabled 2015-06-17 13:57:23 +08:00
pandamicro 6a50ef0267 Merge pull request #12382 from tangziwen/v3_cocos 
add librecast to cpp template
 2015-06-17 13:46:30 +08:00