Commit Graph

22941 Commits

Author SHA1 Message Date
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
minggo 2ad232795d Merge pull request #7796 from CocosRobot/update_lua_bindings_1408087287
[AUTO]: updating luabinding automatically
2014-08-15 15:23:38 +08:00
CocosRobot 24f0e8aada [AUTO]: updating luabinding automatically 2014-08-15 07:23:17 +00:00
minggo 8d69d4b05c [ci skip] 2014-08-15 15:20:05 +08:00
minggo 8364e179a4 Merge pull request #7780 from andyque/addOptionsForHardCodedValue
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
minggo 965f4f8ef4 Merge pull request #7791 from xiangxw/fix_replaceAll
fix replaceAll()
2014-08-15 15:03:06 +08:00
minggo 64f6b9a8cc [ci skip] 2014-08-15 15:02:09 +08:00
minggo e59283343a Merge pull request #7751 from zawasp/win32_minimize
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
minggo 11b4793d75 Merge pull request #7793 from dabingnn/v3_fixRandomCrashForPrimitive
fix android background and foreground crash for primitive
2014-08-15 14:56:49 +08:00
minggo 408472625c add CCModuleManager into CMakeLists.txt 2014-08-15 14:46:21 +08:00
minggo aa052eb1c1 add CCModuleManager into vs project 2014-08-15 14:39:15 +08:00
minggo bf75e9996a separate jpeg, tiff and webp 2014-08-15 14:29:10 +08:00