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

22992 Commits

Author SHA1 Message Date
huangshiwu 2369a5900d merge v3 to v3_glviewattrs 2014-08-21 10:18:55 +08:00
minggo dfc5fb4ea4 Merge pull request #7833 from Teivaz/v3_WP8 
! Set version to 3.3 (as it is no longer 3.2)
 2014-08-21 09:38:20 +08:00
teivaz 4697cb07e6 ! Set version to 3.3 (as it is no longer 3.2) 2014-08-21 18:04:46 +03:00
huangshiwu 2a03bea1a4 OpenGL context attributions setting 2014-08-21 09:35:32 +08:00
minggo f3b211351b Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie 
V3 add primitivehead fie
 2014-08-20 16:04:27 +08:00
minggo 1535c666fc Merge pull request #7829 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-20 14:53:36 +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 5ef8938217 [ci skip] 2014-08-20 13:45:08 +08:00
zhangbin 8034b5429e Update the reference of submodule cocos2d-console. 2014-08-20 13:45:01 +08:00
minggo b6ea46fbbe Merge pull request #7828 from CocosRobot/update_cocosfiles_1408513041 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-20 13:44:17 +08:00
minggo 6458a1fc6d [ci skip] 2014-08-20 13:37:23 +08:00
CocosRobot 9c2cbaf742 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-20 05:37:22 +00: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
zhangbin 8f30a7eeff Update the reference of submodule cocos2d-console. 2014-08-20 11:41:58 +08:00
minggo 01165951de [ci skip] 2014-08-20 11:24:53 +08:00
minggo fa95bda629 [ci skip] 2014-08-20 11:23:50 +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 2c4fe854fb [ 2014-08-20 10:28:48 +08:00
minggo 84f2e248d1 Merge pull request #7823 from newnon/v3_Label_fix 
Label performance problem
 2014-08-20 10:28:01 +08:00
minggo 2fe45ec6cc [ci skip] 2014-08-20 10:26:53 +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
minggo 83ccfa0faa [ci skip] 2014-08-20 09:50:39 +08:00
minggo eecaac3384 [ci skip] 2014-08-20 09:48:39 +08:00
minggo 2682efd119 Merge pull request #7824 from newnon/v3_setKeepScreenOn 
setKeepScreenOn method
 2014-08-20 09:46:36 +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
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
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 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