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

89 Commits

Author SHA1 Message Date
samuele3hu 3e0852eb7a Remove useless copy about luasocket on the android platform 2014-12-05 15:28:45 +08:00
andyque bdd46f7e55 fix linux cpp and lua template 2014-11-28 08:20:02 -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
Vladimir Timofeev 77ab866090 Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications. 2014-11-11 10:30:48 +03: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
minggo abd2687cf5 Merge pull request #8683 from dualface/update_lua_template_runtime 
update lua-template
 2014-10-14 17:01:19 +08:00
dualface cee999ebbb update lua-template-default, lua-template-runtime, fix same proj problems. 2014-10-14 16:55:38 +08:00
Huabing.Xu b3be90bc5e Fix lua cocos console on linux 2014-10-13 17:42:59 +08:00
dualface 74ec90f90f remove unused codes 2014-10-11 03:14:06 +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 3f7fc6ead1 Merge pull request #8111 from joewan/v3 
fix compile on ubuntu.
 2014-09-22 09:38:52 +08:00
joewanchen f22c15bf1c fix. 2014-09-22 00:08:44 +08:00
minggo 45d311bb34 remove dependence of CoreGraphics for on mac 2014-09-19 14:02:13 +08:00
honghui 86416e73ca sync code from default template 2014-09-16 16:19:05 +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
samuele3hu 471820568f Update android.mk of cocos and lua-templates 2014-08-27 10:28:04 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
minggo ba4825a5fa Merge pull request #7869 from huangshiwu/v3_glviewattrs 
OpenGL context attributions setting revise -modify lua template
 2014-08-25 11:18:15 +08:00
huangshiwu 9eda72f54a OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
samuele3hu f36e7c6617 Add register_cocos3d_module for lua template 2014-08-18 19:46:11 +08:00
samuele3hu 22a48fb760 Update cpp and lua template to support cocos3d lib 2014-08-18 19:23:03 +08:00
samuele3hu 1976b66ab8 Make lua-template-default support all modules 2014-08-14 21:27:02 +08:00
samuele3hu 02da839798 Make lua-template-default support all modules 2014-08-14 16:54:33 +08:00
samuele3hu 032f5ea781 Adjust lua_debugger.h/c to lua runtime template and adjust related project configure 2014-08-14 00:06:28 +08:00
zhangbin e766a22bda Adjust the lua templates for the lua modules. 2014-08-13 14:29:14 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
samuele3hu 2ffc0e2e53 Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 16:56:22 +08:00
samuele3hu 00865c8abb Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 15:22:12 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
 2014-08-07 14:02:50 +08:00
samuele3hu 0421c24d16 Modify lua-template-default and lua-template-runtime project 2014-08-07 13:54:54 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module 
Split luabindings into serval modules and adjust project settings of test cases
 2014-08-06 17:09:12 +08:00
xiangxw 78587254a5 show error after a win32 lua program crashes 2014-08-05 21:10:30 +08:00
samuele3hu da18657f4f Add module Android.mk config and adjust related test cases 2014-08-05 13:29:54 +08:00
samuele3hu cd0c82f8b7 Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates 2014-08-04 17:11:57 +08:00
samuele3hu c5c394846c Adjust iOS and Mac tempts for Lua 2014-08-04 10:25:17 +08:00
shinriyo 3da15a7f92 typo function 
however it is not the dog.
squirrel....
 2014-07-29 00:37:55 +09:00
samuele3hu 175ff37302 Remove glView setting form cpp to lua script and remove lua bindings for Bone3D 2014-07-11 16:00:02 +08:00
samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/bindings-generator
	tools/tolua/cocos2dx_physics.ini
 2014-07-08 14:57:19 +08:00
zhangbin af5cf0a33f Add configuration in templates to set the bundle identity of Mac & iOS project. 2014-07-08 10:22:08 +08:00