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

646 Commits

Author SHA1 Message Date
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
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 31aa374fe8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-16 18:20:44 +08:00
chuanweizhang2013 f55b9422f6 fixed living code bug 2014-07-16 18:19:33 +08:00
Dale Stammen d0c15bc1d8 updated cpp template to support EVENT_RENDERER_RECREATED 2014-07-15 07:23:40 -07:00
chuanweizhang2013 53fde9d7c6 add support x86 atomicops_internals_x86_gcc 2014-07-15 17:40:43 +08:00
CocosRobot c1bb801dc5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 09:06:46 +00:00
chuanweizhang2013 445409c1aa remove comment 2014-07-15 15:56:31 +08:00
chuanweizhang2013 9334863da6 Merge pull request #30 from cocos2d/v3 
update cocos2d-x
 2014-07-15 15:26:01 +08:00
chuanweizhang2013 0346fccbc3 fixed bug runtime 2014-07-15 15:07:01 +08:00
CocosRobot d90effbe09 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 05:46:51 +00:00
chuanweizhang2013 03982a7f6e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-15 10:34:00 +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
Ricardo Quesada cc0a27e83e default OS Target for OS X is 10.7 2014-07-14 18:39:36 -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
minggo 62b9c72609 Merge pull request #7281 from aslmaswd/v3-cmake 
CMake Fix:GLFW header
 2014-07-14 11:18:51 +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
CocosRobot 4b9ce2e663 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 11:11:12 +00:00
chuanweizhang2013 47fa341934 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-11 16:19:41 +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
CocosRobot 57827e9465 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 06:14:32 +00: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
CocosRobot 463a2ab5ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 01:43:39 +00:00
CocosRobot e1559c4828 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-10 14:06:29 +00: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
CocosRobot 142ac9a413 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-04 17:07:04 +00: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
chuanweizhang2013 04a9b5c2c6 add setXXTEAKeyAndSign 2014-07-04 13:40:49 +08:00
chuanweizhang2013 e32eadc364 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-04 13:36:51 +08:00
chuanweizhang2013 eb7523e0c6 version.json 2014-07-03 19:56:21 -07:00
chuanweizhang2013 c1e8cc974b add call encript lua function 2014-07-03 19:53:17 -07:00
chuanweizhang2013 d8f01215f0 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-03 16:30:51 +08:00
chuanweizhang2013 10595394e3 copy res when update resource 2014-07-03 01:00:24 -07:00
chuanweizhang2013 9b1771d60e Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-03 00:55:26 -07:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression 
Support regular expression
 2014-07-03 15:20:06 +08:00
