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

35408 Commits

Author SHA1 Message Date
Ricardo Quesada 548a5ebdce Merge pull request #16019 from ricardoquesada/hex_hex 
fix: Add support for hexagonal tiled maps
 2016-07-02 22:07:03 -07:00
yalab 35968a6fc1 Slidebar can load TextureCache on cocosstudio. 2016-07-02 18:45:20 +09:00
yalab c675675de5 Fixed to use TexturePacker with cocosstudio. 2016-07-02 17:31:32 +09:00
Ricardo Quesada f7d65fbe8a Squashed commit of the following: 
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jul 1 11:05:02 2016 -0700

    Add support for Hex tiled maps

    Based on original patch by https://github.com/JustVic
    Original patch:
    https://github.com/cocos2d/cocos2d-x/pull/13288
    fix: tiled hex maps

    Hexagonal TileMaps Support

    fix: odd, even works as expected

    still problems with rendering order

    fix: fixes layer position in Hex

    fix render ordering
 2016-07-01 15:51:00 -07:00
minggo d63802e718 Merge pull request #16018 from minggo/update-release-note 
update release note
 2016-07-01 17:22:20 +08:00
minggo c1949be617 Merge pull request #16017 from minggo/issue-15978 
don't search APK if the path is absolute
 2016-07-01 17:21:37 +08:00
minggo 46c38fff62 update release note 2016-07-01 17:21:26 +08:00
minggo fa5de8ccd3 Merge pull request #16006 from mogemimi/fix-utf8-substring 
Fix getSubStringOfUTF8String bug
 2016-07-01 15:53:41 +08:00
minggo 12442521b2 don't search APK if the path is absolute 2016-07-01 15:42:02 +08:00
minggo 30b5be6ddd Merge pull request #16014 from natural-law/v3 
[ci skip] Update submodule cocos2d-console.
 2016-07-01 14:35:27 +08:00
이명열 853e083c68 - The result comes across as negative.(device android) 2016-07-01 15:32:43 +09:00
mogemimi 2354df9faf Fix getSubStringOfUTF8String bug 2016-07-01 15:16:35 +09:00
zhangbin 51e7de9457 Update submodule cocos2d-console. 
Changed:
- Remove unused command framework.
 2016-07-01 12:03:26 +08:00
minggo 6aec420a13 Merge pull request #16013 from pandamicro/v3.12 
Fix callfunc released with retained data (callback, target, extradata) issue
 2016-07-01 11:52:23 +08:00
pandamicro d02bdda781 Fix callfunc released with retained data (callback, target, extradata) issue 2016-07-01 10:56:17 +08:00
minggo 5f817eaa67 Merge pull request #16011 from CocosRobot/update_lua_bindings_1467339225 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-01 10:35:53 +08:00
CocosRobot 94de257115 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-01 02:16:32 +00:00
minggo 043d81be1c Merge pull request #16008 from yalab/cocosstudio_with_texturepacker 
cocosstudio can manage TexturePacker Image.
 2016-07-01 10:10:09 +08:00
halx99 2610ad77cc #15965: remove unused _orderOfArrival (#16009) 2016-07-01 10:09:25 +08:00
yalab c5648db10a cocosstudio can manage TexturePacker Image. 2016-06-30 18:10:08 +09:00
Ricardo Quesada 9bc695a75b Merge pull request #16007 from ricardoquesada/linux_glfw_32 
upgrades to GLFW v3.2
 2016-06-29 17:20:56 -07:00
Ricardo Quesada afe36e4a00 feat: upgrades to GLFW v3.2 
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script

fixes github issue #11748

uses WINAPI instead of APIENTRY

it seems that it is being redefined somewhere... but I couldn't find
exactly where
 2016-06-29 16:11:30 -07:00
CocosRobot 274a82c7f5 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16001) 2016-06-29 22:56:13 +08:00
minggo 47442b9d8b Merge pull request #15997 from mogemimi/fix-variable-names 
Fix some minor typos in local variable names
 2016-06-29 14:24:00 +08:00
