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

481 Commits

Author SHA1 Message Date
minggo 7f28e81d09 Merge pull request #7226 from super626/v3 
Animation3D
 2014-06-29 16:41:13 +08:00
andyque 1eab15ea41 add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
samuele3hu 3bd195d4ef Add Lua binding for ActionTimeline related and related test cases 2014-06-26 09:51:32 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
Dale Stammen 113f20094f added building wp8 shaders instructions 2014-06-20 09:12:16 -07:00
Dale Stammen aa4ffc33ac updated WP8 shader compiler tool 2014-06-20 09:06:49 -07:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3 
add TimelineAction
 2014-06-19 21:05:15 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
zhangbin 1b056b6c49 Remove the debug symbols for release mode in xcode projects. 
Modify the template of lua runtime.
 2014-06-18 17:06:56 +08:00
andyque ca24ad6768 Merge branch 'v3' into cleanupBinaryLoader 2014-06-18 11:19:19 +08:00
minggo 26cca348cb Merge pull request #7085 from super626/v3 
Sprite3D animation
 2014-06-17 21:05:58 +08:00
Dale Stammen 5d85d93ef3 added script to copy angle dlls for testing new versions of angle 2014-06-16 10:36:50 -07:00
yangxiao 7ae06d44a6 cache work 2014-06-16 20:58:13 +08:00
yinkaile b289106eda add cpp to mac project 2014-06-13 19:41:08 +08:00
pipu cb213183bc adjust project.pbxproj and files associated with ActionTimeLine 2014-06-13 16:33:07 +08:00
pipu 320f04f79f adjust files associated with TimeLineAction 2014-06-13 13:46:13 +08:00
pipu 1cb7dd58ec add CCNodeReader into project 2014-06-12 19:40:58 +08:00
pipu f191c72732 add TimeLineAction into project 2014-06-12 16:27:45 +08:00
Huabing.Xu f1bc0971aa extract mesh data, material data, skin data into a header file for reuse in converter and engine 2014-06-11 18:24:14 +08:00
Huabing.Xu 65acec013b Merge branch 'v3' into v3Animation 2014-06-11 17:45:31 +08:00
andyque b895018765 update parser 2014-06-11 09:35:24 +08:00
andyque 48f7743daa Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-10 15:08:10 +08:00
minggo 29ac8d746d Merge pull request #7012 from Dhilan007/v3-testcast 
update test cast of label.
 2014-06-09 16:32:32 +08:00
Dhilan007 c109cff099 update Xcode project. 2014-06-09 14:18:05 +08:00
andyque 7a25fbfe29 refactor touch event 2014-06-09 10:23:11 +08:00
andyque 6bbf5a1459 tests 2014-06-06 10:12:23 +08:00
yangxiao ed8f8a9cad sprite3d with skin render&bundle 2014-06-05 16:36:01 +08:00
andyque c96a6086c3 improve parsing code 2014-06-05 11:43:43 +08:00
Ricardo Quesada 0c2f8ed401 Lua compiles and runs 2014-06-04 09:26:39 -07:00
yangxiao 54caf26a57 animation3d 2014-06-04 18:17:09 +08:00
andyque 54e93f6c41 fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
minggo cb10fb560a not treat warnings as error 2014-06-04 09:44:34 +08:00
minggo 4b979d67db issue #5429: treat warning as error on Mac 2014-05-30 16:46:01 +08:00
minggo 70f3510a27 issue #5429: treat warning as eror on iOS 2014-05-30 16:21:31 +08:00
minggo d7cca2a044 closed #4819: remove KeyboardTest 2014-05-28 18:31:00 +08:00
minggo 0acc4cd961 issue #4819: remove KeyPadTest 2014-05-28 18:17:22 +08:00
minggo 0ad0f9c405 issue #4819: remove AccelerometerTest 2014-05-28 18:10:37 +08:00
andyque 769300d25e rename UILayout 
Executant.h to UILayoutManager.h
 2014-05-28 10:17:34 +08:00
minggo 866a1cb9aa Merge pull request #6820 from newnon/v3_android_improvements 
Android project improvements
 2014-05-27 10:17:03 +08:00
andyque 634fea7c45 Merge remote-tracking branch 'upstream/v3' into refactor5183 2014-05-26 09:18:32 +08:00
Ricardo Quesada 5601048829 Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03:00
samuele3hu a6efd4f650 Move `setSearchPat` operation from cpp to script 2014-05-22 14:00:39 +08:00
samuele3hu 6c8e38871c issue #5255:Remove Sprite3D effect test 2014-05-22 10:22:10 +08:00
Dale Stammen 3971666426 updated pch file for wp8 2014-05-20 10:06:24 -07:00
Sergey 49f26f3fbf lua template & android-build.py updated 2014-05-20 13:49:02 +04:00
andyque b6373b5303 Merge branch 'v3' into refactorLayout 2014-05-20 09:30:23 +08:00
andyque a03a565863 issue #5138, add Groups in Xcode 2014-05-19 14:11:39 +08:00
andyque 5ddfc41414 Merge branch 'v3' into refactorLayout 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-19 13:54:16 +08:00