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

13529 Commits

Author SHA1 Message Date
James Chen fe88f7c941 Fixing memory leak of JSStringWrapper::set . 2013-11-11 14:36:43 +08:00
James Chen 9d5813b7d9 Some fixes: 
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
 2013-11-11 14:36:42 +08:00
Huabing.Xu 55b9462b17 issue #3025: directly use _textureCache in Director 2013-11-11 14:21:41 +08:00
boyu0 9b99872067 issue #2770: fix some warning 2013-11-11 14:11:06 +08:00
minggo e193311e55 Merge pull request #4161 from boyu0/iss2770_fix_warnings 
[ci skip]issue #2770: fix warning
 2013-11-10 22:10:10 -08:00
James Chen 058cd9d896 Update AUTHORS [ci skip] 2013-11-11 13:51:44 +08:00
yinkaile ed69a31b45 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-11 13:44:04 +08:00
2youyou2 0a72c3c1c2 1.when add a skin to last index, applay it's skindata to the previous skindata 
2.Do not retain target when regist frame event and movement event
 2013-11-11 13:33:47 +08:00
James Chen 707a6c246f Merge pull request #4157 from dumganhar/iss3137-fix-acc 
closed #3137: Device::setAccelerometerEnabled needs to be invoked before adding ACC listener
 2013-11-10 21:03:24 -08:00
boyu0 6c1144ee79 issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
minggo e981dbf7e4 Merge pull request #4158 from dumganhar/remove-jsb-version 
[ci skip]Removing JSB Version since JSB source codes will be updated with cocos2d-x.
 2013-11-10 20:45:22 -08:00
minggo def560c811 Merge pull request #4159 from mlepage/develop 
[ci skip]Fix typos and other trivial cleanup
 2013-11-10 20:06:56 -08:00
Huabing.Xu 02da3a29cc issue #3025: deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead 2013-11-11 11:38:02 +08:00
Marc Lepage 27b82f8f67 Fix typos and other trivial cleanup 2013-11-10 22:00:50 -05:00
James Chen 0c4b6e7a37 Removing JSB Version since JSB source codes will be updated with cocos2d-x. 
Also, remove some unused codes.
 2013-11-11 10:40:51 +08:00
James Chen a6c85a3906 issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
James Chen 0eb9caa3d6 Merge commit 'refs/pull/4123/head' of git://github.com/cocos2d/cocos2d-x into fix-acc 2013-11-11 10:08:28 +08:00
minggo 9a3d2e941e Merge pull request #3969 from dualface/develop 
[ci skip]fix tolua_fix, cleanup peertable after object deleted
 2013-11-10 17:44:24 -08:00
bopohaa ef92efcd79 Update CCImageCommon_cpp.h 
webp don't work for me
 2013-11-11 02:28:27 +03:00
James Chen 1f742b6675 Update AUTHORS [ci skip] 2013-11-10 20:56:40 +08:00
James Chen f6aa50f6b2 Merge pull request #4155 from luisparravicini/issue-3136 
typos in create_project.py
 2013-11-10 04:52:42 -08:00
Luis Parravicini 90df6fc763 fixed typos 2013-11-10 08:25:01 -03:00
James Chen deeaa4d1bc Merge pull request #4148 from dumganhar/touch-onebyone-available 
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
 2013-11-10 00:39:30 -08:00
James Chen f2afa30a9a Merge pull request #4153 from CocosRobot/updategeneratedsubmodule_1384054141 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-09 21:56:53 -08:00
dualface c75c20de04 fix Lua 5.2 compatibility 2013-11-10 11:49:52 +08:00
CocosRobot 6e6c63e111 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-10 03:29:03 +00:00
James Chen 9ed0bd0689 Merge pull request #4152 from samuele3hu/developCheck 
Add conversion functions to support bindings-generator
 2013-11-09 19:24:03 -08:00
samuele3 fa1a5c3735 Add conversion config for long type 2013-11-10 11:03:27 +08:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
dualface 2a2fc81f86 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-10 00:00:19 +08:00
samuele3 e26fe04deb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-09 23:04:11 +08:00
samuele3 286393d28e issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
Lee, Jae-Hong e132142689 [Win32] Update libGUI project 
- Update files list.
 2013-11-09 23:57:18 +09:00
Lee, Jae-Hong 3d23ca328e [Win32] fix compile error. 
- fix C2552 error in VS2012.
 2013-11-09 23:56:24 +09:00
Lee, Jae-Hong 5e36021d54 [Win32] fix argument type. 
- argument of interface is a long type.
 2013-11-09 23:44:15 +09:00
psi c4e70387f7 Close display 2013-11-09 23:02:45 +09:00
James Chen 4fba832fb1 Return non-zero if ndk build fails. 2013-11-09 21:05:17 +08:00
James Chen f3a5245bfa Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable. 2013-11-09 18:11:57 +08:00
Ricardo Quesada 9f16bfadd1 updated TOC 2013-11-08 20:59:27 -08:00
Ricardo Quesada 94ad801f3d Update CODING_STYLE.md 2013-11-08 20:53:34 -08:00
Ricardo Quesada 173b5f6349 fixes markdown 2013-11-08 19:13:50 -08:00
Ricardo Quesada 5c2b22955e Merge pull request #4146 from ricardoquesada/coding_style_274 
Coding style 274
 2013-11-08 19:11:05 -08:00
Ricardo Quesada 614c6469ff Adds TOC 2013-11-08 19:10:38 -08:00
Ricardo Quesada f7bae6e6cb coding style migrated to version 3.274 2013-11-08 19:09:21 -08:00
Ricardo Quesada 79b80ef9df Merge pull request #4145 from ricardoquesada/removed_more_exe_bit 
removes exe bit from text files
 2013-11-08 11:31:52 -08:00
Ricardo Quesada 5faae4a51e removes exe bit from text files 2013-11-08 11:30:50 -08:00
Ricardo Quesada 9fc8dc0104 Merge pull request #4144 from ricardoquesada/non_exe_bit 
removes exe bit from resource files
 2013-11-08 10:44:58 -08:00
Ricardo Quesada 987b866589 removes exe bit from resource files 2013-11-08 10:43:54 -08:00
CaiWenzhi a0f794b7df optimize layout 2013-11-08 23:26:44 +08:00
lite3 a3797e2ebc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-08 21:00:31 +08:00