minggo bb1b8f1cde Merge pull request #15998 from pandamicro/v3.12 
[ci skip] Fix js test issues
 2016-06-29 14:21:30 +08:00
minggo 39fbf253ed Merge pull request #16000 from CocosRobot/update_lua_bindings_1467175446 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-06-29 14:20:23 +08:00
CocosRobot ef01ac4465 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-29 04:47:21 +00:00
Ricardo Quesada 935c60c552 Merge pull request #15999 from ricardoquesada/issue13351 
fix: not leak Toggle items
 2016-06-28 21:40:10 -07:00
Ricardo Quesada b1f93b2679 fix: not leak Toggle items 
Github issue: fixes #13351
 2016-06-28 20:41:47 -07:00
pandamicro 91341c151a Fix js test issues 2016-06-29 11:08:34 +08:00
minggo a10398ad66 update engine version 2016-06-29 10:05:59 +08:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
Ricardo Quesada 0267c15757 Merge pull request #15990 from ricardoquesada/issue15958 
fix issue #15958
 2016-06-28 18:55:53 -07:00
Drakon-Cocos 7302ad979a Can set scroll to item duration in ListView and derived classes (#15964) 
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)

* Parameter no more 'const'. Comments
 2016-06-29 09:48:03 +08:00
minggo 3bb9c75d66 Merge pull request #15994 from cocos2d/revert-10501-fix_ccglviewimpl 
Revert "Added CCGLViewImpl.h"
 2016-06-29 09:45:29 +08:00
minggo ecf97575ad Revert "Added CCGLViewImpl.h" 2016-06-29 09:45:05 +08:00
minggo feb513c7eb Merge pull request #15982 from mogemimi/fix-typo 
Fix typo: destoryMark -> destroyMark
 2016-06-29 09:41:59 +08:00
minggo 076e0b488b Merge pull request #15980 from minggo/merge-v312 
Merge v312
 2016-06-29 09:41:30 +08:00
minggo 55f757855b Merge pull request #15983 from cocos2d/v3.12-Release-Notes-updating 
Update Release Notes -> add Tizen, add VR, removed some old text
 2016-06-29 09:39:16 +08:00
kuzy000 8598003b55 Added CCGLViewImpl.h (#10501) 
* Added CCGLViewImpl.h for more consistency

* fixed indentation
 2016-06-29 09:36:13 +08:00
Ricardo Quesada 861cf3882d Merge pull request #15989 from CocosRobot/update_cocosfiles_1467162079 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-06-28 18:18:56 -07:00
Ricardo Quesada 7d7936bbc1 fix issue #15958 
again
 2016-06-28 18:07:30 -07:00
mogemimi 2060b333ca Fix typo: destoryMark -> destroyMark 2016-06-29 10:04:31 +09:00
CocosRobot 2fbf3c9940 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-29 01:01:21 +00:00
Ricardo Quesada c7af8e3e74 Merge pull request #15987 from ricardoquesada/issue14017test 
fix: add test case for issue #14017
 2016-06-28 17:58:51 -07:00
Ricardo Quesada 65e32522e1 Merge pull request #15986 from ricardoquesada/issue14050test 
fix: add testcase for issue #14050 fix
 2016-06-28 17:38:18 -07:00
Ricardo Quesada a6305cc1f7 fix: add test case for issue #14017 
Add test case for issue #14017
 2016-06-28 17:32:13 -07:00
Ricardo Quesada ed30993f59 fix: add testcase for issue #14050 fix 2016-06-28 17:08:56 -07:00
Ricardo Quesada 92fe9a33b4 Merge pull request #15984 from ricardoquesada/issue14070 
fix: detect sqlite headers in linux
 2016-06-28 16:17:11 -07:00
Ricardo Quesada b8601493bb fix: detect sqlite headers in linux 
fixes github issue #14070

PR based on https://github.com/cocos2d/cocos2d-x/pull/14098
by @firefly2442
 2016-06-28 15:12:25 -07:00