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

347 Commits

Author SHA1 Message Date
honghui 8c0af59f9a open lua debugger only when IDE connected 2014-10-17 14:55:20 +08:00
honghui 8a38d192bb win32 runtime need more dll files 2014-10-17 14:55:20 +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
zhangbin a7cb5f74e6 Solve the error effect on iOS. 2014-10-16 16:19:50 +08:00
honghui 718b5a3cf8 Windows runtime response uncorrect 2014-10-15 00:20:18 +08:00
honghui 445c9dcde4 copy dll files to win32 runtime 2014-10-14 23:32:25 +08:00
dualface f45d9de8f2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update-lua-template-runtime 2014-10-14 23:11:12 +08:00
dualface 963474e43c update lua-template-runtime 2014-10-14 23:08:42 +08:00
minggo dc3997d41c Merge pull request #8691 from minggo/fix-runtime 
[ci skip]fix runtime error
 2014-10-14 21:38:33 +08:00
minggo 39bce5c22f fix runtime error 2014-10-14 21:37:04 +08:00
dualface 23781f7b92 fix coded debugger support 2014-10-14 18:26:56 +08:00
dualface cee999ebbb update lua-template-default, lua-template-runtime, fix same proj problems. 2014-10-14 16:55:38 +08:00
honghui 91901c16cb delete tip when reload file is empty(it's normal) 2014-10-08 17:06:58 +08:00
honghui 7dbac13993 runtime template support Xcode6 2014-09-30 15:49:58 +08:00
honghui 82eb6eeff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-29 16:28:18 +08:00
honghui 7a7a83020d change script file modified time will cause Cocos Code IDE reload file. 2014-09-29 16:27:13 +08:00
minggo ebf0562b84 remove armv7s support on iOS 2014-09-26 10:35:50 +08:00
honghui 206e158596 performance improvement for lua runtime on Run mode 2014-09-25 12:01:16 +08:00
honghui b513dbafb5 read config.json may failed caused by syntax error 2014-09-24 11:43:21 +08:00
honghui 11c0d6ff25 fix:runtime crash when upload file to Mac/Win32 2014-09-18 12:40:26 +08:00
honghui fa4a6fae32 fix bug: response not been sent completely 2014-09-17 18:01:25 +08:00
honghui 86416e73ca sync code from default template 2014-09-16 16:19:05 +08:00
honghui c34eedae1c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-16 11:53:55 +08:00
andyque b6bd70f119 fix lua runtime compile error 2014-09-15 15:35:04 +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
honghui cb0faeac7e fix merge error 2014-09-11 17:50:46 +08:00
honghui 83d7bdcae9 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-09-11 17:07:55 +08:00
honghui d5a8904fbb open WIFI is not necessary for runtime 2014-09-11 17:04:26 +08: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
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 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
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
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
huangshiwu 9eda72f54a OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08: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
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 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
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
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
samuele3hu 4fe1b2e6bc Fix the target dependencies error of lua-runtime-template 2014-08-08 16:10:31 +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
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 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
chuanweizhang2013 2bde043346 add config window top support 2014-07-24 10:30:39 +08:00
chuanweizhang2013 3e6dd0b8d2 1.3.1 2014-07-17 09:30:56 -07:00
chuanweizhang2013 f906880c70 modify size 2014-07-17 02:48:32 -07:00
chuanweizhang2013 5d1de7e9a9 console port android 6010 2014-07-17 15:37:37 +08: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
chuanweizhang2013 da74684cf1 fixed android debuginfo 2014-07-16 19:35:04 +08:00
chuanweizhang2013 e160474f23 rename menu title 2014-07-16 04:33:45 -07:00
chuanweizhang2013 f55b9422f6 fixed living code bug 2014-07-16 18:19:33 +08:00
chuanweizhang2013 53fde9d7c6 add support x86 atomicops_internals_x86_gcc 2014-07-15 17:40:43 +08:00
chuanweizhang2013 445409c1aa remove comment 2014-07-15 15:56:31 +08:00
chuanweizhang2013 0346fccbc3 fixed bug runtime 2014-07-15 15:07:01 +08:00
chuanweizhang2013 a4c4c14c3c remove change project fecture 2014-07-14 19:31:32 -07:00
chuanweizhang2013 6098531fd4 add set window top 2014-07-14 19:26:24 -07:00
chuanweizhang2013 3788df5e53 add support program to top 2014-07-14 16:23:57 +08:00
chuanweizhang2013 1db6daa60a modify lua template source code 2014-07-14 13:58:21 +08:00
chuanweizhang2013 b8767420db Add support keep screen on when is debug 2014-07-12 16:29:39 +08:00
chuanweizhang2013 d4834202b5 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-12 14:55:29 +08:00
chuanweizhang2013 f22ae76c58 modify version num 2014-07-12 14:50:23 +08:00
chuanweizhang2013 e1d6e5aec3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-12 14:39:21 +08:00
chuanweizhang2013 11838f20f4 fixed release error 2014-07-11 23:14:32 -07:00
cocoscodeide 4a63f29f8a Merge pull request #48 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-07-12 11:48:43 +08:00
chuanweizhang2013 56a95a2e52 move setDisplayStats function 2014-07-12 11:42:39 +08: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
chuanweizhang2013 683ba200f5 move getIPAddress function 2014-07-11 11:34:15 +08:00
chuanweizhang2013 0c6383ecfe Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-11 10:42:44 +08:00
chuanweizhang2013 ca6bff963d fixed transfor file error which size is 0 2014-07-11 10:38:55 +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
chuanweizhang2013 bad371fbf0 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-04 02:33:51 -07:00
chuanweizhang2013 d7bf9598f1 version1.2 2014-07-04 02:31:13 -07:00
chuanweizhang2013 39b03de8a9 revert Android.mk 2014-07-04 15:39:07 +08:00