CocosRobot
|
126c315673
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-03 11:32:54 +00:00 |
CocosRobot
|
37c8b03253
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-03 08:37:25 +00:00 |
James Chen
|
5346677a47
|
Merge pull request #4825 from samuele3hu/developNewUI
Update the lua test cases about the armature
|
2014-01-03 00:29:24 -08:00 |
Dhilan007
|
8e2c51d31e
|
update vs project for split spine binding.
|
2014-01-03 15:29:50 +08:00 |
samuele3hu
|
a72cf0428c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 14:53:15 +08:00 |
samuele3hu
|
2b19da00df
|
Update the lua test cases about the armature
|
2014-01-03 14:51:36 +08:00 |
CocosRobot
|
0661d87cdb
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-03 05:02:28 +00:00 |
samuele3hu
|
53f2415fcf
|
Resolve the android compile error
|
2014-01-03 11:29:56 +08:00 |
samuele3hu
|
51e3e3fd1b
|
Resolve the android and linux compile error
|
2014-01-03 11:15:46 +08:00 |
samuele3hu
|
bfc7441453
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 10:51:05 +08:00 |
samuele3hu
|
cdc82d6e8c
|
Add a newline
|
2014-01-03 10:50:06 +08:00 |
samuele3hu
|
c4588722dd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 10:41:03 +08:00 |
samuele3hu
|
07a3efb585
|
Update the lua test cases about the GUI
|
2014-01-03 10:39:19 +08:00 |
James Chen
|
04760f2508
|
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
|
2014-01-03 10:30:55 +08:00 |
James Chen
|
831e0b08e0
|
Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
|
2014-01-02 06:46:25 -08:00 |
CocosRobot
|
c120394cae
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 14:20:27 +00:00 |
James Chen
|
e337fb35fc
|
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
|
2014-01-02 21:59:47 +08:00 |
minggo
|
d345139a08
|
fix compiling errors
|
2014-01-02 21:53:18 +08:00 |
minggo
|
674b38beef
|
no in header file
|
2014-01-02 21:43:27 +08:00 |
minggo
|
2b5be1bacf
|
Merge pull request #4801 from minggo/namespace
fix compiling errors because of new namespace of network module
|
2014-01-02 04:03:03 -08:00 |
minggo
|
9124f189c3
|
fix compiling errors because of new namespace of network module
|
2014-01-02 19:44:46 +08:00 |
CocosRobot
|
1c5638ad4f
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 11:36:25 +00:00 |
James Chen
|
c29e328490
|
Merge pull request #4779 from samuele3hu/DispatcherBak1
Develop branch adds lua trigger for CocoStudio
|
2014-01-02 00:29:30 -08:00 |
James Chen
|
67c5ba8dfb
|
closed #3565: Adds missing `lua_pop`to prevent lua stack issues.
|
2014-01-02 16:21:35 +08:00 |
Kenneth Chan
|
80df88d2cf
|
Add missing bindings to setBlendFunc for various classes
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
|
2014-01-02 16:21:35 +08:00 |
samuele3hu
|
d802518413
|
Rename Cocos2dStudio.lua to CocoStudio.lua
|
2014-01-02 15:51:25 +08:00 |
samuele3hu
|
a2b706c87c
|
Rename some common script files to keep consistent
|
2014-01-02 15:18:32 +08:00 |
CocosRobot
|
c6425172b7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 06:58:15 +00:00 |
CocosRobot
|
ada5eb82ec
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-02 06:49:06 +00:00 |
James Chen
|
dd54e906f0
|
ccs.XXX —> ccui.XXX for gui js bindings.
|
2014-01-02 14:21:24 +08:00 |
samuele3hu
|
b8d4010ae5
|
Develop branch adds lua trigger for CocoStudio
|
2014-01-02 12:00:37 +08:00 |
CocosRobot
|
ff550bf865
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-01 13:49:57 +00:00 |
James Chen
|
8c1c9fef15
|
Bug fix in cc.VisibleRect
|
2013-12-31 18:17:20 +08:00 |
James Chen
|
74a7f68dc1
|
[JSB] Adds cc.VisibleRect.
|
2013-12-31 18:12:42 +08:00 |
CocosRobot
|
2555318c13
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-31 03:36:47 +00:00 |
CocosRobot
|
674804f1b4
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-30 13:49:19 +00:00 |
James Chen
|
1d8ee016e5
|
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
closed #2050: fix tilemap firstgid bug
|
2013-12-30 05:42:19 -08:00 |
James Chen
|
edb2ad0933
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
Conflicts:
cocos/editor-support/cocostudio/TriggerMng.cpp
|
2013-12-30 21:06:57 +08:00 |
James Chen
|
165e6c2a78
|
Adds an empty LuaEngine::parseConfig function.
|
2013-12-30 21:04:00 +08:00 |
James Chen
|
1edf748dc3
|
[JSB] Adds trigger bindings for CocoStudio.
|
2013-12-30 20:57:46 +08:00 |
minggo
|
714af52e0c
|
Merge pull request #4732 from Dhilan007/update_vs_project
fix compiling error on liblua VS 2012 project
|
2013-12-29 23:24:01 -08:00 |
Dhilan007
|
30b3a6f8c3
|
fix compiling error on liblua VS 2012 project
|
2013-12-30 14:21:32 +08:00 |
CocosRobot
|
a269fba371
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-30 05:58:34 +00:00 |
boyu0
|
1f72fafd08
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
|
2013-12-30 12:30:59 +08:00 |
CocosRobot
|
203b0f183e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-28 06:59:45 +00:00 |
CocosRobot
|
2051041df7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-27 13:12:17 +00:00 |
James Chen
|
0d16f7bc3b
|
Merge pull request #4712 from dumganhar/cocostudio-test
Merge PR #4672: We need to replace trigger system by EventDispatcher in future.
|
2013-12-27 05:05:41 -08:00 |
James Chen
|
b03c8259b1
|
Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test
Conflicts:
cocos/scripting/auto-generated
|
2013-12-27 20:18:58 +08:00 |
samuele3hu
|
aa0eb36071
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
|
2013-12-27 20:08:09 +08:00 |
samuele3hu
|
30439e4689
|
Improve the coding style
|
2013-12-27 20:07:00 +08:00 |