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

24343 Commits

Author SHA1 Message Date
samuele3hu e50eaf684f Add CameraTest and update related lua-bindings files 2014-09-28 14:31:58 +08:00
Sergey Perepelitsa c1f37a6926 Misprint fix 
scale9Image double draw fix
 2014-09-28 10:30:33 +04:00
yangxiao 744e09c141 reset change to getDirectionInWorld 2014-09-28 11:03:18 +08:00
yangxiao 53dee7ef86 can ci android compile? 2014-09-28 10:21:47 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
Sergey Perepelitsa 094716a500 Scale9Sprite cropped frames tests 2014-09-28 01:58:26 +04:00
Sergey Perepelitsa ab45c582a7 Scale9Sprite improvements 
small bugs fix
small optimizations
support for cropped sprite frames
 2014-09-28 01:58:26 +04:00
Krzysztof Jusiak bb01201fa6 fix for wrong directory in linux cpp-template 2014-09-27 10:38:10 +01:00
andyque 750c61dd30 fix linux compile error 2014-09-27 01:55:41 -07:00
andyque db2559ef67 add box2d tinyzml back 2014-09-27 01:26:35 -07:00
andyque 99dddc1247 Merge branch 'v3' into fixLinuxCompileError 2014-09-27 01:07:10 -07:00
andyque aea729ef01 fix cmakelists.txt of linux platform 2014-10-09 12:01:22 +08:00
Dale Stammen 3c7a22f776 removed CMakeLists.txt 2014-09-26 12:42:20 -07:00
Dale Stammen 24e5df1644 updated wp8 precompiled shaders 2014-09-26 12:16:16 -07:00
Dale Stammen 67377b7d46 added check for WINRT_NO_WINSOCK 2014-09-26 12:05:19 -07:00
Dale Stammen fd3177d350 removed WINRT 2014-09-26 11:41:12 -07:00
Dale Stammen ef58fa7fd4 fixed winrt file functions to pass app certification tests. 2014-09-26 11:38:17 -07:00
Dale Stammen 1f9d260207 added updated template files 2014-09-26 11:03:10 -07:00
Dale Stammen 209f67f222 fixed property sheet 2014-09-26 11:01:43 -07:00
Dale Stammen f24312bc77 added UNICODE 2014-09-26 11:01:05 -07:00
CocosRobot 021d21a2a7 [AUTO]: updating luabinding automatically 2014-09-26 15:37:17 +00:00
minggo 99064b091f Merge pull request #8164 from super626/v3 
move logic about camera from Director to scene
 2014-09-26 23:29:58 +08:00
yangxiao 1e5a02df2b add to template 2014-09-26 23:13:20 +08:00
minggo 0b0f2f2dad Merge pull request #8173 from samuele3hu/v3_check_lua 
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
 2014-09-26 22:30:42 +08:00
lite3 da361810a3 fix compile error when CC_SPRITE_DEBUG_DRAW 2014-09-26 17:14:55 +08:00
yangxiao abd960725a add to linux project 2014-09-26 16:54:01 +08:00
yangxiao c335df1071 fix normal flag check error 2014-09-26 16:46:15 +08:00
samuele3hu 2ac96ed06e Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement 2014-09-26 16:39:54 +08:00
Huabing.Xu d7a5c464dd remove test code 2014-09-26 16:37:05 +08:00
Huabing.Xu 7cfcdc1af8 fix egl config chooser bug 2014-09-26 16:23:54 +08:00
huanghsiwu 7a2a44ad88 Enable screen orientation change handling - by Teivaz 2014-09-26 16:16:34 +08:00
samuele3hu 691074eb7c Add Camra3DTest and update sprite3DTest 2014-09-26 16:00:57 +08:00
yangxiao fd35d43510 remove unused resource 2014-09-26 15:57:18 +08:00
yangxiao 11a7bf8697 ligthmask to unsigned int 2014-09-26 15:52:04 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
minggo a61352f624 Merge pull request #8170 from CocosRobot/update_cocosfiles_1411714811 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-26 15:09:29 +08:00
yangxiao d69b6558c4 lua 2014-09-26 15:07:23 +08:00
CocosRobot 87c04a3e5d [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-26 07:00:12 +00:00
minggo 9631222680 Merge pull request #8169 from CocosRobot/update_lua_bindings_1411710233 
[AUTO]: updating luabinding automatically
 2014-09-26 14:57:49 +08:00
yangxiao db2ff49f26 adjust according to minggo 2014-09-26 14:13:26 +08:00
CocosRobot 963c02eb3d [AUTO]: updating luabinding automatically 2014-09-26 05:45:33 +00:00
minggo c9acea05ab Merge pull request #8168 from hongliang-goudou/dpi 
export lua function "cc.Device::getDPI()"
 2014-09-26 13:40:26 +08:00
Hong Liang 1c71234921 export lua function "cc.Device::getDPI()" 2014-09-26 11:52:52 +08:00
minggo 0cbe889030 [ci skip] Update CHANGELOG 2014-09-26 11:51:59 +08:00
minggo 7d33aef5cb Merge pull request #8156 from samuele3hu/v3_check_lua 
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
 2014-09-26 11:49:09 +08:00
Hong Liang 9448345de3 bugfix for UI animation playing crash if GUI JSON file is loaded again. 2014-09-26 11:29:48 +08:00
minggo 3bcc3e014d Merge pull request #8166 from minggo/rename-macro 
CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION
 2014-09-26 11:15:31 +08:00
minggo 9ccc49494f Merge pull request #8152 from CocosRobot/update_lua_bindings_1411624004 
[AUTO]: updating luabinding automatically
 2014-09-26 11:02:22 +08:00
minggo 995b09cb28 [ci skip] Update CHANGELOG 2014-09-26 11:01:18 +08:00
minggo 963f9855fa Merge pull request #8165 from minggo/remove-armv7s 
remove armv7s support on iOS
 2014-09-26 10:58:41 +08:00