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

24911 Commits

Author SHA1 Message Date
minggo bca00dac1a [ci skip]Update Authors 2014-09-28 17:30:19 +08:00
XiaoYang f976a116c7 Merge pull request #134 from songchengjiang/light_new 
move light from 3d to base(Windows)
 2014-09-28 17:25:07 +08:00
minggo 913102d923 [ci skip] Update CHANGELOG 2014-09-28 17:25:04 +08:00
songchengjiang 39deb73c3a move light from 3d to base(Windows) 2014-09-28 17:23:25 +08:00
songchengjiang ca4fa42691 Sprite3DTest.lua: 
Add Sprite3DWithSkinTest
Add AttachmentTest
Add Sprite3DReskinTest
Add Sprite3DMirrorTest
 2014-09-28 17:01:43 +08:00
minggo 9511f0deb5 Merge pull request #8130 from yestein/v3 
Add Cocostudio Armature getOffsetPoints API for Lua
 2014-09-28 16:48:37 +08:00
samuele3hu 6b2acf88fc Modify CameraTest and update related lua-bindings files 2014-09-28 16:47:06 +08:00
minggo ab8db5aced [ci skip] Update CHANGELOG 2014-09-28 16:45:38 +08:00
minggo 8ed336c681 Merge pull request #8167 from hongliang-goudou/v3 
bugfix for UI animation playing crash if GUI JSON file is loaded again.
 2014-09-28 16:42:49 +08:00
minggo 289c1edfe7 Merge pull request #8174 from lite3/v3 
fix compile error when CC_SPRITE_DEBUG_DRAW
 2014-09-28 16:21:04 +08:00
minggo 59294902d4 Merge pull request #8177 from CocosRobot/update_lua_bindings_1411745709 
[AUTO]: updating luabinding automatically
 2014-09-28 16:13:35 +08:00
minggo cc02931c43 Merge pull request #8181 from krzysztof-jusiak/linux-cpp-template-fix 
fix for wrong directory in linux cpp-template
 2014-09-28 16:12:31 +08:00
yangxiao e8904454e9 add to template 2014-09-28 16:08:05 +08:00
yangxiao 38873dd999 move light fix linux and android 2014-09-28 16:05:20 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
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