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

11020 Commits

Author SHA1 Message Date
boyu0 894584e5a0 Add texture2D convert test and fix the convert bugs 2013-07-29 17:34:33 +08:00
boyu0 41cac18ae2 edit for lua 2013-07-29 14:04:51 +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
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
minggo 3c2c125b75 Merge pull request #3307 from minggo/develop 
fixed warnings on Android and windows
 2013-07-28 06:45:15 -07:00
minggo f7fd7a8af5 fixed warnings on Android and windows 2013-07-28 21:43:20 +08:00
James Chen b2b93bef0a Merge pull request #3305 from samuele3hu/DrawNode 
Modify deprecated CCPhysicsDebugNode typedef and some test bug
 2013-07-27 23:53:36 -07:00
samuele3hu cc95fcaa69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 14:35:38 +08:00
samuele3hu 3aeefb51b3 Modify deprecated CCPhysicsDebugNode typedef and some test bug 2013-07-28 14:33:02 +08:00
minggo 25268bf604 Merge pull request #3304 from minggo/develop 
fix a logical error
 2013-07-27 19:23:00 -07:00
minggo e97b2504ea fix a logical error 2013-07-28 10:22:12 +08:00
minggo 7159f3f97a Merge pull request #3303 from minggo/develop 
set _isDownloading to false before return
 2013-07-27 18:56:17 -07:00
minggo 4f6e1fb944 set _isDownloading to false before return 2013-07-28 09:53:59 +08:00
minggo ca037cccee Merge pull request #3301 from samuele3hu/DrawNode 
Add more deprecated function and modify template vs2012 soutions
 2013-07-27 09:52:08 -07:00
James Chen 16b236431a Merge pull request #3302 from dumganhar/iss2430-ccb-constants 
issue #2430: CCBValue::Type is strong enum type now.
 2013-07-27 09:36:07 -07:00
James Chen d67ab3e4cc Untabify for CCBValue.cpp. 2013-07-28 00:31:09 +08:00
James Chen 075b83ad87 Merge branch 'iss2430-ccb-constants' of https://github.com/dumganhar/cocos2d-x into iss2430-ccb-constants 2013-07-28 00:28:56 +08:00
samuele3hu 873a35a557 Merge branch 'DrawNode' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 00:27:26 +08:00
James Chen ab84dacf8f issue #2430: CCBValue::Type is strong enum type now. 2013-07-28 00:26:24 +08:00
samuele3hu 3c953a934e issue #2404:Add more deprecated function and Modify template vs11 solution 2013-07-28 00:16:16 +08:00
minggo c9fd95f583 Merge pull request #3300 from dumganhar/iss2430-ccb-constants 
issue #2430: Moving enum type to class for CCBReader.
 2013-07-27 09:07:53 -07:00
James Chen b7afc9db43 issue #2430: [Win32] Undefine the macro RELATIVE since it was conflicted with CCBReader::SizeType::RELATIVE and CCBReader::ScaleType::RELATIVE. 2013-07-27 23:20:00 +08:00
James Chen 584402984b Adding deprecated constants for CCBReader. 2013-07-27 23:04:14 +08:00
James Chen 6176076bce Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-ccb-constants 2013-07-27 22:36:14 +08:00
James Chen 44b612b56d Reverting LuaCocos2d.cpp. 2013-07-27 22:34:21 +08:00
James Chen fa5c26c5e2 member variables renaming according cocos2d-x style. 2013-07-27 22:31:57 +08:00
minggo d9cc0f4dfc Merge pull request #3299 from samuele3hu/DrawNode 
issue #2404:Add more deprecated function and modify some test sample
 2013-07-27 07:20:10 -07:00
boyu0 cecfc13bc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
samuele3hu 3d60019eb1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-27 21:58:24 +08:00
samuele3hu 5e37e53e14 issue #2404:Add more deprecated function 2013-07-27 21:57:22 +08:00
James Chen e66e429bb2 issue #2430: Moving enum type to class for CCBReader. 2013-07-27 21:44:49 +08:00
minggo 4dde992b70 Merge pull request #3298 from minggo/develop 
make iOS template work ok on armv7s devices
 2013-07-27 06:40:33 -07:00
minggo b6b56a252c make iOS template work ok on armv7s devices 
build only active architecture only
 2013-07-27 21:20:25 +08:00
samuele3hu af9f6fbe3a issue #2404:Add more deprecated function and modify some test sample 2013-07-27 17:20:22 +08:00
James Chen cf7aed8789 Merge pull request #3297 from dumganhar/develop 
More warning fixes and Lua Template Fix.
 2013-07-27 00:17:28 -07:00
James Chen 8721951cee Lua Template Fix. 2013-07-27 15:16:09 +08:00
James Chen 324607c32c More warning fixes. 2013-07-27 15:15:54 +08:00