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 |
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 |
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 |
samuelhu
|
c08a09a7e0
|
#3049:Add LICENSE_JSON4LUA and some constant values.
|
2013-10-30 10:52:04 +08:00 |
yinkaile
|
ef973b5737
|
upload resource
|
2013-10-30 09:54:05 +08:00 |
yinkaile
|
8fa8b9f844
|
update develop
|
2013-10-30 09:41:40 +08:00 |
samuelhu
|
471bbb8af9
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 18:21:15 +08:00 |
samuelhu
|
663b27d1e7
|
#3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 18:06:02 +08:00 |
samuelhu
|
b611177a65
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
|
2013-10-29 17:58:00 +08:00 |
samuelhu
|
70082ddc29
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 17:54:35 +08:00 |
boyu0
|
cae9a3e54f
|
issue #2771: add physics pump demo and fix bugs
|
2013-10-29 17:31:35 +08:00 |
yinkaile
|
2d3df69982
|
fix add display
|
2013-10-29 16:57:06 +08:00 |
James Chen
|
5c8424423e
|
issue #3069: Update ios/CCDevice.mm.
|
2013-10-29 16:29:29 +08:00 |
James Chen
|
e2ce714463
|
issue #3069: Update device.mm for iOS.
|
2013-10-29 16:20:42 +08:00 |
yinkaile
|
dfc40d354e
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Conflicts:
extensions/CocoStudio/Armature/CCArmature.cpp
extensions/CocoStudio/Armature/CCBone.cpp
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/display/CCDisplayManager.cpp
extensions/CocoStudio/Armature/display/CCSkin.cpp
extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
|
2013-10-29 16:18:00 +08:00 |
yinkaile
|
e524c3de5c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
extensions/Android.mk
|
2013-10-29 16:13:35 +08:00 |
James Chen
|
ca598f29eb
|
Merge pull request #4008 from dumganhar/touchevent-refactor
issue #3069: Refactor and Improve EventDispatcher
|
2013-10-29 00:46:56 -07:00 |
James Chen
|
91932ea906
|
issue #3069: Fixing compilation errors.
|
2013-10-29 15:36:43 +08:00 |
James Chen
|
bb568e84e8
|
Updating auto generated binding codes.
|
2013-10-29 15:09:13 +08:00 |
James Chen
|
fbd04a476a
|
issue #3069: Updating comments in CCEventListenerCustom.h.
|
2013-10-29 15:02:26 +08:00 |
James Chen
|
01579e12b0
|
issue #3069: Remove unused ID.
|
2013-10-29 15:01:39 +08:00 |
James Chen
|
cb7a762584
|
issue #3069: Updating EventDispatcherTest.
|
2013-10-29 14:59:05 +08:00 |
James Chen
|
5698dcd0e1
|
issue #3069: Protecting some methods in EventListener, make EventDispatcher as its friend class.
|
2013-10-29 14:58:47 +08:00 |
James Chen
|
296978a9be
|
issue #3069: Separate 'EventDispatcher::removeEventListeners' to 'removeEventListeners' and 'removeCustomEventListeners'.
|
2013-10-29 14:57:16 +08:00 |
samuelhu
|
3508213615
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-29 11:45:19 +08:00 |
samuelhu
|
a4d028e905
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 11:40:41 +08:00 |