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

139 Commits

Author SHA1 Message Date
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
WenhaiLin 24eca337ca [ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32. 2015-06-26 17:12:39 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +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
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +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
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +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
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
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 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 3e0852eb7a Remove useless copy about luasocket on the android platform 2014-12-05 15:28:45 +08:00
minggo dcc517e8d4 Merge pull request #9267 from samuele3hu/v3_strip 
Adjust binding structure to decrease the package size of lua_empty_test
 2014-11-27 20:21:06 +08:00
Dhilan007 4cda033a04 Fixed compiling and linking error of lua tests when using NDK r10 above. 2014-11-27 13:56:15 +08:00
samuele3hu 6398f99ed2 Update the CMakeLists.txt for lua-tests 2014-11-27 11:17:48 +08:00
Vladimir Timofeev 2bf77c10e8 Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code. 2014-11-19 03:28:41 +03:00
Vladimir Timofeev b5266e95bf mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still) 2014-11-17 01:42:04 +03:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring 
Cmake refactorings and fixes
 2014-11-13 15:42:47 -08:00
samuele3hu 9492a19dcb Add test case for value type judge error 2014-11-13 15:36:43 +08:00
Vladimir Timofeev 72e59a53a8 cmake: Build application bundles on Mac for test applications (this allow run they from Xcode) 2014-11-11 10:30:48 +03:00
Ricardo Quesada 2ec1170943 treat warnings as errors in samples 2014-11-04 15:42:29 -08:00
samuele3hu 1194873b60 Fix Camera3DTest has not effect on the Linux 2014-10-19 22:20:34 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
samuele3hu c4d3914230 Fix the lua-tests compile error in the release condition 2014-10-17 14:16:17 +08:00
huangshiwu 0a04da0a10 Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode 2014-10-16 15:53:12 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
samuele3hu 6c79ce50d2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
	tests/lua-tests/src/mainMenu.lua
 2014-10-15 15:07:30 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
samuele3hu 3b4fbd8fff Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes 2014-10-14 21:34:55 +08:00