chuanweizhang2013 b88b5e4c3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-03 11:13:59 +08:00
minggo d8c9f6a0a6 add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
CocosRobot 0b0b9ccdf3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-02 08:21:52 +00:00
chuanweizhang2013 7eec8fbb3a add arm64 bit support 2014-07-02 11:55:20 +08:00
GS 8a4fab2b1f add another possible GLFW header location 2014-07-02 10:11:51 +08:00
CocosRobot 32c88f6189 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-01 10:04:00 +00:00
CocosRobot 5ab6d5557b [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-01 07:52:35 +00:00
samuele3hu 1bc0397644 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-01 09:47:41 +08:00
chuanweizhang2013 4481149a30 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-06-30 17:53:46 +08:00
CocosRobot 6eb0d3cc86 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-30 09:26:15 +00:00
CocosRobot f06061dfec [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-30 01:42:06 +00:00
CocosRobot c52fe48484 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-29 08:42:40 +00:00
minggo 7f28e81d09 Merge pull request #7226 from super626/v3 
Animation3D
 2014-06-29 16:41:13 +08:00
chuanweizhang2013 a8f4dcb59f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-06-28 18:10:17 +08:00
chuanweizhang2013 e57ea32e58 1.2 template 2014-06-28 18:08:40 +08:00
chuanweizhang2013 618682def4 add ios search path 2014-06-27 18:15:39 +08:00
yangxiao f38f0b00aa fix templates 2014-06-27 18:01:39 +08:00
CocosRobot 054f8c5d11 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-27 08:38:35 +00:00
samuele3hu cfb992e7cf Upate templates project setting 2014-06-27 14:52:32 +08:00
chuanweizhang2013 09d1ee8fcf Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-26 05:02:34 -07:00
chuanweizhang2013 b80d825421 commit 2014-06-26 04:41:54 -07:00
CocosRobot a3de7c00c8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-26 06:40:58 +00:00
Dale Stammen 33e39b5786 added source files for component to be consistent with other platforms templates 2014-06-25 09:51:32 -07:00
Dale Stammen 97d126d300 added source files for component to be consistent with other platforms templates 2014-06-25 09:50:40 -07:00
chuanweizhang2013 cee5754db4 modify mac out file 2014-06-25 19:33:38 +08:00
CocosRobot 486bf9ad12 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-25 09:21:01 +00:00
chuanweizhang2013 0c84dc3e6e modify debug output file to runtime mac folder 2014-06-25 01:11:14 -07:00
chuanweizhang2013 90bd722bd2 remove rtres 2014-06-25 13:42:33 +08:00
chuanweizhang2013 ac539131e2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-06-25 11:39:17 +08:00
chuanweizhang2013 ec0eb7b6d6 modify filetime save formate 2014-06-25 11:36:59 +08:00
CocosRobot 7f104f4bf7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-24 02:47:56 +00:00
CocosRobot cb9e5c2d77 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-24 02:31:03 +00:00
chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/cocos-project-template.json
 2014-06-23 17:30:33 +08:00
chuanweizhang2013 a170342f01 modify release output 2014-06-23 16:56:23 +08:00
zhangbin dd49c4ccbc Solve the error in Xcode project of lua runtime template. 2014-06-23 15:41:58 +08:00
chuanweizhang2013 e1333da7e4 add stubs head 2014-06-23 15:07:49 +08:00
chuanweizhang2013 f283ec69a1 add head 2014-06-23 15:04:28 +08:00
CocosRobot 2c04d00425 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-20 16:25:25 +00:00
chuanweizhang2013 a45056dbd7 add protobuf 2014-06-20 11:32:22 +08:00
CocosRobot ffb96092fd [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-19 13:57:10 +00:00
CocosRobot 54b2a15886 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-19 13:24:14 +00:00
minggo 7553060ba7 Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp 
[ci skip]Add new line at the end of a file to *.[cpp|h]
 2014-06-19 20:47:17 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
gin0606 2c837b0960 add new line at the end of a file to *.mk 2014-06-19 20:43:27 +09:00
chuanweizhang2013 9e62cc9c31 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-06-19 17:28:25 +08:00
chuanweizhang2013 be8775e314 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-06-19 17:23:36 +08:00
chuanweizhang2013 1153531448 add response error 2014-06-19 16:50:16 +08:00
zhangbin 3b19b07915 Modify the lua runtime template for prebuilt engine. 2014-06-19 11:33:39 +08:00
chuanweizhang2013 e1d7871089 add mac android support 2014-06-19 11:27:31 +08:00
zhangbin 1b056b6c49 Remove the debug symbols for release mode in xcode projects. 
Modify the template of lua runtime.
 2014-06-18 17:06:56 +08:00
chuanweizhang2013 69a55e2cfa add protobuf-lite source 2014-06-18 15:43:38 +08:00
CocosRobot 9aeb1510ed [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-18 05:36:54 +00:00
CocosRobot a292f7d063 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 13:09:25 +00:00
minggo 26cca348cb Merge pull request #7085 from super626/v3 
Sprite3D animation
 2014-06-17 21:05:58 +08:00
bofeng-song d97b28db76 modify copy script & modify release version`s outfile addr 2014-06-17 18:17:35 +08:00
CocosRobot 7f9c86ab44 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 05:58:26 +00:00
minggo a2a6a4e70a Merge pull request #7087 from MSOpenTech/wp8-v3-template 
Wp8 v3 template and missing texture after app switch fixes
 2014-06-17 13:49:24 +08:00
CocosRobot 0bbce49012 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 05:38:36 +00:00
Huabing.Xu f0fd7897be update template 2014-06-17 13:25:05 +08:00
Dhilan007 648e7767d4 fixed can't move app to SD card after installed on android. 2014-06-17 12:03:20 +08:00
Dale Stammen 1a5d148d8e updated template code 2014-06-16 10:29:40 -07:00
Dale Stammen 753167b5f2 updated xaml resources 2014-06-16 09:25:35 -07:00
bofeng-song 64f517a1b8 redirect function: setSearchPaths 2014-06-16 14:47:14 +08:00
bofeng-song b3fe030b90 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-06-16 10:07:24 +08:00
bofeng-song bca578c2f8 fix can`t debug vs project normally 2014-06-13 16:34:39 +08:00
cocoscodeide 2d4297d14e Merge pull request #34 from cocos2d/v3 
merge from cocos2d-x
 2014-06-13 14:14:25 +08:00
chuanweizhang2013 2eac73cde3 add protobuf win32 2014-06-13 11:19:04 +08:00
Dale Stammen 2d913470a0 updated fast resume code for app 2014-06-12 16:36:53 -07:00
Dhilan007 5cd7ab97d9 fixed wrong WP8 project name when create project by console. 2014-06-09 16:17:19 +08:00
CocosRobot 70a4fd173c [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-09 03:12:43 +00:00
minggo 24f7c9019a Merge pull request #7005 from andyque/refactorUITouchEvent 
refactor UI framework touch handling
 2014-06-09 11:11:40 +08:00
CocosRobot b2ca17e00b [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-09 02:53:03 +00:00
andyque 1a933807b5 remove UIInterface.h header file 2014-06-09 10:35:54 +08:00
chuanweizhang2013 ddaf8f9ec5 modify play action 2014-06-06 16:24:09 +08:00
Dhilan007 fd4e233432 fixed WP8 project:compile error,missing files,wrong file path. 2014-06-06 15:41:17 +08:00
chuanweizhang2013 f9b747cf1f modify runtime 2014-06-05 18:03:38 +08:00
CocosRobot b218f8ec13 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-05 03:51:15 +00:00
minggo 366beedbb2 Merge pull request #6955 from samuele3hu/v3_fix 
Add xxtea encrypt support for lua and update the console submodule
 2014-06-05 11:49:40 +08:00
CocosRobot bd018ea645 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-04 09:18:03 +00:00
minggo 7a4d46dc1b Merge pull request #6965 from Dhilan007/v3-wp8fix 
Support Fast App Resume and fixed black screen may arise when using third sdk.
 2014-06-04 17:15:13 +08:00
andyque ab8a68f53b fix template 2014-06-04 15:55:52 +08:00
andyque d089b251db fix other platform compile error 2014-06-04 14:56:34 +08:00
Dhilan007 3fcb75c82f Fixed black screen may arise when using third SDK. 2014-06-04 13:54:44 +08:00
samuele3hu c785d64ba1 Adjust the xxtea directory structure and modify configs files for platforms 2014-06-04 11:50:04 +08:00
Dhilan007 52ad2063bd Support Fast App Resume. 2014-06-04 11:19:53 +08:00
samuele3hu 55bb9a7d09 Update setting for different platform 2014-06-03 17:15:28 +08:00
cw 9d14a179db Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-03 11:28:18 +08:00