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

22958 Commits

Author SHA1 Message Date
andyque 9a3c2dc6a4 Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-20 09:56:16 +08:00
minggo 18cc62d16d Merge pull request #7821 from Teivaz/v3 
[WP8] Fixed default search path
 2014-08-19 16:59:12 +08:00
teivaz 0e7ec265ee * [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res" 2014-08-20 11:54:41 +03:00
minggo 49c6d1e746 Merge pull request #7819 from minggo/androidmk-optimize 
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
 2014-08-19 16:11:40 +08:00
minggo e9b5e34b0f Merge pull request #7820 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-19 15:37:20 +08:00
minggo cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
zhangbin dab6e5fb70 Update the reference of submodule cocos2d-console. 2014-08-19 15:21:43 +08:00
minggo de004e80c2 [ci skip] 2014-08-19 09:53:18 +08:00
minggo dd1bc70cde Merge pull request #7271 from newnon/v3_getPreviousLocation_fix 
bug on began touch - prevpoint
 2014-08-19 09:49:01 +08:00
minggo b25ddb8935 Merge pull request #7814 from Teivaz/v3 
Fixed WP8 cocos library project and profiling macros
 2014-08-19 09:31:20 +08:00
teivaz ebb0876d29 * [WP8] Fixed resource search path in template 2014-08-19 21:44:46 +03:00
teivaz 5cdbf4c04c * [WP8] Fixed paths in template 2014-08-19 19:57:06 +03:00
teivaz db805ee2c8 * Fixed WP8 cocos library project 
* Fixed profiling macros
 2014-08-19 19:24:56 +03:00
minggo b45c2e9b12 Merge pull request #7813 from CocosRobot/update_lua_bindings_1408375483 
[AUTO]: updating luabinding automatically
 2014-08-18 23:28:32 +08:00
CocosRobot 4236e89245 [AUTO]: updating luabinding automatically 2014-08-18 15:26:32 +00:00
minggo 38fdef614a Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling 
add swallow touch and propagation to parent widgets customization
 2014-08-18 23:16:22 +08:00
minggo 02593a0efe Merge pull request #7812 from CocosRobot/update_cocosfiles_1408373738 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-18 22:57:33 +08:00
minggo 36113c65ac [ci skip] 2014-08-18 22:56:47 +08:00
CocosRobot 218cee5e05 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:55:40 +00:00
minggo fae0ba41ec Merge pull request #7811 from CocosRobot/update_lua_bindings_1408373119 
[AUTO]: updating luabinding automatically
 2014-08-18 22:50:13 +08:00
minggo ea5c07fba4 Merge pull request #7810 from CocosRobot/update_cocosfiles_1408373019 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-18 22:48:27 +08:00
CocosRobot 85d505b427 [AUTO]: updating luabinding automatically 2014-08-18 14:47:35 +00:00
CocosRobot 94b45d55ef [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:43:41 +00:00
minggo 22fa650bbf Merge pull request #7807 from samuele3hu/v3_3_3d_module 
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
 2014-08-18 22:38:58 +08:00
samuele3hu f36e7c6617 Add register_cocos3d_module for lua template 2014-08-18 19:46:11 +08:00
samuele3hu 22a48fb760 Update cpp and lua template to support cocos3d lib 2014-08-18 19:23:03 +08:00
minggo 2f2ee43b21 Merge pull request #7808 from 2youyouo2/v3 
fixed ArmatureAnimation::setSpeedScale
 2014-08-18 18:19:23 +08:00
minggo e2829cd68a Merge pull request #7802 from SmartCat/v3 
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
 2014-08-18 16:56:15 +08:00
kaile.yin 6abaf27b14 fixed ArmatureAnimation::setSpeedScale 2014-08-18 16:19:54 +08:00
samuele3hu 91fd40dd3a Add a newline for some files 2014-08-18 15:27:54 +08:00
samuele3hu cb3f20ed47 Remove lib search paths for libcocos3d 2014-08-18 15:16:57 +08:00
samuele3hu 2d8ae3a917 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module 2014-08-18 15:08:04 +08:00
samuele3hu e0168c373c Add manual lua bindings for 3d and adjust related test case on different platform 2014-08-18 15:04:32 +08:00
samuele3hu e3149ce41a Split lua bindings for 3D from cocos2d 2014-08-18 15:00:40 +08:00
samuele3hu 7596a8a831 Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-18 14:58:57 +08:00
minggo eb408591d7 Merge pull request #7799 from CocosRobot/update_cocosfiles_1408088163 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-18 11:08:56 +08:00
minggo 7f43c212c9 Merge pull request #7801 from CocosRobot/update_lua_bindings_1408088565 
[AUTO]: updating luabinding automatically
 2014-08-18 11:08:23 +08:00
samuele3hu 6259aebdab Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-17 23:45:56 +08:00
samuele3hu 85ef11ae56 Split cocos3d from cocos2d on the iOS/Mac platform and adjust the related iOS/Mac test project 2014-08-16 21:51:39 +08:00
Dmitry Bushtets 1257f642c7 - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
andyque 0517ceb0dc add scrollView nested tests 2014-08-15 16:21:27 +08:00
minggo 6d21420755 [ci skip] 2014-08-15 16:05:12 +08:00
CocosRobot bdfc48b127 [AUTO]: updating luabinding automatically 2014-08-15 07:44:57 +00:00
minggo 725d935567 Merge pull request #7800 from CocosRobot/update_cocosfiles_1408088472 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-15 15:41:51 +08:00
CocosRobot 128d06076a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-15 07:41:13 +00:00
CocosRobot 5cdccac843 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-15 07:36:03 +00:00
minggo f2f8035724 Merge pull request #7708 from super626/obb 
AABB, OBB
 2014-08-15 15:32:14 +08:00
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
andyque cf8e40f8ce deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead 2014-08-15 15:26:19 +08:00
minggo b842c57954 Merge pull request #7794 from minggo/seperate-jpg-tiff-webp 
Seperate jpg tiff webp
 2014-08-15 15:24:09 +08:00