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

682 Commits

Author SHA1 Message Date
CocosRobot 4b21972d8b [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 05:42:22 +00:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
CocosRobot 071aedaa51 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 02:56:25 +00:00
cocoscodeide da057b5a68 Merge pull request #69 from cocos2d/v3 
update v3
 2014-09-03 15:30:40 +08:00
samuele3hu d681bdce92 Fix the crash of project which was created by the lua-template-runtime 2014-09-03 14:54:58 +08:00
CocosRobot 1ec9933045 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 05:37:45 +00:00
minggo 66943eec98 Merge pull request #7932 from minggo/remove-unneeded-files 
remove unneeded files
 2014-09-03 13:36:31 +08:00
CocosRobot 61a3c80cb9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 04:05:23 +00:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
CocosRobot 2dea7c3a18 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 03:26:30 +00:00
Huabing.Xu 05d0e04073 [ci skip] update template for triangles command 2014-09-02 15:05:21 +08:00
chuanweizhang2013 4ada914426 mac writable path 2014-09-01 02:35:08 -07:00
chuanweizhang2013 5af89f5d46 fixed error 2014-09-01 01:57:08 -07:00
chuanweizhang2013 77a5e35ea8 Merge pull request #31 from cocos2d/v3 
update v3
 2014-09-01 14:08:06 +08:00
cocoscodeide dd09c784d1 Merge pull request #65 from cocos2d/v3 
update  v3
 2014-08-29 18:12:30 +08:00
chuanweizhang2013 303b391657 fixed writablePath 2014-08-29 16:21:34 +08:00
chuanweizhang2013 0d8c9eeb19 add link resource support 2014-08-29 15:05:55 +08:00
CocosRobot d0ac64b2e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-29 05:43:47 +00:00
chuanweizhang2013 37b71ec0cc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-08-29 09:35:21 +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
chuanweizhang2013 29234a3c58 Fix an issue that the break point stops twice at the same function 2014-08-28 10:54:47 +08:00
chuanweizhang2013 688ad1b3b9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
 2014-08-28 10:28:31 +08:00
CocosRobot 27b8fd02ad [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-28 02:18:38 +00:00
CocosRobot f1914f3fa1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-27 05:40:25 +00: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
CocosRobot 8d88109db7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 06:57:10 +00:00
minggo 37aeb5b114 Merge pull request #7872 from samuele3hu/v3_3_new_module 
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
 2014-08-25 14:55:46 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
CocosRobot b165137f40 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 03:19:31 +00: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
minggo e5ac6e204b Merge pull request #7864 from minggo/module-devide 
Module devide
 2014-08-25 11:01:19 +08:00
huangshiwu 9eda72f54a OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
CocosRobot b55c174bba [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:56:17 +00:00
CocosRobot 91eba38eda [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:40:55 +00:00
huangshiwu 07af58c0c2 OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
samuele3hu a3e4402c5f Adjust cpp-template-default template 2014-08-22 13:50:28 +08:00
teivaz 312f57d7a6 - [WP8] Now replacing application display name with project name 2014-08-21 18:49:52 +03:00
CocosRobot 9c2cbaf742 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-20 05:37:22 +00:00
andyque 9a3c2dc6a4 Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-20 09:56:16 +08:00
teivaz ebb0876d29 * [WP8] Fixed resource search path in template 2014-08-19 21:44:46 +03:00
teivaz 5cdbf4c04c * [WP8] Fixed paths in template 2014-08-19 19:57:06 +03:00
CocosRobot 218cee5e05 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:55:40 +00:00
CocosRobot 94b45d55ef [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:43:41 +00: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
CocosRobot 128d06076a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-15 07:41:13 +00:00
minggo f2f8035724 Merge pull request #7708 from super626/obb 
AABB, OBB
 2014-08-15 15:32:14 +08:00
minggo 965f4f8ef4 Merge pull request #7791 from xiangxw/fix_replaceAll 
fix replaceAll()
 2014-08-15 15:03:06 +08:00
xiangxw 8b83419a32 fix replaceAll() 
This function will never return if new_value contains old_value.
For example, old_value = "'", new_value = "''".
 2014-08-15 11:48:33 +08:00
samuele3hu 76a9382a91 Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8 2014-08-15 00:08:15 +08:00
samuele3hu 55180c63e4 Add modules register functions for lua-template-runtime on android 2014-08-14 23:22:24 +08:00
samuele3hu 97d8d27eec Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android 2014-08-14 21:58:40 +08:00
samuele3hu 1976b66ab8 Make lua-template-default support all modules 2014-08-14 21:27:02 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
CocosRobot 2d4f23d9e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-14 10:36:05 +00:00
minggo 3f2fccb999 Merge pull request #7771 from samuele3hu/v3_3_module 
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
 2014-08-14 18:33:53 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
samuele3hu 02da839798 Make lua-template-default support all modules 2014-08-14 16:54:33 +08:00
minggo 3ab8bed741 Merge pull request #7745 from samuele3hu/v3_module 
Modify cpp-template-default project configure
 2014-08-14 09:46:37 +08:00
CocosRobot 6510d74ff7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-14 01:29:42 +00: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
chuanweizhang2013 fc429154a9 add getplatform function 2014-08-13 11:30:43 +08:00
CocosRobot 93800c5821 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-13 01:27:24 +00:00
gin0606 17aa2833db Fix xcode warning that cause `getEngine` inline expansion 2014-08-12 18:07:17 +09:00
samuele3hu d9fdfb2659 Modify cpp-template-default project configure 2014-08-12 17:05:39 +08:00
CocosRobot f8f15df530 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-11 07:06:46 +00:00
minggo 43a3603a8b Merge pull request #7720 from samuele3hu/v3_module 
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
 2014-08-11 15:01:28 +08:00
yangxiao fd314261b7 Merge branch 'newcode' into obb 2014-08-11 13:21:44 +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
CocosRobot 076a2f9d1a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-11 01:32:55 +00:00
samuele3hu 2dacbf6f26 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-08 16:59:33 +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
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +08:00
samuele3hu 4fe1b2e6bc Fix the target dependencies error of lua-runtime-template 2014-08-08 16:10:31 +08:00
CocosRobot 1b4cd7e58e [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-08 07:58:25 +00:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +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
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
gin0606 6722f8d546 Fix typo 2014-08-08 13:27:09 +09:00
CocosRobot 75bd97b82e [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-08 03:51:09 +00:00
minggo b9e84370f6 Merge pull request #7699 from huangshiwu/v3_wp8fix 
V3 wp8fix
 2014-08-08 11:49:02 +08:00
yangxiao 813e954f4e aabb, obb 2014-08-08 00:00:58 +08:00
gin0606 5349aa7efb Add ccRandom.h 2014-08-07 21:17:36 +09:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +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
huangshiwu 0016c7af70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
CocosRobot 92bb832d18 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-07 02:54:38 +00:00
CocosRobot 075c890ef1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-06 09:51:57 +00: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
CocosRobot 35a19dd0ea [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-06 07:24:27 +00:00
minggo fdcf6a0c7c Merge pull request #7672 from xiangxw/show_lua_error_message 
show error after a win32 lua program crashes
 2014-08-06 14:39:25 +08:00
minggo 08cc7982d7 Merge pull request #7666 from zawasp/template_fix 
Template fix
 2014-08-06 10:03:12 +08:00
samuele3hu 63b3f838b6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 09:56:07 +08:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
xiangxw 78587254a5 show error after a win32 lua program crashes 2014-08-05 21:10:30 +08:00
CocosRobot eacb8fa120 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 10:23:15 +00:00
CocosRobot 3a3cf0383d [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 08:38:41 +00:00
Mircea Rila 119ca86e3f additional fixes for win32 project 2014-08-05 11:29:04 +03:00
Mircea Rila d808581d2b fix win32 template project 2014-08-05 10:43:29 +03:00
Mircea Rila 5720df4336 add VS 2013 support for C++ template 2014-08-05 10:11:04 +03:00
samuele3hu da18657f4f Add module Android.mk config and adjust related test cases 2014-08-05 13:29:54 +08:00
CocosRobot 1772ab78ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 02:13:45 +00:00
CocosRobot 0f3fbfa07f [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 02:00:57 +00: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
yangxiao d6d3ea6b18 fix template 2014-08-04 13:12:59 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
samuele3hu c5c394846c Adjust iOS and Mac tempts for Lua 2014-08-04 10:25:17 +08:00
CocosRobot ea1d9d4657 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 07:58:06 +00:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
CocosRobot ce8c5ee327 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 03:58:50 +00:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
CocosRobot 6dd02ade69 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 07:51:17 +00:00
CocosRobot 06d43ed2fd [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 01:28:27 +00:00
CocosRobot a743590ac5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 08:09:10 +00:00
CocosRobot 3d7cced94e [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 06:30:39 +00:00
shinriyo 3da15a7f92 typo function 
however it is not the dog.
squirrel....
 2014-07-29 00:37:55 +09:00
chuanweizhang2013 2bde043346 add config window top support 2014-07-24 10:30:39 +08:00
CocosRobot ea69a2c72d [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-23 16:38:00 +00:00
Sergey 5c62a2fea7 template fix 2014-07-22 15:49:38 +04:00
CocosRobot 19d01ae17b [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-22 09:06:42 +00:00
CocosRobot eee5934b03 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-21 08:48:07 +00:00
minggo 4d78dd60c2 Merge pull request #7527 from chenguangqi/v3 
Fixed error for importing project
 2014-07-21 12:03:40 +08:00
CocosRobot afe3760aa0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-21 03:54:57 +00:00
陈广歧 5063ec465b Fixed error for importing project 
fixed error for importing android project to Eclipse

```
The import org.cocos2dx.lib cannot be resolved ...
```
 2014-07-19 19:35:30 +08:00
minggo f6b5f8e6ce Merge pull request #7509 from chuanweizhang2013/v3luaruntime 
runtime 1.3.1 fixed log bug
 2014-07-18 09:25:41 +08:00
chuanweizhang2013 3e6dd0b8d2 1.3.1 2014-07-17 09:30:56 -07:00
minggo 7b7d4d6aa0 Merge pull request #7500 from cocoscodeide/v3 
lua runtime 1.3
 2014-07-17 18:01:21 +08:00
chuanweizhang2013 f906880c70 modify size 2014-07-17 02:48:32 -07:00
CocosRobot 5de1256005 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-17 08:01:08 +00:00
CocosRobot 1544081284 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-17 07:42:19 +00:00
chuanweizhang2013 5d1de7e9a9 console port android 6010 2014-07-17 15:37:37 +08:00
CocosRobot 924b8b23f2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-17 06:28:22 +00:00
chuanweizhang2013 a51332e955 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-16 22:37:16 +08:00
chuanweizhang2013 c7579c2cd3 rename local variable GameScene to gameScene 2014-07-16 22:36:47 +08:00
chuanweizhang2013 211c79eefa fixed mac ios reload bug 2014-07-16 07:10:46 -07:00
chuanweizhang2013 fc420abec6 add GameScene.lua 2014-07-16 21:22:13 +08:00
chuanweizhang2013 5a4aa64f48 modify lua name 2014-07-16 21:20:48 +08:00
chuanweizhang2013 04b9457ed2 add local for main.lua 2014-07-16 20:49:24 +08:00
chuanweizhang2013 897f42c6fd add consolePort 2014-07-16 20:30:11 +08:00
chuanweizhang2013 390dc3781b support custom console port 2014-07-16 20:19:19 +08:00
chuanweizhang2013 67c078197d Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-16 19:35:28 +08:00