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

3203 Commits

Author SHA1 Message Date
Ricardo Quesada 3978cee2ee compiles on windows 2014-04-14 20:00:06 -07:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
minggo de5f52857a Merge pull request #6273 from CocosRobot/update_lua_bindings_1397458473 
[AUTO]: updating luabinding automatically
 2014-04-14 14:56:35 +08:00
CocosRobot daccbdb2bf [AUTO]: updating luabinding automatically 2014-04-14 06:55:48 +00:00
minggo 26494c000b Merge pull request #6257 from dumganhar/group-command-manager-not-singleton 
GroupCommandManager should not be a singleton, it should be managed by Renderer.
 2014-04-14 14:52:39 +08:00
minggo bb15d0ecf9 Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option 
Add interface setCullingEnabled(), culling is disabled by default
 2014-04-14 14:50:11 +08:00
James Chen eb651a6ae4 Merge pull request #6272 from Dhilan007/develop 
LabelTTF:fixed display incorrect if create by FontDefinition.
 2014-04-14 14:09:50 +08:00
Dhilan007 aef2767d23 change variable name. 2014-04-14 13:42:37 +08:00
Dhilan007 6fe64b83f8 LabelTTF:fixed display incorrect if create by FontDefinition. 2014-04-14 11:33:46 +08:00
Huabing.Xu 9935e8ddfb setCullingEnabled set to public access 
changed renderer->culling test case
 2014-04-14 11:33:40 +08:00
minggo 4faa1c9651 Merge pull request #6243 from koowolf/wp8_audio 
closed #4762: fix some problems in cocosdension in wp8
 2014-04-14 10:47:45 +08:00
minggo 9f9a87f09d Merge pull request #6254 from dumganhar/clippingnode-leak 
Memory leak fix for ClippingNode
 2014-04-14 10:17:37 +08:00
minggo 4669e7fa39 Merge pull request #6255 from dumganhar/cocostudio-leak 
Memory leak fix in macro IMPLEMENT_CLASS_INFO
 2014-04-14 10:13:52 +08:00
James Chen 44a01be0f5 Merge pull request #6266 from dumganhar/develop 
Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&
 2014-04-14 10:04:44 +08:00
James Chen 5000873778 Const love: std::function<void(Texture2D*)> -> const 
std::function<void(Texture2D*)>&
 2014-04-14 10:01:17 +08:00
Huabing.Xu 37bfeff8f0 Add interface setCullingEnabled(), culling is disabled by default 2014-04-14 09:56:01 +08:00
Sachin Garg 69223549f3 Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity. 2014-04-14 05:46:30 +05:30
James Chen b276c42ae6 GroupCommandManager should not be a singleton, it should be managed by Renderer. 2014-04-12 13:01:42 +08:00
James Chen b715a87791 Memory leak fix in macro IMPLEMENT_CLASS_INFO 2014-04-12 12:58:00 +08:00
James Chen 922b399ef2 Memory leak fix for ClippingNode 2014-04-12 12:56:36 +08:00
James Chen 377b50e6fd Merge pull request #6249 from dumganhar/develop 
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' in ConsoleTest.
 2014-04-11 20:28:00 +08:00
James Chen 576d9d872c Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' 
in ConsoleTest.
 2014-04-11 20:07:54 +08:00
James Chen 6417c8f8e9 Merge pull request #6244 from dumganhar/develop 
Warning fixes in ui, getZOrder -> getLocalZOrder
 2014-04-11 18:14:54 +08:00
James Chen 7c5b4be0b1 Warning fixes in ui, getZOrder -> getLocalZOrder 2014-04-11 18:06:53 +08:00
koowolf 5b3d5badfa closed #4763: 1.fix stopalleffect lead to stop background music 2.fix play effect may lead to memory leak 2014-04-11 17:53:00 +08:00
James Chen b40773f6d0 Merge pull request #6240 from dabingnn/develop_add_rendererAssert 
Trigger an assert if a command is added while render is rendering.
 2014-04-11 17:37:02 +08:00
Huabing.Xu a8378a2b99 adjust comment 2014-04-11 17:31:35 +08:00
Huabing.Xu 7c027b16b0 change assert message 2014-04-11 16:07:55 +08:00
Huabing.Xu 51289e8a4c 1. add assert condition of rendering when adding command 
2. fix bug: renderTexture->SpriteRenderTextureBug
 2014-04-11 16:05:22 +08:00
James Chen c44e2f9bc8 Merge pull request #6211 from chuanweizhang2013/luaruntime 
update lua template runtime
 2014-04-11 15:08:15 +08:00
samuele3hu 2f1f09d5bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-11 14:35:07 +08:00
samuele3hu 5b2cf595a2 fix the crash invoked by calling the `glGetUniformfv` 2014-04-11 14:31:44 +08:00
James Chen 588d825691 Merge pull request #6236 from dumganhar/develop 
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
 2014-04-11 13:53:54 +08:00
James Chen 85cc100ac4 Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop 2014-04-11 13:51:40 +08:00
James Chen 48a5fd555b Compilation error fix in CCQuadCommand.cpp 2014-04-11 10:50:38 +08:00
James Chen dbeefcdff2 Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230 2014-04-11 10:48:29 +08:00
chuanweizhang2013 41933a6fd0 Merge pull request #23 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:55:51 +08:00
samuele3hu f136108037 fix compile error 2014-04-11 09:52:09 +08:00
chuanweizhang2013 337bc2f2e8 Merge pull request #22 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:33:04 +08:00
samuele3hu 70dec15e76 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-10 23:38:57 +08:00
samuele3hu c687b97c6e fix the crash invoked by deprecated `create` function of `Label` 2014-04-10 23:36:25 +08:00
minggo 951bf1cbfa remove unneeded codes 2014-04-10 22:56:40 +08:00
James Chen 8e2bd0d2ee Merge pull request #6229 from dumganhar/develop 
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
 2014-04-10 21:16:19 +08:00
James Chen 6b21e598c5 [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
James Chen cfc2a05194 Merge pull request #6228 from dumganhar/develop 
Initializes member variables for QualCommand class.
 2014-04-10 21:01:22 +08:00
James Chen 1fdcaaa2c6 Initialzies member variables for QualCommand class. 2014-04-10 20:31:44 +08:00
James Chen f99b9bbabe Merge pull request #6225 from heliclei/fix-console-linux-crash2 
fix CCConsole linux crash
 2014-04-10 19:57:50 +08:00
James Chen 7b4bec1395 Merge pull request #6226 from dumganhar/develop 
Initializes member variables for TransitionScene class
 2014-04-10 19:33:17 +08:00
James Chen e7a4ac531a Initializes member variables for TransitionScene class 2014-04-10 19:29:07 +08:00
heliclei 157fce785c fix CCConsole linux crash 2014-04-10 18:31:28 +08:00