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

3744 Commits

Author SHA1 Message Date
dumganhar 437f27ff47 Merge pull request #713 from dumganhar/iss951_rm_NSMutableSet 
fixed #951: removed definition of NSMutableSet.
 2012-02-06 23:37:29 -08:00
dumganhar ca94a11190 fixed #951: removed definition of NSMutableSet. 2012-02-07 15:35:10 +08:00
YuLei Liao 2b1f83a61b add addLuaLoader(loader_Android) 2012-02-07 15:16:15 +08:00
minggo 29c18c67ca Merge pull request #712 from minggo/ndk_module 
Use modules in the Android NDK build
 2012-02-06 22:36:45 -08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
dumganhar d83e18b7ba Merge pull request #711 from dumganhar/iss967_pvr_tex_reload 
fixed #967: PVR Textures cannot be reloaded after GL context lost on android.
 2012-02-06 22:22:07 -08:00
YuLei Liao 5497d25e0f remove unused wophone files 2012-02-07 13:36:43 +08:00
YuLei Liao 22cddb5240 * update hello.lua 2012-02-07 13:17:23 +08:00
YuLei Liao 7a96d13fb6 rename all FuncID to Handler 2012-02-07 11:43:29 +08:00
dumganhar 1e807d00c3 fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android. 2012-02-07 11:18:39 +08:00
dumganhar ee2139023a Merge pull request #708 from Wartortle/master 
fixed #969: Addition of Accelerometer Simulation for Win32.
 2012-02-06 18:57:41 -08:00
minggo 8770976884 Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module 2012-02-07 10:48:07 +08:00
minggo 3874450200 Merge pull request #710 from minggo/iss954_accerometer 
correct accelerometer data when set orientation to portrait in tablet
 2012-02-06 18:23:15 -08:00
minggo a7c96b5371 fixed #954: correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +08:00
Wartortle aa06de2fb3 Second half of commit for adding Accelerometer simulation to Win32. 2012-02-06 11:38:53 +00:00
Wartortle ffc4457991 On Win32 platform, there's now support for simulating the Accelerometer 
using the up/down/left/right/comma/period keys.
 2012-02-06 11:29:28 +00:00
minggo babbd64f0d Merge pull request #691 from winbinar/master 
fixed #626: Fix bug #626
 2012-02-05 23:00:31 -08:00
YuLei Liao 4fe0c10e10 merge upstream/master 2012-02-06 10:54:51 +08:00
dumganhar b32b4eebd6 Merge pull request #707 from moadib/qnx_fileutils 
fixed #968: Fixed a bug about "Out of bound" in CCFileUtils::getWriteablePath() for BlackBerry
 2012-02-05 06:13:42 -08:00
moadib f5b8aa79c5 Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry 2012-02-05 16:49:47 +04:00
YuLei Liao 19dc9e65e6 Merge commit '69a7e2a2e3c65ae0636b1edc20f87cc455abc28e' into luafix-master 2012-02-04 11:47:02 +08:00
YuLei Liao d906d1b86c Merge commit 'e31a1d0fa85118eca488a0fdee3c22fd2c3fb5c0' into luafix-master 2012-02-04 11:46:41 +08:00
YuLei Liao 69a7e2a2e3 * change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int. 2012-02-04 11:34:17 +08:00
YuLei Liao e31a1d0fa8 * add CC_LUA_ENGINE_README.mdown 2012-02-03 20:05:56 +08:00
YuLei Liao c5fa5d75f8 * merge upstream/master to master 2012-02-03 15:16:33 +08:00
dumganhar 6fbf2f1d09 move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
folecr 3eeb0c8687 fix library name - the makefiles expect the full name of the library including the lib prefix 2012-02-02 23:01:50 -08:00
YuLei Liao bc8051f607 * CCLuaEngine::executeTouchesEvent() convert touch positions to OpenGL coordinate 2012-02-03 14:32:57 +08:00
folecr cab83bb4a6 Fix header file location to match convention in include directives in the cocos source 2012-02-02 20:07:37 -08:00
folecr 516c56a793 Add EXPORT_C_INCLUDES and correct the paths to third party modules 2012-02-02 20:04:29 -08:00
YuLei Liao 7ef0373c8b * update lua application template files 2012-02-02 22:15:56 +08:00
YuLei Liao 4dbc5997f0 * update tolua++ packages 2012-02-02 22:15:34 +08:00
YuLei Liao 8b36c6901c * update xcode4 lua template 2012-02-02 19:56:17 +08:00
YuLei Liao 1a5d4e00eb * update xcode4 template generator 2012-02-02 19:56:05 +08:00
YuLei Liao c4a7ec6d9a * update xcode4 template generator 2012-02-02 19:14:01 +08:00
YuLei Liao 7ace6f6986 * remove unused include 2012-02-02 19:13:50 +08:00
YuLei Liao 1983949b68 * update project templates AppDelegate 2012-02-02 19:01:30 +08:00
YuLei Liao 92f99f7526 * change CC_LUA_ENGINE_ENABLED default value to 0 2012-02-02 19:01:12 +08:00
YuLei Liao bfe8e752cf * add CCLuaEngine::executeString() 2012-02-02 19:00:43 +08:00
dumganhar 7a5734977c Merge pull request #704 from dumganhar/iss965_remove_some_dynamic 
fixed #965: Remove some dynamic_cast callings since selector_protocol.h was removed
 2012-02-02 01:53:05 -08:00
dumganhar f6d6d0dd49 fixed #965: Remove some dynamic_cast callings since selector_protocol.h was removed 2012-02-02 17:46:45 +08:00
YuLei Liao 6539183499 * fix some issues 2012-02-02 16:35:19 +08:00
YuLei Liao 9c7826e716 Merge remote-tracking branch 'refs/remotes/upstream/master' into luafix-master 2012-02-02 15:58:22 +08:00
YuLei Liao 9164e90515 * fix some issues 2012-02-02 15:58:10 +08:00
minggo cf2807b870 Merge pull request #703 from minggo/iss933_userdefault 
refactor userdefault
 2012-02-01 22:35:23 -08:00
YuLei Liao 712541d0ef * update tolua++ packages 2012-02-02 14:26:38 +08:00
minggo 2b91b1c7cf fixed #933: free doc 2012-02-02 14:24:51 +08:00
minggo 591b7d0619 fixed #933: profile CCUserDefault 2012-02-02 14:18:13 +08:00
YuLei Liao 1dd0330351 * add CCMenuItem script support 2012-02-02 10:39:36 +08:00
YuLei Liao 003fa1f1a0 * add some methods for fast read/write position 
* add CCNode::getChildrenCount() for Lua
 2012-02-02 10:39:19 +08:00