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 |
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 |