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

20315 Commits

Author SHA1 Message Date
minggo 0ad0f9c405 issue #4819: remove AccelerometerTest 2014-05-28 18:10:37 +08:00
minggo 120aa0f24e Merge pull request #6921 from minggo/code-fix 
coding style fix
 2014-05-28 17:55:32 +08:00
minggo 2e7865a4f6 coding style fix 2014-05-28 17:41:34 +08:00
Huabing.Xu 99d1ccf41e remove foreground event listener when GLProgramState is deleted 2014-05-28 16:51:33 +08:00
Huabing.Xu 2084fc4ddc using lambda function instead of member function 2014-05-28 15:50:37 +08:00
minggo d4d2bbfdfd [ci skip] 2014-05-28 15:26:29 +08:00
minggo 8f274e5a99 Merge pull request #6918 from minggo/fix-object-leak 
Fix NSNotificationCenter and NSTimer leaks
 2014-05-28 15:23:37 +08:00
minggo 2e70380dd9 invalidate NSTimer instance in destroy to prevent memory leak 2014-05-28 15:19:07 +08:00
minggo 013b3a328f remove keyboard notifications from NSNotificationCenter 2014-05-28 15:17:26 +08:00
Huabing.Xu 30f4f256d8 fix background/forground of Sprite3D on android platform 2014-05-28 15:16:00 +08:00
minggo c88ecb0a43 Merge pull request #6917 from CocosRobot/update_cocosfiles_1401256188 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-28 14:37:30 +08:00
CocosRobot 73f3361b0e [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-28 05:49:49 +00:00
minggo 3d3fb6ad7e Merge pull request #6914 from andyque/refactorLayoutExecutant 
refactor:  rename UILayoutExecutant to UILayoutManager
 2014-05-28 13:47:54 +08:00
John_He 2aa4b9936c Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-bit platform. 2014-05-28 12:37:35 +08:00
minggo a5fe9be8a2 Merge pull request #6915 from samuele3hu/v3_fix 
Update lua-template and lua-empty-test for replacing bgMusicPath
 2014-05-28 10:37:33 +08:00
samuele3hu 36ef9d7dd7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-28 10:28:38 +08:00
samuele3hu 90cac02de6 Update lua-template and lua-empty-test for replacing bgMusicPath 2014-05-28 10:27:03 +08:00
andyque 769300d25e rename UILayout 
Executant.h to UILayoutManager.h
 2014-05-28 10:17:34 +08:00
andyque c5a118ee1b refactor UILayoutExecutant to LayoutManager 2014-05-28 10:11:49 +08:00
minggo 592831b8fb Merge pull request #6913 from samuele3hu/v3_fix 
Update lua-template and lua-empty-test for replacing bgMusicPath
 2014-05-28 10:10:13 +08:00
samuele3hu c52132179a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-28 10:05:41 +08:00
samuele3hu 04d2d4a22e Update lua-template and lua-empty-test for replacing bgMusicPath 2014-05-28 10:04:29 +08:00
minggo 25c045eed8 Merge pull request #6912 from John-He-928/mingw-build 
fix mingw32/mingw64 compiling
 2014-05-28 10:00:59 +08:00
James Chen 984d33c055 Update README.md in tools/tolua 2014-05-28 09:43:48 +08:00
John_He 8233b5bf93 fix mingw32/mingw64 compiling 2014-05-28 00:17:09 +08:00
minggo c44a5a2b3e Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork 
V3 refactor effect3 d frame work
 2014-05-27 20:53:40 +08:00
minggo c5dd99edd1 Merge pull request #6911 from cocoscodeide/v3 
fixed win no log
 2014-05-27 18:43:10 +08:00
cocoscodeide 7c197ab69b Merge pull request #30 from chuanweizhang2013/v3luaruntime 
fixed win no log
 2014-05-27 18:26:43 +08:00
cw f2b243dff5 fixed win no log 2014-05-27 18:21:54 +08:00
minggo e4f19e41d2 [ci skip] 2014-05-27 16:51:23 +08:00
minggo 3e521624f3 [ci skip] 2014-05-27 16:24:11 +08:00
minggo 99290b83c7 Merge pull request #6871 from asuuma/v3_Repeat_fix 
Fix Repeat will run one more over in rare situations
 2014-05-27 16:22:42 +08:00
Huabing.Xu e59813476a clclosed #5369: Fix wrong logic when setTarget to Effect3D 2014-05-27 15:08:38 +08:00
minggo 0b661d8192 Merge pull request #6907 from visiblelight/screenshot_refactor 
adding comments for the new utility
 2014-05-27 14:52:09 +08:00
minggo f3de239647 Merge pull request #6616 from xhcnb/fix_callback 
Fix crash: use cocostudio gui editor, create a action in editor, when yo...
 2014-05-27 14:51:36 +08:00
vision d392fad70f udpate the comments 2014-05-27 14:51:13 +08:00
Huabing.Xu 453ff81d2a closed #5369: refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite 2014-05-27 14:50:46 +08:00
vision 5764677bba update the comments 2014-05-27 14:40:55 +08:00
minggo ba7c2cc133 Merge pull request #6906 from CocosRobot/update_lua_bindings_1401172218 
[AUTO]: updating luabinding automatically
 2014-05-27 14:40:43 +08:00
Ishiguro Yusuke b8f9b1f20b Add test case for reproducing Repeat bug 2014-05-27 15:40:38 +09:00
CocosRobot e1ab346e70 [AUTO]: updating luabinding automatically 2014-05-27 06:31:18 +00:00
vision e81db73b0a adding comments for the new utility. 2014-05-27 14:29:52 +08:00
minggo 9d90f53018 Merge pull request #6905 from samuele3hu/v3_fix 
Update submodule
 2014-05-27 14:27:47 +08:00
samuele3hu b6cc477832 Update submodule 2014-05-27 14:25:18 +08:00
minggo 63680946ee Merge pull request #6841 from shujunqiao/reboot 
[ci skip], add reboot.py in jenkins-scripts.
 2014-05-27 14:08:25 +08:00
minggo c476e784fa Merge pull request #6816 from shujunqiao/request-build-modify 
[ci skip], modify request proxies in post-build.py and so on.
 2014-05-27 14:04:37 +08:00
minggo 034e2c6f75 Merge pull request #6809 from heliclei/autotest-stop 
Support autotest stop command
 2014-05-27 14:01:38 +08:00
minggo 9d2c765fc0 Merge pull request #6862 from favorcode/v3 
Update UILoadingBar.h doxygen comments
 2014-05-27 13:54:52 +08:00
minggo f44b9ed6c8 Merge pull request #6899 from samuele3hu/v3_fix 
Update submodule
 2014-05-27 13:51:02 +08:00
minggo 23da27453d Merge pull request #6904 from andyque/refactorUIFramework 
refactor Layout and Widget
 2014-05-27 13:49:53 +08:00