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

5442 Commits

Author SHA1 Message Date
samuele3hu ada7fa23d3 Add CC_DLL for related network files 2014-08-22 13:42:46 +08:00
samuele3hu 700699a37f Modify MciPlayer.cpp to support Unicode 2014-08-22 13:41:48 +08:00
minggo c0d1bfca26 Merge pull request #7832 from Teivaz/v3 
Fixed WinRT project
 2014-08-21 13:37:03 +08:00
teivaz aecdb832a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-21 13:48:05 +03:00
teivaz a70688dc96 + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
teivaz 4697cb07e6 ! Set version to 3.3 (as it is no longer 3.2) 2014-08-21 18:04:46 +03:00
minggo f3b211351b Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie 
V3 add primitivehead fie
 2014-08-20 16:04:27 +08:00
Huabing.Xu b5e5e2d8d5 add primitive head file to cocos2d.h 2014-08-20 14:48:50 +08:00
Huabing.Xu 22db2abcaf add != operator in Blendfunc 2014-08-20 14:21:13 +08:00
minggo bbf5c56e83 Merge pull request #7827 from andyque/ccRandom 
add c++11 random library support
 2014-08-20 13:35:12 +08:00
andyque 34629f1014 fix windows & win8 & wp8 compile error 2014-08-20 12:02:12 +08:00
minggo d91dc842de Merge pull request #7822 from Teivaz/v3_WP8 
Added method for custom precompiled shader program loading in WP8
 2014-08-20 11:22:26 +08:00
teivaz 0e5a79d486 + [WP8] Added method for custom precompiled shader program loading 2014-08-20 12:02:16 +03:00
minggo 84f2e248d1 Merge pull request #7823 from newnon/v3_Label_fix 
Label performance problem
 2014-08-20 10:28:01 +08:00
minggo 2b709f92bb Merge pull request #7816 from xiangxw/fix_sendPrompt 
fix sendPrompt()
 2014-08-20 10:25:30 +08:00
minggo 74fba21fc0 Merge pull request #7825 from 2youyouo2/v3 
remove cascade color for CorlorFrame
 2014-08-20 10:23:15 +08:00
minggo 41905cb4c0 Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue 
fix pageView touch location
 2014-08-20 10:11:59 +08:00
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
Sergey 055a143f9d Label performance problem 2014-08-19 15:02:09 +04:00
Sergey bfe6513706 setKeepScreenOn method 2014-08-19 15:00:58 +04: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 cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
kaile.yin d884054ec9 remove cascade color for CorlorFrame 2014-08-19 15:19:47 +08:00
andyque deb7ff64d4 fix pageView touch location 2014-08-19 15:14:07 +08:00
xiangxw bef6a2a7f1 fix sendPrompt() 
a extra '\0' will be sent when sizeof() is used
 2014-08-19 11:46:30 +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
teivaz db805ee2c8 * Fixed WP8 cocos library project 
* Fixed profiling macros
 2014-08-19 19:24:56 +03: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
CocosRobot 85d505b427 [AUTO]: updating luabinding automatically 2014-08-18 14:47:35 +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
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 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 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
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
Dmitry Bushtets 1257f642c7 - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
CocosRobot bdfc48b127 [AUTO]: updating luabinding automatically 2014-08-15 07:44:57 +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
CocosRobot 24f0e8aada [AUTO]: updating luabinding automatically 2014-08-15 07:23:17 +00: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 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