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

18685 Commits

Author SHA1 Message Date
Huabing.Xu 15cc63c2ba remove kmVec3 in ActionCamera 2014-04-14 15:26:05 +08:00
Huabing.Xu 3601fe9297 android can work 2014-04-14 14:30:17 +08:00
Huabing.Xu c3bf78494a remove CCFrustum.cpp, we will use new instead 2014-04-14 14:18:32 +08:00
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
 2014-04-14 14:08:19 +08:00
James Chen 71015184c3 Merge pull request #6271 from shujunqiao/autotest-close 
[ci skip], add close app in autotest.py
 2014-04-14 13:38:54 +08:00
shujunqiao 884974f5e4 [ci skip], add close app in autotest.py 2014-04-14 11:55:11 +08:00
minggo b073e65cf4 Merge pull request #6269 from natural-law/develop 
Solve the problem of setup.py on windows.
 2014-04-14 11:51:49 +08:00
zhangbin 7e807f3ea9 closed #4784, Solve the problem of setup.py on windows. 2014-04-14 11:48:48 +08:00
zhangbin 17fe267644 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-14 11:47:54 +08:00
James Chen 2ee06a3533 Update AUTHORS [ci skip] 2014-04-14 11:15:54 +08:00
James Chen 81171910b3 Merge pull request #6259 from iSevenDays/patch-7 
Fix incompatible pointer conversion
 2014-04-14 11:14:29 +08:00
minggo 09911b712b [ci skip] 2014-04-14 10:50:32 +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
zhangbin c2b7e9798a Merge branch 'develop' of https://github.com/natural-law/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-14 10:01:18 +08:00
James Chen 5000873778 Const love: std::function<void(Texture2D*)> -> const 
std::function<void(Texture2D*)>&
 2014-04-14 10:01:17 +08:00
minggo 1e4f43d75d Merge pull request #6256 from dumganhar/scheudlertest-leak 
Memory leak fix in SchedulerTest
 2014-04-14 09:55:04 +08:00
minggo c99f503a10 [ci skip] 2014-04-14 09:52:15 +08:00
minggo 6ab462ccf0 Merge pull request #6265 from sachingarg05/AndroidJavaActivityOrientation 
Fix Orientation Change Support for Android Java Activity
 2014-04-14 09:50:15 +08:00
Huabing.Xu 80f96398b3 1. changed comment message in CCNode.cpp 
2. changed Director projection to Matrix
 2014-04-14 09:30:51 +08:00
Sachin Garg 69223549f3 Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity. 2014-04-14 05:46:30 +05:30
Anton Sokolchenko d778a947f5 Fix incompatible pointer conversion 2014-04-12 18:29:50 +03:00
James Chen 043f86cd6b Memory leak fix in SchedulerTest 2014-04-12 12:59:28 +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 6feef5fa55 Merge pull request #6251 from dumganhar/develop 
Small fix in Lua test.
 2014-04-11 20:57:12 +08:00
James Chen 427ca4ecf0 Small fix in Lua test. 2014-04-11 05:45:18 -07:00
zhangbin 6483f0d3ec Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:33:00 +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
zhangbin e27545df61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:27:42 +08:00
James Chen b71e1c1570 Merge pull request #6250 from natural-law/develop 
fix the error effect of ` FontTest` in lua-tests.
 2014-04-11 20:26:30 +08:00
James Chen 350f61c4da Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0 
closed #4497: use /z7 to build without .pdb
 2014-04-11 20:20:47 +08:00
zhangbin 99766cdd03 fix the error show of ` FontTest` 2014-04-11 20:17:34 +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 8e9e72c88c Merge pull request #6248 from natural-law/develop 
Solve the incorrect effect of some transition test case in lua-tests.
 2014-04-11 20:07:04 +08:00
zhangbin d611cfb49f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:03:24 +08:00
zhangbin 0eee9bc288 Solve the incorrect effect of some transition test case in lua-tests. 2014-04-11 20:02:11 +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
Huabing.Xu 1aa909371d remove kmMat4 in Cpp-tests 2014-04-11 18:03:07 +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 867c60a971 remove kmMat4 in PhysicsSprite.cpp 2014-04-11 17:27:55 +08:00
Huabing.Xu 866c4ad735 remove kmMat4 in Armature 2014-04-11 17:25:28 +08:00
Huabing.Xu 7af4d558c6 remove kmMat4 in AffineTransform.cpp 2014-04-11 17:19:32 +08:00
James Chen bf2450ad54 Merge pull request #6242 from andyque/fix_zfighting 
fix a compile error
 2014-04-11 16:49:21 +08:00
andyque 280c2755b3 closed #4761. fix a compile error 2014-04-11 16:47:35 +08:00