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

406 Commits

Author SHA1 Message Date
Vincent Yang 27d011dd50 Fixbug: LabelTestNew New Label + CharMap's effect is wrong. 2015-06-23 16:02:38 +08:00
pandamicro b08325dd5b Merge pull request #12475 from samuele3hu/v3_7_test 
[ci skip]Fix the some test cases error about Lua
 2015-06-23 13:15:21 +08:00
samuele3hu 3b766e5236 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test 2015-06-23 10:20:05 +08:00
samuele3hu 683c5b4cb2 Fix the LabeLTestNew error. 2015-06-22 22:32:21 +08:00
samuele3hu bc964c96da Fix the error about the Camera3D Test 2015-06-22 09:28:18 +08:00
samuele3hu 0181a84883 Fix the bugs about the particle3DTest 2015-06-22 09:27:34 +08:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
pandamicro 000be8316b Merge pull request #12415 from samuele3hu/v3_7_ui 
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
 2015-06-18 12:30:28 +08:00
samuele3hu 6c749a77f2 Fix the bugs about the Physics3DTest for Lua. 2015-06-18 11:17:08 +08:00
samuele3hu 31aae38fac issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 09:41:16 +08:00
子龙山人 dc33a8d66e Merge pull request #12243 from Wu-Hao/fix_spritepolygon2 
Fix spritepolygon
 2015-06-17 14:40:30 +08:00
samuele3hu 9c550e0a11 Update the Physics3DTest for js and Lua by synchronizing the API. 2015-06-17 13:58:05 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
samuele3hu 2da760b655 Update the NavMesh test case 2015-06-17 09:49:31 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
samuele3hu 0cccd6e765 Fix compile error on the Linux and update the test cases 2015-06-03 18:12:21 +08:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +08:00
samuele3hu 9934d73548 issue #12046: Add Lua bindings for material systems and related test cases. 2015-05-27 15:37:59 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
andyque 07eb116fb6 fix lua tests release mode linker issue 2015-05-23 08:48:53 +08:00
andyque 73902a4063 fix simulator vs2015 support 2015-05-22 17:47:48 +08:00
Bin Zhang 3d0c716ee9 Add script in build.gradle for sign the release apk. 2015-05-22 15:52:41 +08:00
Bin Zhang 94e2e1cb00 Modify the configuration for android studio support in console. 2015-05-21 18:27:30 +08:00
Bin Zhang 41792caa6b Add files & configuration for android studio support in console. 2015-05-21 16:34:03 +08:00
Bin Zhang 78d4089215 Add the project.properties for the ndk-build of proj.android-studio. 2015-05-21 15:43:01 +08:00
Bin Zhang 37dddf9b15 Add execute permission for the gradlew in proj.android-studio. 2015-05-21 15:31:18 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
minggo 79f70c49ce Merge pull request #11905 from WenhaiLin/v3-37 
Remove unnecessary files.
 2015-05-20 13:39:36 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
samuele3hu b6a2299666 Add a newline 2015-05-19 16:55:37 +08:00
samuele3hu 7f728f029c Add Scene3DTest and update TerrainTest based on the Lua 2015-05-19 16:52:39 +08:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 54b6260dfd Rename module 2015-05-18 15:17:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
WenhaiLin 68188f7424 Add native code for AS project. 2015-05-18 13:41:58 +08:00
WenhaiLin 7caa6bb2fc Update Copyright. 2015-05-18 09:59:50 +08:00
samuele3hu 562c711cda Update CocoStudioUIEditorTest for Lua and replace some deprecated functions. 2015-05-15 18:26:21 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
samuele3hu 71595898ed Update the Lua binding for Physics3D ,related test cases and the template project 2015-05-15 16:25:07 +08:00
samuele3hu fa63471c0a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
 2015-05-15 09:31:53 +08:00
samuele3hu 8db62c82f8 Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
samuele3hu 5819159889 Add Lua-bindings for SpritePolygon and related test case 2015-04-28 18:19:57 +08:00
samuele3hu c801d1868c Update Sprite3DTest and VideoPlayerTest about Lua 2015-04-28 11:27:50 +08:00
samuele3hu 51bcac9e84 Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest 2015-04-28 09:17:00 +08:00
samuele3hu 8d9064b4e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test 
Conflicts:
	tests/cpp-tests/Classes/AppDelegate.cpp
 2015-04-22 10:31:39 +08:00
