boyu0
dec749a692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-31 18:20:32 +08:00
boyu0
2efef34144
issue #2771 : fix vs compile errors
2013-10-31 18:18:02 +08:00
Dhilan007
b8faaeba59
issus #2893:improve new label
2013-10-31 17:52:22 +08:00
2youyou2
4eaaaddc34
upload resource
2013-10-31 17:29:03 +08:00
2youyou2
005d3c0121
1. fix if frame event is at the last frame, it may emit event several times
...
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
2013-10-31 17:28:14 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
samuelhu
80c29b5a9c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLabelTTF
2013-10-31 17:01:43 +08:00
samuelhu
15cf519757
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
2013-10-31 16:59:55 +08:00
James Chen
ca4c181e4a
Merge pull request #4036 from dumganhar/develop
...
closed #3093 : [JSB] The last test of OpenglTest crashes on Windows.
2013-10-31 01:43:55 -07:00
James Chen
4b2429186c
closed #3093 : The last test of OpenglTest crashes on Windows.
2013-10-31 16:27:00 +08:00
minggo
2c2cdd08dc
Merge pull request #4034 from samuele3hu/developLuaOcBridge
...
issue #2794:Add LuaObjectCBridge and related test sample
2013-10-31 01:14:59 -07:00
Nite Luo
771844fc58
Fix android build after adding MouseEvent and MouseTest
2013-10-31 00:40:38 -07:00
samuelhu
705da20ee7
issue #2794:Add LuaObjectCBridge and related test sample
2013-10-31 15:26:38 +08:00
samuelhu
de4b4dcc73
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge
2013-10-31 15:23:25 +08:00
samuelhu
faf3b30e9b
issue #3069:Add LuaObjectCBridge and related test sample
2013-10-31 15:20:53 +08:00
James Chen
f478e2d2a5
issue #2826 : Bug fixes for win32.
2013-10-31 15:15:52 +08:00
James Chen
6f978c5cbd
issue #2826 : Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro.
2013-10-31 15:13:49 +08:00
Nite Luo
49a2acfbd4
Merge branch 'develop' into mousewheel_mac
2013-10-31 00:10:45 -07:00
Nite Luo
a27975763f
Add MouseEvent to win32 build
2013-10-31 00:04:39 -07:00
James Chen
77de0b580a
Merge pull request #4033 from dingpinglv/Iss3048_cc.rect
...
Closed #3048 : cc.rect can receiving different type parameters now
2013-10-30 23:52:48 -07:00
dingpinglv
7e8faed7af
fixed #3048 : rename some comments
2013-10-31 14:36:17 +08:00
dingpinglv
f172abbc14
fixed #3048 : add some comments for cc.rect
2013-10-31 14:31:25 +08:00
Nite Luo
fe04448c8d
Merge folder changes from develop
2013-10-30 23:19:36 -07:00
dingpinglv
c116d070d3
Closed #3048 : cc.rect can receiving different type parameters now
2013-10-31 14:16:42 +08:00
James Chen
69b0206018
issue #2826 : Updating vs project to link mozjs-25.lib
2013-10-31 11:24:43 +08:00
James Chen
0f7a99f898
[sp v25] Don't use 'using namespace std;' to make android build happy.
2013-10-31 11:15:18 +08:00
James Chen
541a0478ac
[sp v25] Removing unused comments in main.js
2013-10-31 11:15:18 +08:00
James Chen
d2fc29dbfa
[sp v25] Updating Debugger script.
2013-10-31 11:15:17 +08:00
James Chen
a81998ccf6
[sp v25] Debugger script, loading file is ok.
2013-10-31 11:15:17 +08:00
James Chen
d1b88b0a78
[sp v25] Updating auto-generated and bindings-generated submodules.
2013-10-31 11:15:17 +08:00
James Chen
3b86d6398f
[sp v25] Fixing complication errors after updating Spidermonkey to v25.
2013-10-31 11:15:17 +08:00
James Chen
379bcb194c
[sp v25] Updating SpiderMonkey library to FFv25.
2013-10-31 11:15:16 +08:00
James Chen
bacf07643a
Merge pull request #4032 from Dhilan007/vs-config
...
perfect vs-project configuration
2013-10-30 19:54:40 -07:00
Dhilan007
a68d92ff5a
perfect vs-project configuration
2013-10-31 10:51:38 +08:00
Dhilan007
12db6a32ab
issues #2893 :
...
1.Texture atlas are create on demand, based on the characters used in the label.
2.Create Quads (and not sprites) for each letter.
2013-10-31 10:49:37 +08:00
James Chen
7bd9cc28ea
Merge pull request #4031 from samuele3hu/developTouchEvent
...
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-30 18:59:44 -07:00
samuelhu
53b0bfc27b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTouchEvent
2013-10-31 09:52:01 +08:00
samuelhu
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
Nite Luo
f0a262f511
Add AppCode project files to ignore list
2013-10-30 17:03:59 -07:00
minggo
5d931dab64
Update CHANGELOG
2013-10-30 18:31:59 +08:00
minggo
9e5420c954
Merge pull request #4029 from minggo/iss2905-adjust_folder
...
use build/android-build to build android samples, and update readme
2013-10-30 03:30:03 -07:00
minggo
da9f7c912b
use build/android-build to build android samples, and update readme
2013-10-30 18:27:56 +08:00
boyu0
e8d06496d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-30 17:27:09 +08:00
lite3
21d7dcaf3a
add some options
...
Usage: android_mk_generator.py [options]
Options:
-h, --help show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
2013-10-30 16:44:21 +08:00
lite3
51f30a01d5
replace os.path.samefile
...
os.path.samefile not work at windows.
2013-10-30 16:43:19 +08:00
boyu0
391cda44ef
issue #2771 : edit listener
2013-10-30 15:53:58 +08:00
minggo
93cde4d814
Merge pull request #4027 from minggo/iss2905-adjust_folder
...
add script to build android samples
2013-10-29 23:22:26 -07:00
minggo
4d9b05a67d
add script to build android samples
2013-10-30 14:19:07 +08:00
yinkaile
cf2f939918
upload resource
2013-10-30 13:44:27 +08:00
yinkaile
80b97be6f4
update develop
2013-10-30 11:34:16 +08:00