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

195 Commits

Author SHA1 Message Date
HuaYang Huang abbf7eabfc Update AppController.h 2015-08-01 17:49:12 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00
Wenhai Lin 70628c9dec Fixed link errors on iOS/Mac 2015-07-29 13:59:58 +08:00
zhangbin 4d46a03797 Solve the error : the VS release configuration of lua template cause `cocos run` error. 2015-07-28 14:54:42 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
Wenhai Lin 45e0eda81c Fixed compile error 2015-07-17 11:34:26 +08:00
andyque 451bedbaad change sign team to none. 2015-07-07 22:02:35 +08:00
andyque 04ade7c16e remove xcode scheme 2015-07-07 14:57:25 +08:00
andyque 302976b603 add shared scheme to iOS & Mac project. 2015-07-07 14:24:17 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
Bin Zhang 01cb135e77 Solve the error in the VS project of templates. 2015-06-17 18:06:09 +08:00
tangziwen b84531ea04 add librecast to js and lua templates 2015-06-17 13:39:28 +08:00
pandamicro f3765a4c5f Fix physics 3d macro include issue 2015-06-12 15:58:43 +08:00
andyque a6649e24fe fix resource not copy issue on windows 2015-06-01 18:59:27 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +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
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +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
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
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
yinjimmy 06bd26cb63 Fixed: app crash when console ui trace nil string on mac platform #11211 2015-05-15 15:08:42 +08:00
yinjimmy d78d8b2c1f move menu bar to system menu 2015-05-14 13:43:17 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
zhangbin fc9e5609c8 Rename the target name of Xcode project in templates. 2015-04-30 15:20:47 +08:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
yinjimmy 7a228cd79f Merge branch 'v3' into lua_runtime 2015-04-17 18:28:42 +08:00
samuele3hu b300701ec4 Remove the reference of quick module 2015-04-17 15:52:45 +08:00
yinjimmy 5589796029 Merge branch 'v3' into lua_runtime 2015-04-17 15:27:04 +08:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
yinjimmy 587ee21e4b revert lua runtime 2015-04-02 18:27:53 +08:00
SunLightJuly f321f725b0 fixed Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(): return false only, because runtime have been removed 2015-03-13 16:12:08 +08:00
SunLightJuly 8c196847cb add security framework to Mac template project of Lua 2015-03-12 19:18:06 +08:00
SunLightJuly 608ed24180 Synchronization with V3 2015-03-11 00:02:50 +08:00
SunLightJuly 6c2eb01213 cleanup proj.android 2015-03-10 23:33:09 +08:00
SunLightJuly b77801a99b cleanup proj.win32 2015-03-10 22:56:03 +08:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
SunLightJuly aac4d6f846 removed CodeIDESupport.h 2015-03-10 11:12:42 +08:00
SunLightJuly ff8c0dac2b removed framework of simulator 2015-03-10 10:51:16 +08:00
samuele3hu 1844fdd806 Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES 2015-03-06 15:41:48 +08:00
SunLightJuly ec22923aa9 modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager 2015-02-24 20:50:58 +08:00
htl 12010ce3da fixed run lua samples 360 will popup access wifi note! 2015-01-21 15:30:05 +08:00
htl 52b03039fa fixed show open wifi dialog on android without runtime 2015-01-20 19:15:44 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00
yinjimmy 6e8188d4ff Fix lang file path for vs project 2015-01-15 14:04:15 +08:00
yinjimmy 9f60e82cc7 Fix compile error with lua-tempate-default / lua-template-runtime 2015-01-15 13:34:23 +08:00
yinjimmy f652e1359a 1. Compatible vs2012 for libsimulator 
2. Adjust output directory for simulator
 2015-01-15 11:10:32 +08:00
yinjimmy 49869847cc add default `-workdir` for vs project 2015-01-14 18:45:18 +08:00
yinjimmy a80e26f680 cleanup 2015-01-14 16:27:29 +08:00
yinjimmy bd3c250a6d add proj.linux support 2015-01-14 14:44:48 +08:00
yinjimmy bdf4393be0 Fix runtime output directory for Windows release mode 2015-01-14 10:18:00 +08:00
yinjimmy c3a536bcf0 add lua-template-runtime 2015-01-13 18:28:33 +08:00
yinjimmy cf331c3abd update lua-template-default 2015-01-12 23:42:37 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
yinjimmy d1821fb1ef update template for iOS 2015-01-12 12:46:43 +08:00
yinjimmy db80ab0028 update lua default template 2015-01-09 13:21:19 +08:00
dualface c041787f01 update proj.android for template 2015-01-09 04:14:31 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
dualface 7046f508da update proj.win32 for templates 2015-01-09 03:10:54 +08:00
dualface 156e9eb4f2 update templates 2015-01-06 08:31:43 +08:00
dualface efada94e18 update proj.ios_mac 2015-01-05 17:56:34 +08:00
minggo 50914665e6 Merge pull request #9742 from huangshiwu/iosnetwork_template 
ios template add security.framework
 2014-12-31 15:15:08 +08:00
huangshiwu ac2ff38624 ios template add security.framework 2014-12-31 14:46:34 +08:00
andyque 5d9274acf5 fix conflicts 2014-12-31 14:22:18 +08:00
samuele3hu 3e0852eb7a Remove useless copy about luasocket on the android platform 2014-12-05 15:28:45 +08:00
Dhilan007 3025e937f6 Fixed compiling and linking error of new lua projects when using NDK r10 above. 2014-11-27 21:56:06 +08:00
samuele3hu c9daa8244e Add include directories to fix compile error on the window and remove useless `PreBuildEvent` 2014-10-29 16:09:35 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
huangshiwu d05aa84699 add launch images to templates to support iphone6 and iphone6+'s native resolution mode 2014-10-17 11:40:22 +08:00
dualface cee999ebbb update lua-template-default, lua-template-runtime, fix same proj problems. 2014-10-14 16:55:38 +08:00
dualface b49d2351ff update lua-template-default 2014-10-11 02:55:04 +08:00
minggo ebf0562b84 remove armv7s support on iOS 2014-09-26 10:35:50 +08:00
minggo 45d311bb34 remove dependence of CoreGraphics for on mac 2014-09-19 14:02:13 +08:00
minggo d96050e1ce Merge pull request #8048 from Dhilan007/v3-audio903 
update LUA templates for AudioEngine.
 2014-09-15 16:00:11 +08:00
andyque 36feb8e47b fix lua win32 template compile error 2014-09-15 15:10:55 +08:00
Dhilan007 1639d759af update LUA templates for AudioEngine. 2014-09-15 13:51:18 +08:00
andyque 2cfff1813b modify comments 2014-09-15 12:06:34 +08:00
andyque 2f85310348 adjust registering ui module before extension module 2014-09-15 09:46:07 +08:00
minggo 11f9eaa4a0 fix template compiling error 2014-09-12 15:02:18 +08:00
zhangbin e24a903c88 Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1. 2014-08-28 16:13:11 +08:00