minggo
|
9c747adbb5
|
Merge pull request #7319 from CocosRobot/update_cocosfiles_1404493623
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-05 01:11:18 +08:00 |
CocosRobot
|
142ac9a413
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-04 17:07:04 +00:00 |
minggo
|
9db0f36c33
|
Merge pull request #7313 from Dhilan007/v3-gc-refactor
issue #4689: Refactoring game controller API.
|
2014-07-05 01:05:48 +08:00 |
Dhilan007
|
2b3de76819
|
add const for getter.
fixed redefinition of 'registerListeners'
|
2014-07-04 23:07:48 +08:00 |
Dhilan007
|
e6c4bb454b
|
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactorClass
|
2014-07-04 22:53:33 +08:00 |
LinWenhai
|
46435952f8
|
Update CCController-android.cpp
|
2014-07-04 21:31:10 +08:00 |
Dhilan007
|
eee26b5029
|
fixed missing function
|
2014-07-04 21:29:30 +08:00 |
LinWenhai
|
2ca5c01902
|
issue #4689: Refactoring game controller API[ios]
|
2014-07-04 21:24:32 +08:00 |
minggo
|
a942aae84f
|
Merge pull request #7316 from cocoscodeide/v3
lua runtime template 1.2
|
2014-07-04 18:33:36 +08:00 |
minggo
|
b710dc590b
|
Merge pull request #7315 from samuele3hu/v3_animation3D
Add Lua bindings for utils and CaptureScreen test case
|
2014-07-04 17:58:18 +08:00 |
LinWenhai
|
27bc3dc640
|
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
|
2014-07-04 17:56:22 +08:00 |
Dhilan007
|
c73a88c4a5
|
Add resources
|
2014-07-04 17:55:20 +08:00 |
cocoscodeide
|
32b8e02370
|
Merge pull request #46 from chuanweizhang2013/v3luaruntime
runtime/config.json zip_file_size
|
2014-07-04 17:36:22 +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 |
yangxiao
|
4304d740b4
|
delete call back
|
2014-07-04 17:22:39 +08:00 |
samuele3hu
|
b68ee428b0
|
Remove useless codes
|
2014-07-04 17:15:34 +08:00 |
LinWenhai
|
3fb02acbde
|
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
|
2014-07-04 17:03:48 +08:00 |
Dhilan007
|
6d48cd9523
|
Refactoring game controller API
|
2014-07-04 17:01:41 +08:00 |
minggo
|
83b7dccdfc
|
Merge pull request #7314 from joshuastray/fix_win_proj
should not include android cpp files in win/wp project
|
2014-07-04 16:51:27 +08:00 |
joshuastray
|
8ab8caf751
|
should not include android cpp files in win/wp project
|
2014-07-04 16:44:10 +08:00 |
samuele3hu
|
4725388646
|
Remove useless codes
|
2014-07-04 16:43:33 +08:00 |
yangxiao
|
e2a49ca9c4
|
Merge branch 'newcode' into v3
|
2014-07-04 16:36:38 +08:00 |
samuele3hu
|
3b23b0c1ff
|
Remove useless codes
|
2014-07-04 16:30:22 +08:00 |
samuele3hu
|
d9ffa33601
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
|
2014-07-04 16:25:53 +08:00 |
samuele3hu
|
85dd2e55bf
|
Add Lua bindings for utils and CaptureScreen test case
|
2014-07-04 16:24:00 +08:00 |
yangxiao
|
0af286c3be
|
fix android background to foreground
|
2014-07-04 16:10:43 +08:00 |
cocoscodeide
|
265ed74649
|
Merge pull request #45 from chuanweizhang2013/v3luaruntime
V3luaruntime
|
2014-07-04 15:55:41 +08:00 |
chuanweizhang2013
|
39b03de8a9
|
revert Android.mk
|
2014-07-04 15:39:07 +08:00 |
LinWenhai
|
992245e744
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
|
2014-07-04 15:29:40 +08:00 |
Dhilan007
|
552a9251c4
|
issue #4689: Refactor controller API.
|
2014-07-04 15:22:53 +08:00 |
minggo
|
8b00e72f33
|
Merge pull request #7311 from andyque/fixWindowsError
fix windows compile and running error
|
2014-07-04 13:44:55 +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 |
andyque
|
c8165bb2d9
|
fix indent problems
|
2014-07-04 11:53:06 +08:00 |
andyque
|
fc3caa1845
|
initialize member variable
|
2014-07-04 11:48:55 +08:00 |
andyque
|
a429182765
|
fix windows compile and running error
|
2014-07-04 11:22:36 +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 |
yangxiao
|
d2cd2449d8
|
adjust code
|
2014-07-04 10:42:02 +08:00 |
boyu0
|
dc81b07998
|
add new line at the end of the file
|
2014-07-04 10:27:24 +08:00 |
boyu0
|
fc994d5ec0
|
add SceneEditorTest for lua
|
2014-07-04 10:08:17 +08:00 |
samuele3hu
|
526d032735
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
|
2014-07-04 09:53:09 +08:00 |
minggo
|
95fe74a34b
|
Merge pull request #7299 from dabingnn/fast_tmx
Fast tmx
|
2014-07-04 09:49:30 +08:00 |
minggo
|
bbf7334731
|
Merge pull request #7303 from heliclei/update-curl-test
Update curl test url
|
2014-07-04 09:48:15 +08:00 |
yangxiao
|
05d20d59d4
|
change position attributes to vec3
|
2014-07-04 09:25:06 +08:00 |
mannewalis
|
4b1f2ccc91
|
prefixing ivars
|
2014-07-03 10:16:10 -07:00 |
mannewalis
|
96605f801c
|
prefixing ivars
|
2014-07-03 10:13:46 -07:00 |
mannewalis
|
69341095fe
|
adding accessors to the on*Callback variables
|
2014-07-03 09:13:52 -07:00 |
mannewalis
|
92e08265cd
|
changes needed for swift bindings to work
|
2014-07-03 08:42:06 -07:00 |