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

25235 Commits

Author SHA1 Message Date
andyque 3f79d67f01 modify changelog 2014-10-29 10:33:31 +08:00
samuele3hu c52f3b972b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-29 09:43:55 +08:00
samuele3hu 9d0c8d97f9 Update vs project setting for lua-empty-test 2014-10-29 09:42:48 +08:00
minggo 74fe1d86e6 [ci skip]Update Authors 2014-10-28 22:02:56 +08:00
minggo e3d813795d Merge pull request #8923 from liamcindy/v3 
update ui button size changed logic
 2014-10-28 21:59:49 +08:00
appgenmiguelferreira 928c898bda Merge pull request #1 from cocos2d/v3 
Cocos2d-x Merge
 2014-10-28 11:58:36 +00:00
Dale Stammen af14b40ba0 must call DisplayInformation::GetForCurrentView() from main UI thread 2014-10-27 13:40:19 -07:00
Dale Stammen 5b69a55121 added check for WP8_SHADER_COMPILER 2014-10-27 11:16:14 -07:00
Dale Stammen 510c8caed7 added DPI support for universal app 2014-10-27 11:12:54 -07:00
Dale Stammen 6d46ee8f3d fixed location of renderer filter 2014-10-27 11:09:27 -07:00
Dale Stammen 4dd48d5020 removed mutex. use concurrent_queue for events 2014-10-27 11:08:22 -07:00
Dale Stammen b483162128 added ignore warning 4756 2014-10-27 11:07:27 -07:00
Dale Stammen 2eccd58d45 added DPI support for universal app 2014-10-27 11:07:00 -07:00
Dale Stammen 6fb69870f9 fixed compiler warnings for winrt code 2014-10-27 10:57:57 -07:00
Dale Stammen 77c00bc77f removed use of std::mutex. Now using lock-free concurrent_queue 2014-10-27 08:32:19 -07:00
lvlong bdf10426e2 new axe.c3b (ver 0.4) 2014-10-27 16:12:15 +08:00
yangxiao 7656ff2f0e fix wrong vertex buffer size 2014-10-27 13:59:40 +08:00
minggo 941166d9c7 [ci skip] Update CHANGELOG 2014-10-27 11:56:10 +08:00
minggo 34a7f511f0 [ci skip]Update Authors 2014-10-27 11:55:26 +08:00
minggo 34c2587f7c Merge pull request #8928 from Svenito/vec_op 
Add greater than operator to Vec2
 2014-10-27 11:54:23 +08:00
minggo 15e92411f9 [ci skip] Update CHANGELOG 2014-10-27 11:51:04 +08:00
minggo a60d2ded2d [ci skip]Update Authors 2014-10-27 11:50:02 +08:00
minggo 23f922420a Merge pull request #8919 from ahlwong/v3 
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
 2014-10-27 11:48:50 +08:00
minggo 521f5396cc [ci skip] Update CHANGELOG 2014-10-27 11:39:58 +08:00
minggo baff367c94 Merge pull request #8918 from dumganhar/iss8843-drawpoint 
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
 2014-10-27 11:38:11 +08:00
minggo 354147260c [ci skip] Update CHANGELOG 2014-10-27 11:32:30 +08:00
minggo 8eb0f7fa5e [ci skip]Update Authors 2014-10-27 11:30:48 +08:00
minggo f1ac0df761 Merge pull request #8921 from TimothyZhang/fix-program-cache-add 
release old program with the same key before adding glprogram
 2014-10-27 11:22:00 +08:00
minggo b3ade76650 [ci skip]Update Authors 2014-10-27 11:17:07 +08:00
Liam d6564be67e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-27 11:16:58 +08:00
Liam 19ed3d1965 udpate for ui button state change event 2014-10-27 11:16:25 +08:00
minggo 7ccf684a3e [ci skip] Update CHANGELOG 2014-10-27 11:15:36 +08:00
minggo 7c09787324 Merge pull request #8925 from Teivaz/v3 
* [WP8] Enabled GLProgramState restoring on render recreated
 2014-10-27 11:13:18 +08:00
Timothy Zhang d42f8cac65 replace tab with 4 spaces 2014-10-27 10:02:28 +08:00
Timothy Zhang 80230258d6 replace tab with 4 spaces 2014-10-27 09:59:47 +08:00
kaile.yin dd517813a8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame 2014-10-25 23:02:38 +08:00
Liam 57e6631918 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-25 19:01:18 +08:00
Liam f1970e98dd update for ui button press event 2014-10-25 18:00:57 +08:00
minggo bb7351ad46 Merge pull request #8931 from CocosRobot/update_cocosfiles_1414223228 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-25 15:49:49 +08:00
minggo c3afa7a29f [ci skip] Update CHANGELOG 2014-10-25 15:49:27 +08:00
CocosRobot 29264db249 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-25 07:47:09 +00:00
minggo b99f0bf321 Merge pull request #8926 from MSOpenTech/wp8.1-universal 
WP8.1 universal app
 2014-10-25 15:45:50 +08:00
minggo 1ca1f3c058 Merge pull request #8927 from Dhilan007/v3-template 
Fix CPP template on Window
 2014-10-25 15:38:55 +08:00
yangxiao 20decd5a39 refact reskin code 2014-10-25 14:11:32 +08:00
yangxiao 0696041ea9 add getMeshArrayByName method 2014-10-25 12:27:03 +08:00
Sven Steinbauer c9f5eacc2e Add greater than operator to Vec2 2014-10-24 20:27:06 +01:00
Ahlwong dfcdf10898 Fix Label Additional Kerning All Strings 2014-10-24 08:57:37 -07:00
Dhilan007 788c793147 Fix CPP template on Window 2014-10-24 23:18:35 +08:00
Dale Stammen 042976265c updated precompiled shaders for WP8 2014-10-24 07:20:16 -07:00
Dale Stammen 40e49cdc12 Merge branch 'v3' into wp8.1-universal 2014-10-24 07:08:55 -07:00