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

6761 Commits

Author SHA1 Message Date
dualface 09b1d9f520 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua 2012-12-26 18:37:51 +08:00
dualface 57bccc7e4a remove CC_LUA_ENGINE_ENABLED macro 2012-12-26 18:33:55 +08:00
James Chen 989832480b Merge pull request #1783 from fape/marm_accelero 
marmalade acceleromater improvement
 2012-12-25 21:51:58 -08:00
minggo c5e62206e0 Merge pull request #1791 from minggo/gles20 
issue #1603:delete space when setting language
 2012-12-25 18:44:08 -08:00
minggo d94e4c30b8 issue #1603:delete space when setting language 2012-12-26 10:42:35 +08:00
minggo 8b522c326c Merge pull request #1790 from minggo/gles20 
issue #1603:modify android resource path
 2012-12-24 22:21:31 -08:00
minggo e7ca426b3d issue #1603:modify android resource path 2012-12-25 14:20:35 +08:00
minggo c47553ece9 Merge pull request #1789 from minggo/gles20 
issue #1603:modify windows auto-build script
 2012-12-24 21:02:35 -08:00
minggo 79530616ea issue #1603:modify windows auto-build script 2012-12-25 12:57:24 +08:00
James Chen fe00f1645e Merge pull request #1788 from dumganhar/gles20 
Added COCOS2D_DEBUG=1 for libJSBinding.vcxproj of debug mode.
 2012-12-24 19:34:55 -08:00
James Chen a6ded65f59 Added COCOS2D_DEBUG=1 for libJSBinding.vcxproj of debug mode. 2012-12-25 11:33:36 +08:00
minggo fb0a9d9058 Merge pull request #1787 from minggo/gles20 
issue #1603:modify auto-building script
 2012-12-24 19:12:40 -08:00
minggo c3e44f0e26 issue #1603:modify auto-building script 2012-12-25 11:11:44 +08:00
James Chen b5bcd27650 Merge pull request #1786 from dumganhar/iss1602-jsb-sys 
issue #1620: Made sys.localStorage support for jsb, works ok on win32 and android. Need to use sqlite3 to implement it, now we are using CCUserDefault.
 2012-12-24 18:27:45 -08:00
James Chen bdb4df293b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1602-jsb-sys 2012-12-25 10:01:48 +08:00
James Chen d611970027 Merge pull request #1785 from CocosRobot/updategeneratedsubmodule_1356400482 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-12-24 17:55:51 -08:00
CocosRobot 3de95c9362 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-25 09:54:52 +08:00
James Chen 3789999dd5 Merge pull request #1784 from dumganhar/gles20 
Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition.
 2012-12-24 17:53:37 -08:00
James Chen e301b9af1e Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition. 2012-12-25 09:52:30 +08:00
fape 3550550568 marmalade acceleromater improvement 2012-12-24 17:24:10 +01:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
minggo ecc515c63f Merge pull request #1782 from minggo/iss1623-simple_audio_engine 
fixed #1623:use file descriptor instead of file path to create media pla...
 2012-12-24 01:23:41 -08:00
minggo df73cd12a6 fixed #1623:use file descriptor instead of file path to create media player 2012-12-24 17:20:44 +08:00
minggo 0f669114fc Merge pull request #1775 from mingulov/music 
CocosDenshion Android - missing sound effects with some conditions
 2012-12-23 22:45:47 -08:00
minggo 7ca4934850 Merge pull request #1781 from minggo/iss1603-adjust-directory 
issue #1603:modify some auto-building script
 2012-12-23 22:27:59 -08:00
minggo fab196dcbe issue #1603:modify some auto-building script 2012-12-24 14:26:57 +08:00
James Chen 1f79603d26 Merge pull request #1780 from dumganhar/gles20 
fixed #1622: Crash occurs when cc.Node.getChildren is invoked if there are no children.
 2012-12-23 19:56:25 -08:00
James Chen cc7d383737 fixed #1622: Crash occurs when cc.Node.getChildren is invoked if there are no children. 2012-12-24 11:55:04 +08:00
James Chen 22a2b34637 issue #1620: Made sys.localStorage support for jsb, works ok on android. 2012-12-24 11:46:27 +08:00
James Chen 388159c8ba Merge pull request #1779 from dumganhar/iss1621_linux64_eclipse 
fixed #1621: Adding linux 64bit target for eclipse project and fix compilation errors.
 2012-12-23 19:20:06 -08:00
James Chen eb417274fb fixed #1621: fix compilation error of eclipe project. 2012-12-24 11:15:56 +08:00
James Chen f323b77548 Merge branch 'lnximprove' of https://github.com/ivzave/cocos2d-x into linux 2012-12-24 09:52:55 +08:00
minggo 478b8a4f84 Merge pull request #1778 from mingulov/clang31_compile 
Compilation fix for Android clang 3.1 toolchain
 2012-12-22 05:03:38 -08:00
Denis Mingulov 6d895e634c Compilation fix for Android clang 3.1 2012-12-22 07:58:30 +02:00
ivzave fcce930188 repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
dualface cc69e39c8a [luabinding] make CCAssert compatible Lua 2012-12-22 10:13:37 +08:00
ivzave 0538b22300 repair linux cli build 2012-12-22 04:14:15 +04:00
Denis Mingulov ca00d50259 CocosDenshion Android - missing sound effects with some conditions 
Android SoundPool.load returns 0 if sound might not be loaded - for
example, it does not exist. Previously - 0 has been ignored and
incorrectly written to HashMap, so it was not possible to
understand on the application side that something goes wrong
(and use some additional workaround).

Use case:
1) On the game loading - preload all possible sound effects
   (to speed up their playing later, when it will be needed)
2) Game APK does not have any sound file, they are downloaded
   later in a separate thread.
3) Application tries to play sound effects as usual, when needed.

So due to this bug - as there was no any sound file exist
during the game loading - internal HashMap contains incorrect
0 as id for every effect, and there is no any sound effect during
the first application start.
 2012-12-21 23:15:29 +02:00
minggo 4615a4a1ff Merge pull request #1774 from minggo/iss1603-adjust-directory 
issue #1603:modify some path for auto building
 2012-12-21 02:07:49 -08:00
James Chen f26ce4fb84 Made sys.localStorage support for jsb, works ok on win32. 2012-12-21 18:07:45 +08:00
minggo 380cadebce issue #1603:modify some path for auto building 2012-12-21 18:06:36 +08:00
minggo a22563b787 Merge pull request #1773 from minggo/iss1603-adjust-directory 
issue #1603:modify path of cocos2d-x
 2012-12-21 01:42:17 -08:00
minggo b0e752eac3 issue #1603:modify path of cocos2d-x 2012-12-21 17:40:54 +08:00
minggo d726b35eb8 Merge pull request #1772 from minggo/iss1603-adjust-directory 
issue #1603:change pathes of android codes
 2012-12-21 01:29:32 -08:00
minggo 89fb58e791 issue #1603:change pathes of android codes 2012-12-21 17:28:14 +08:00
minggo b457d19523 Merge pull request #1771 from minggo/iss1603-adjust-directory 
issue #1603: modify some pathes
 2012-12-20 23:06:28 -08:00
minggo 9beac15305 issue #1603: modify some pathes 2012-12-21 15:05:22 +08:00
walzer 71e6889666 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-12-21 14:46:48 +08:00
minggo 686111ed20 Merge pull request #1770 from minggo/iss1603-adjust-directory 
issue #1536:add permissions and modify module path error
 2012-12-20 22:42:00 -08:00
minggo f71f13fc53 issue #1536:add permissions and modify module path error 2012-12-21 14:40:34 +08:00