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

35352 Commits

Author SHA1 Message Date
pandamicro d99a8f0f84 Made css style inline 2016-07-06 19:42:27 +08:00
minggo e632f99d48 Merge pull request #16052 from pandamicro/v3.12 
[ci skip]Update release notes
 2016-07-06 18:05:35 +08:00
pandamicro 927fd73ff0 Update release notes 2016-07-06 18:02:25 +08:00
minggo c81268d182 Merge pull request #16051 from pandamicro/v3.12 
[ci skip]Fix last issue in html5 engine
 2016-07-06 17:25:42 +08:00
pandamicro 384279fc26 Fix last issue in html5 engine 2016-07-06 17:24:43 +08:00
minggo 8d6acd9ffe Merge pull request #16050 from pandamicro/v3.12 
[ci skip]Update JS versions
 2016-07-06 17:04:42 +08:00
pandamicro ccb30cefc7 Update JS versions 2016-07-06 17:02:53 +08:00
CocosRobot e0c40ad83b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-06 08:06:02 +00:00
minggo 6248480b3a Merge pull request #16047 from minggo/issue-14071 
[ci skip]convert aplpha channel correctly
 2016-07-06 15:59:50 +08:00
minggo d0db838b71 convert aplpha channel correctly 2016-07-06 15:49:05 +08:00
minggo 418907d972 Merge pull request #16044 from pandamicro/v3.12 
Improve web template and update web ref
 2016-07-06 14:47:23 +08:00
minggo 995cd6fcfd update release note 2016-07-06 14:41:13 +08:00
minggo 01fe35a24b update release note 2016-07-06 14:40:25 +08:00
minggo be24cc8137 update release note 2016-07-06 14:39:40 +08:00
minggo bff7a1cbcb update read me 2016-07-06 14:38:10 +08:00
minggo 214f250622 update release note 2016-07-06 14:36:37 +08:00
minggo 2b07f3785a update release note 2016-07-06 14:35:15 +08:00
minggo 5ecb23a26e update release date 2016-07-06 14:03:15 +08:00
minggo cbc6147e53 Merge pull request #16042 from CocosRobot/update_lua_bindings_1467771170 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-06 13:55:45 +08:00
pandamicro 305bd95dc2 More secure release in JSB_closeWindow 2016-07-06 13:55:18 +08:00
pandamicro 96155a670f Improve web template and update web ref 2016-07-06 13:54:55 +08:00
CocosRobot cf2646b7a2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-06 02:16:03 +00:00
minggo 0b222da93e Merge pull request #16041 from mogemimi/fix-various-typos 
Fix various typos
 2016-07-06 10:09:05 +08:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
minggo 0796f8189d Merge pull request #16036 from minggo/fileuitl-getcontents 
fix some bugs in FileUtils
 2016-07-05 15:37:14 +08:00
minggo 2f1e14dcde fix compiling error 2016-07-05 14:28:30 +08:00
minggo 4c2efb1319 don't read file content if it is empty 2016-07-05 14:27:28 +08:00
minggo 33d1eb4455 don't invoke front() if container is empty 2016-07-05 14:27:11 +08:00
minggo e4aa6d1ef7 Merge pull request #16035 from minggo/issue-16032 
remove extra '\'
 2016-07-05 14:22:19 +08:00
minggo 0cc8b9fc09 Merge pull request #16031 from MrCapone/fix_GLView 
GLView::setFrameSize fixed
 2016-07-05 09:54:59 +08:00
minggo 1c9ad5594c remove extra '\' 2016-07-05 09:50:38 +08:00
minggo f666d99192 Merge pull request #16021 from yalab/cocosstudio_with_texturepacker 
Fixed to use TexturePacker with cocosstudio.
 2016-07-05 09:35:59 +08:00
minggo f621afedc4 Merge pull request #16034 from mogemimi/avoid-double-promotion 
Add missing float suffix to avoid -Wdouble-promotion
 2016-07-05 09:33:10 +08:00
mogemimi 2650fd1afd Add missing float suffix to avoid -Wdouble-promotion 2016-07-04 23:12:45 +09:00
mr_capone-win7 0e64c2a071 GLView::setFrameSize fixed 2016-07-04 19:48:24 +07:00
minggo b9d6f0d8d6 Merge pull request #16027 from CocosRobot/update_lua_bindings_1467596228 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-04 11:00:49 +08:00
minggo ca8ff36f2e Merge pull request #16016 from LeeMyoungYeol/v3 
Update utils::getTimeInMilliseconds()
 2016-07-04 10:55:41 +08:00
CocosRobot 934b2413dc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-04 01:40:35 +00:00
minggo 8bbeb01be4 Merge pull request #16025 from mogemimi/fix-doc-typo 
Fix typos and other mistakes in docs
 2016-07-04 09:33:29 +08:00
minggo b380df97c6 Merge pull request #16022 from mogemimi/fix-format-string 
Fix format string warning when compiling with Android NDK
 2016-07-04 09:31:45 +08:00
minggo 97205f4a0a Merge pull request #16024 from CocosRobot/update_lua_bindings_1467522653 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-04 09:30:30 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi 57900112c5 Fix format string warning when compiling with Android NDK 2016-07-03 17:19:17 +09:00
CocosRobot f30a7cf546 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-03 05:14:11 +00:00
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