zilongshanren
|
88513ce021
|
Merge pull request #15142 from CocosRobot/update_cocosfiles_1456796270
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-03-01 09:40:05 +08:00 |
CocosRobot
|
fe979c6fdd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-03-01 01:37:51 +00:00 |
zilongshanren
|
4dcbf4c263
|
Merge pull request #15133 from cocos2d/walzer-patch-1
Fix typos in CCRenderTexture.cpp comments
|
2016-03-01 09:30:07 +08:00 |
zilongshanren
|
af72a5aeee
|
Merge pull request #15140 from CocosRobot/update_cocosfiles_1456791796
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-03-01 09:29:42 +08:00 |
zilongshanren
|
43740bdff3
|
Merge pull request #15141 from CocosRobot/update_lua_bindings_1456791921
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-01 09:29:31 +08:00 |
CocosRobot
|
56fa8fa759
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-01 00:27:33 +00:00 |
CocosRobot
|
e6b727d94d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-03-01 00:23:18 +00:00 |
Ricardo Quesada
|
25cf1f103b
|
Merge pull request #15138 from ricardoquesada/chipmunk_v7_squashed
Upgrades to Chipmunk v7.0.1
|
2016-02-29 16:06:27 -08:00 |
Ricardo Quesada
|
248978bac1
|
force multiple for windowsphone
|
2016-02-29 15:23:22 -08:00 |
Ricardo Quesada
|
5c8d35e484
|
removes dead code
|
2016-02-29 14:02:21 -08:00 |
Ricardo Quesada
|
bc11e24019
|
Squashed commit of the following:
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 09:37:24 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Feb 27 01:11:13 2016 -0800
correct paths for win8.1
commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 22:46:58 2016 -0800
projects works on win32
commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:57:10 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:26:55 2016 -0800
trying to make it compile on win32
commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 10:28:12 2016 -0800
quick hack to make it compile...
...autogenerated files will fix it.
commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 09:20:59 2016 -0800
Squashed commit of the following:
commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 20:10:13 2016 -0800
compiles.. sort of
commit a7990e2888d5ef1e43b811148b23c0b899105ab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:55:24 2016 -0800
more chipmunk fixes
commit 1174f6ec8201324161d7946af0f493b136a56690
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:36:15 2016 -0800
more chipmunk fixes
commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
Merge: f942c5a 0594d3c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:29:27 2016 -0800
Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed
commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:28:51 2016 -0800
correct path for chipmunk
commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 18:44:05 2016 -0800
compiles on ios
commit 379503399c384ad77d25d68a2f83b71a829b1c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:51:36 2016 -0800
chipmunk include fixes
commit 95839fb7b406a32255853294b016d8c15aec1ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:09:04 2016 -0800
fixes for cmake + mac
commit 39449ea3b7efccae2946785c1c11433d964ee480
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:51:25 2016 -0800
correct includes
commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:35:40 2016 -0800
fixes chipmunk with cmake
commit 337f21f9466703722847635301d841ace9b757cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:42:01 2016 -0800
updates android and linux projects
commit 7111a9993b97f78cf73206804b25665c21a59ca8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:18:26 2016 -0800
cosmetic changes
commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:53:41 2016 -0800
chipmunk autogenerated files
commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:47:41 2016 -0800
compatibility both in JS (to reduce space)
and in C for (C++ users)
commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:10:02 2016 -0800
mooooore fixes
commit 9ab23014093677e8eda69b105f50410b8c792aa3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:30:58 2016 -0800
doesn't crash with collision handler
commit 69275a16817a038244bbaaff9e82a011b6729cb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:16:29 2016 -0800
adds missing space functions
commit a6b97bbc76cb9ab293356bb7451cfa858353f589
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 22:22:27 2016 -0800
queries... better
commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 19:48:41 2016 -0800
adds more missing functions
fixes other chipmunk JS issues
commit 3797a033896d059da58a05ce0de832ed9c150eff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 18:30:21 2016 -0800
yep... poly works ok
commit d1bb57776891605b9d3e4fb90736c6869d96b944
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:29 2016 -0800
neede compat files
commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:04 2016 -0800
query working!
commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:57:03 2016 -0800
almost there
commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:18:46 2016 -0800
fixes return values
commit 7218778da846e1e36a510c0a19a5ee76f91db032
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 20:36:14 2016 -0800
cpMomentForSegment is manual since parameter 4 is optional
in chipmunk 6, but not in 7
commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 17:29:28 2016 -0800
yeah... process the arguments correctly
works both for functions and auto_classes
commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 16:49:00 2016 -0800
compiles and links
fixes some issues with the queries.
returns shapes instad of the queryInfo
commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 15:03:18 2016 -0800
adds removeCollisionHandler and other fixes
commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 18 20:59:24 2016 -0800
compiles... doesn't work yet
commit bd64de81713fb2d7652a538d667d73f05f5d9320
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 17 18:17:39 2016 -0800
WIP: chipmunk bindings
|
2016-02-29 13:53:00 -08:00 |
zilongshanren
|
a839d5818e
|
add horizontal cell reuse ListView
|
2016-03-01 00:07:49 +08:00 |
James Chen
|
48e7d70d9d
|
Removes unused include in CCDirector.cpp
|
2016-02-29 18:58:17 +08:00 |
James Chen
|
037051d9c4
|
Closes websocket connection by dispatching a 'resetDirector' event.
|
2016-02-29 18:55:51 +08:00 |
beichen.liu
|
fe917e00fc
|
Add language localization support for Button, Text, TextField and TextBMFont.
|
2016-02-29 18:00:14 +08:00 |
xiaofeng11
|
8bf3d33c09
|
Merge pull request #15130 from chengstory/AddUseLocalScriptCommand
Add "-use-local-script" command param.
It's OK for me, merged.
|
2016-02-29 17:09:36 +08:00 |
Zhe Wang
|
1fbef195a3
|
Fix typos in CCRenderTexture.cpp commnets
Qualcomm Andreno GPU -> Adreno GPU
|
2016-02-29 16:22:56 +08:00 |
mogemimi
|
2a8d84e7f9
|
Remove unnecessary const from return types
|
2016-02-29 16:48:07 +09:00 |
zhangcheng
|
c449f61124
|
Add "-use-local-script" command to control whether to load js script files from simulator local directory.
|
2016-02-29 13:53:49 +08:00 |
肖峰
|
6b4a0f808f
|
Add cocostudio localization editor export data parser and demo
|
2016-02-26 17:15:24 +08:00 |
zilongshanren
|
9af2f4e73a
|
Merge pull request #15118 from CocosRobot/update_lua_bindings_1456452560
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-26 14:49:38 +08:00 |
CocosRobot
|
78c99e33e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-26 02:11:26 +00:00 |
zilongshanren
|
32d6762c72
|
Merge pull request #15116 from mogemimi/fix-function-name
Fix typo of function name in AsyncTaskPool
|
2016-02-26 10:00:47 +08:00 |
mogemimi
|
5de611b4b5
|
Fix typo of function name in AsyncTaskPool
|
2016-02-26 00:22:46 +09:00 |
zilongshanren
|
c7ced7d388
|
Merge pull request #15105 from xiaofeng11/v3_updateDeps
update dept lib
|
2016-02-25 18:24:29 +08:00 |
XiaoFeng
|
9cec9c61d1
|
update dept lib
|
2016-02-25 17:49:44 +08:00 |
pandamicro
|
e991282ed8
|
Merge pull request #15109 from dongtaohan/v3
exported api for Cocos Studio.
|
2016-02-25 14:35:57 +08:00 |
zilongshanren
|
699b76c738
|
Merge pull request #15114 from CocosRobot/update_lua_bindings_1456379985
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-25 14:02:15 +08:00 |
CocosRobot
|
9a11556f4b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-25 06:01:49 +00:00 |
xiaofeng11
|
c3eeb7c6b9
|
Merge pull request #15113 from zilongshanren/improve-node-api-docs
improve the api doc for node.
|
2016-02-25 13:56:23 +08:00 |
zilongshanren
|
8f05f33a01
|
Merge pull request #15112 from zilongshanren/improve-editbox-mac
improve mac editbox
|
2016-02-25 11:44:52 +08:00 |
zilongshanren
|
c56835d743
|
improve the api doc for node.
fixes https://github.com/cocos2d/cocos2d-x/issues/15100
|
2016-02-25 11:43:36 +08:00 |
zilongshanren
|
92dca220ce
|
improve mac editbox
|
2016-02-25 11:05:18 +08:00 |
dongtao.han
|
34b1c1bc18
|
exported js_get_type_from_native for cocos2d::Node type.
|
2016-02-25 09:47:19 +08:00 |
dongtao.han
|
7955721cb9
|
exported api.
|
2016-02-25 09:46:34 +08:00 |
zilongshanren
|
ffe960c995
|
Merge pull request #15103 from CocosRobot/update_cocosfiles_1456299803
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-02-24 15:46:08 +08:00 |
CocosRobot
|
a95a4f49f8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-02-24 07:43:24 +00:00 |
xiaofeng11
|
8176b7e69d
|
Merge pull request #15102 from FrostPolaris/v3
Add FlatBuffers serialize function for language data used in Cocos Studio.
|
2016-02-24 15:41:26 +08:00 |
beichen.liu
|
f1d8a28b96
|
Add FlatBuffers serialize function for language data used in Cocos Studio.
|
2016-02-24 14:59:37 +08:00 |
zilongshanren
|
1a537488dd
|
Merge pull request #15095 from CocosRobot/update_cocosfiles_1456067005
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-02-23 15:51:13 +08:00 |
CocosRobot
|
303cce24e3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-02-21 15:03:26 +00:00 |
Ricardo Quesada
|
37db8407f1
|
Merge pull request #14867 from dumganhar/refactor-websocket
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
|
2016-02-21 06:59:59 -08:00 |
pandamicro
|
7607382440
|
Merge pull request #15094 from pandamicro/v3
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
|
2016-02-21 20:58:21 +08:00 |
pandamicro
|
6e8c46d0be
|
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
|
2016-02-21 20:20:32 +08:00 |
zilongshanren
|
d28acbf2fe
|
Merge pull request #13906 from perminovVS/unzopen-use-getsuitablefopen
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
|
2016-02-19 15:36:06 +08:00 |
zilongshanren
|
5072e11bac
|
Merge pull request #15069 from chengstory/FixRealBoolValueError
Fix value type error when read value of bool type from .plist file.
|
2016-02-19 14:07:29 +08:00 |
zilongshanren
|
dbb10d73e1
|
Merge pull request #15051 from Shulepov/fix_drawing_in_incorrect_app_states_iOS
Fix drawing in incorrect app states on iOS
|
2016-02-19 14:00:37 +08:00 |
zilongshanren
|
a038666a1f
|
Merge pull request #15088 from CocosRobot/update_lua_bindings_1455848042
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-19 10:23:28 +08:00 |
zilongshanren
|
a2a891458a
|
Merge pull request #15089 from CocosRobot/update_lua_bindings_1455848255
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-19 10:23:17 +08:00 |
CocosRobot
|
b2fd4b0c32
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-19 02:19:55 +00:00 |