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

11053 Commits

Author SHA1 Message Date
boyu0 5225bb2f7f fix the travis ci compile error 2013-07-30 14:16:23 +08:00
boyu0 c4a1bf8986 fix the travis ci compile error 2013-07-30 14:07:31 +08:00
boyu0 31da5ebeb7 fix some compile error and pass the linux compile 2013-07-30 13:45:50 +08:00
boyu0 afde1e57b2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
boyu0 6b12ac9a5a edit for linux 2013-07-30 10:25:20 +08:00
minggo 404476f8aa Merge pull request #3326 from minggo/releasing 
update CHANGELOG
 2013-07-29 18:30:15 -07:00
minggo 600d647851 update CHANGELOG 2013-07-30 09:28:39 +08:00
minggo f63cc6a53f Merge pull request #3322 from dumganhar/iss2440-non-ascii-path 
closed #2440: Files with Non-ascii path can't be found on Windows.
 2013-07-29 03:37:52 -07:00
James Chen 2566f74cd7 closed #2440: Files with Non-ascii path can't be found on Windows. 2013-07-29 18:27:26 +08:00
boyu0 4348e87e31 Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h 2013-07-29 17:56:36 +08:00
boyu0 894584e5a0 Add texture2D convert test and fix the convert bugs 2013-07-29 17:34:33 +08:00
James Chen 1c2b89e431 Merge pull request #3321 from dumganhar/develop 
[emscripten] Fixing compilation errors.
 2013-07-29 01:34:25 -07:00
James Chen a76f556fb2 [emscripten] Fixing compilation errors. 2013-07-29 16:33:34 +08:00
minggo 0b0c223d33 Merge pull request #3318 from dabingnn/Iss2437-RenderTextureStencilTest-Bug 
Iss2437 render texture stencil test bug
 2013-07-29 01:25:14 -07:00
James Chen 4c32303b2e Merge pull request #3317 from dumganhar/member-var-init 
Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.
 2013-07-29 00:29:08 -07:00
James Chen 387b7143e4 Merge pull request #3320 from natural-law/develop 
Remove the deprecated methods.
 2013-07-29 00:20:29 -07:00
zhangbin 679515f9df Remove the deprecated methods. 2013-07-29 15:17:54 +08:00
James Chen b75f8e5698 Merge pull request #3319 from dumganhar/android-ndk-r9-fix 
[Android] Fixing build errors for ndk-r9.
 2013-07-29 00:03:21 -07:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
Huabing.Xu 0dcf9e88c3 close #2437: replace stencil mechanism with a new approach by removing glColorMask call 2013-07-29 14:13:36 +08:00
Huabing.Xu 4ebfc1c6e4 issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil 2013-07-29 14:11:21 +08:00
James Chen b1a0393191 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into member-var-init 2013-07-29 14:11:13 +08:00
James Chen 1c298cf5a1 Updating JS-Test, fixing CrystalCraze crash on android and windows. 2013-07-29 14:10:42 +08:00
James Chen 343c98af13 Fixing warnings of the order of member variables and fixing errors for tizen projects. 2013-07-29 14:07:57 +08:00
boyu0 41cac18ae2 edit for lua 2013-07-29 14:04:51 +08:00
James Chen 84d2bbe2b3 [Tizen] Re-add missing files for CocosDenshion. 2013-07-29 14:02:07 +08:00
James Chen c0f028c942 Merge pull request #3316 from samuele3hu/TestDevelop 
Modify ActionTest sample of lua for adding draw functions
 2013-07-28 21:00:51 -07:00
James Chen 83e4352dac Merge pull request #3315 from natural-law/develop 
Update the JS binding code of plugin.
 2013-07-28 20:50:51 -07:00
samuele3hu cff6fd13b1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop 2013-07-29 11:47:42 +08:00
samuele3hu a6d2ab40f0 Modify ActionTest sample of lua to add draw functions 2013-07-29 11:44:56 +08:00
boyu0 304d636deb Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +08:00
zhangbin ce444a57f3 Update the JS binding code of plugin. 2013-07-29 11:27:47 +08:00
James Chen 9dc404498b Merge pull request #3314 from dumganhar/develop 
Updating JS-Test.
 2013-07-28 19:23:05 -07:00
James Chen f5d9bf9465 Updating JS-Test. 2013-07-29 10:17:31 +08:00
James Chen e6be975509 Merge pull request #3313 from dumganhar/develop 
[JSB] Mark cc.TMXTiledMap.propertiesForGID to deprecated method.
 2013-07-28 19:08:59 -07:00
James Chen b9e29cd07e [JSB] Mark cc.TMXTiledMap.propertiesForGID to deprecated method. 2013-07-29 10:06:39 +08:00
minggo 6b3200fd04 Merge pull request #3312 from minggo/develop 
fixed a link error of HelloLua Mac 32 bit
 2013-07-28 18:32:50 -07:00
minggo bc4845b856 fixed a link error of HelloLua Mac 32 bit 2013-07-29 09:30:42 +08:00
James Chen eb4ad17b80 Merge pull request #3311 from dumganhar/develop 
[Win32] Removing bindings-generator support, since the clang3.3 of windows can't work with c++11 well, I don't know why, so disable win32 support temporary.
 2013-07-28 17:35:28 -07:00
James Chen bb3ee262b8 Updating README.mdown for the reason of bindings-generator doesn't support windows. 2013-07-29 08:33:10 +08:00
James Chen d4dcf44380 [Win32] Removing bindings-generator support, since the clang3.3 of windows can't work with c++11 well, I don't know why, so disable win32 support temporary. 2013-07-29 08:27:59 +08:00
minggo d55c400c0e [ci skip] 2013-07-29 07:52:53 +08:00
minggo 9780b75da8 Merge pull request #3273 from thp/develop-qt5 
Port Cocos2D-X to Qt 5 (develop branch)
 2013-07-28 16:51:55 -07:00
minggo 118e339e62 [ci skip] 2013-07-29 07:49:37 +08:00
minggo 9ec3ba53ac Merge pull request #3308 from timothyqiu/project-creator-config-path-fix 
Project creator: use absolute path for json config files
 2013-07-28 16:48:12 -07:00
minggo 806bc5c48f Merge pull request #3310 from minggo/develop 
set _hasPremultipliedAlpha property correctly when it is a pvr texture
 2013-07-28 09:41:50 -07:00
minggo b8f8ae7437 set _hasPremultipliedAlpha property correctly when it is a pvr texture 2013-07-28 23:38:22 +08:00
minggo 3a4c4e479b Merge pull request #3309 from minggo/develop 
use correct type to initialize an array
 2013-07-28 08:37:16 -07:00
minggo 92f9ed743a use correct type to initialize an array 2013-07-28 23:23:35 +08:00
Timothy Qiu d9020ae80c Use absolute path for json config files. 2013-07-28 22:59:37 +08:00