samuele3hu 47e2698986 Fix the cocos3.6beta0 bugs 2015-04-22 10:20:21 +08:00
samuele3hu b72034a3f6 Add Lua bindings for WebView and related test case 2015-04-17 14:08:47 +08:00
samuele3hu dd3b6ced34 Fix the bugs that title and button disappeared because of camera setting 2015-04-14 15:40:12 +08:00
samuele3hu 24654a4847 synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests 2015-04-13 16:29:44 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3 
Reader update
 2015-04-13 11:20:53 +08:00
samuele3hu 8896190d9b Fix the bindings-generator error and add related Action Timeline test case. 2015-04-12 22:20:53 +08:00
samuele3hu 9bf2a920b4 Update the Lua bindings for terrain and TerrainTest.lua 2015-04-09 13:41:52 +08:00
minggo 4bcfcb1d09 Merge pull request #11320 from samuele3hu/v3_terrain 
#issue 10819:Add lua bindings for Terrain and two test cases about it.
 2015-04-08 11:45:46 +08:00
samuele3hu 3a2601a1f8 Add lua bindings for Terrain and two test cases about it. 2015-04-08 10:03:50 +08:00
samuele3hu fd554c07da Rename the file names 2015-04-07 09:31:04 +08:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
samuele3hu 921981833e Update Sprite3DCubeMap test case 2015-03-28 14:59:47 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
zhukaixy 52280e6376 add 3d test case(skybox and texture cube) for lua project 2015-03-20 17:53:05 +08:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
yangxiao 81bf776d09 do not use MoveTo::reserse 2015-03-13 14:10:51 +08:00
yangxiao 6a6877b39f add particle to lua test 2015-03-04 12:59:22 +08:00
yangxiao ea7dfe1147 lua test 2015-03-04 10:42:08 +08:00
yangxiao d5bde9e536 add missing material 2015-02-28 12:57:15 +08:00
yangxiao 218de84cc5 remove expolosion particle 2015-02-28 11:31:15 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +08:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Ray ff07f62e83 fix CocosStudio 3DReader test resource 2015-02-25 15:49:04 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
Ray 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +08:00
Ray 80a5b201f8 3DNode Reader lua Test 2015-02-19 17:28:51 +08:00
samuele3hu 9be620043f Fix the search path error 2015-02-15 18:29:10 +08:00
samuele3hu 3a7cbe9d67 Add Particle3DTest for Lua and update related configure files 2015-02-15 15:56:20 +08:00
Vladimir Timofeev 5688202844 Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders. 2015-02-10 16:23:34 +03:00
samuele3hu 4f782e2330 Fix z-fighting error by using setDepthTest of cc.Director 2015-01-30 11:03:47 +08:00
samuele3hu 80c2e0c153 Add AsyncLoadSprite3D test case and update the related lua binding 2015-01-28 21:47:52 +08:00
samuele3hu 7628ec53bc Remove useless comment 2015-01-28 11:06:00 +08:00
samuele3hu 82a95bf2fc Modify some script files 2015-01-28 10:57:30 +08:00
samuele3hu 6208e9cba5 Add more test cases about 3D 2015-01-28 09:40:20 +08:00
samuele3hu 6e055ba41f Fix some lua test cases bug 2015-01-23 15:35:15 +08:00
samuele3hu d74fb0e8b5 Update LayoutComponent Test case of UIEditTest 2015-01-22 10:21:38 +08:00
samuele3hu 01bfe09c05 Add checked lua codes for issue #10107 2015-01-21 19:33:42 +08:00
minggo 45c4c16f93 Merge pull request #10010 from andyque/fixErrorFontName 
fix font name typo in tests
 2015-01-15 10:24:02 +08:00
andyque f8200347cd fix font name typo in tests 2015-01-15 10:10:53 +08:00
samuele3hu 1325ba0eaf Fix some lua test cases bug 2015-01-15 10:01:16 +08:00
minggo 825f90564c Merge pull request #9992 from samuele3hu/v3_4_issue9986 
issue #9986:Add lua bindings for Component and related test cases
 2015-01-14 17:05:51 +08:00
samuele3hu 77912270f9 issue #9986:Add lua bindings for Component and related test cases 2015-01-14 16:58:35 +08:00
samuele3hu c026aa82f9 Add CC_DEPRECATED_ATTRIBUTE flag 2015-01-14 15:09:37 +08:00
samuele3hu 1d94ae4302 issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes 2015-01-14 13:51:09 +08:00
samuele3hu 6a55fef70e Update the VideoPlayerTest to passing the fullpath of video resource 2015-01-09 16:45:51 +08:00
samuele3hu 08ec8cc8bf Fix some lua-tests bugs 2015-01-09 15:23:54 +08:00
WenhaiLin 718c400bfa Fixed bodies display wrong in Physics:Pump test case 2015-01-09 10:21:50 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00