James Chen
|
49ca35fc3d
|
Merge pull request #4956 from dumganhar/move-temp-obj
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
|
2014-01-06 23:58:42 -08:00 |
CocosRobot
|
f8e7f570f3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 07:54:58 +00:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
James Chen
|
2a3481f20c
|
Moves temp files to CURRENT_BINARY_DIR.
|
2014-01-06 23:44:36 -08:00 |
Zhe Wang
|
9b6027d284
|
Merge pull request #4947 from walzer/develop
udpate copyrights for the new year 2014 and Chukong.
|
2014-01-06 19:50:18 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
CocosRobot
|
641255e3ef
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 03:25:39 +00:00 |
boyu0
|
f7c88a8134
|
issue #3401: update cmake project set
|
2014-01-07 11:09:40 +08:00 |
boyu0
|
8e64ef6d6d
|
issue #3401: add physics lua auto generate to android.mk
|
2014-01-07 10:20:59 +08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
samuele3hu
|
c553fd2b73
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 10:10:17 +08:00 |
samuele3hu
|
01013195d3
|
Fix:Resolve the release lua test sample compile error
|
2014-01-07 10:08:58 +08:00 |
boyu0
|
eaa3041a97
|
issue #3401: physical lua banding script, add testlua->physics test
|
2014-01-06 22:19:40 +08:00 |
James Chen
|
1bd0f90437
|
Warning fix in js_manual_conversions.cpp/h
|
2014-01-06 20:02:01 +08:00 |
CocosRobot
|
cc4bee319c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-05 10:43:05 +00:00 |
CocosRobot
|
5f8d4f867c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-05 05:52:52 +00:00 |
CocosRobot
|
f44775b581
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 14:05:19 +00:00 |
CocosRobot
|
0b2926cb70
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 11:09:00 +00:00 |
samuele3hu
|
362c1dc0ea
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 18:37:34 +08:00 |
samuele3hu
|
465aba951c
|
Fix:Remove the ScollView and TableView of extension gui lua binding
|
2014-01-04 18:36:33 +08:00 |
CocosRobot
|
c793f2e0fc
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 10:19:07 +00:00 |
samuele3hu
|
70ee13e2e1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 15:46:27 +08:00 |
samuele3hu
|
0550ec33ad
|
Fix:Resolve the bugs that some lua test cases can’t run
|
2014-01-04 15:46:04 +08:00 |
CocosRobot
|
ad11468b7b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 07:40:50 +00:00 |
James Chen
|
98346474b8
|
Merge pull request #4863 from Dhilan007/develop_crash
fix compiling error and miss file on vs.
|
2014-01-03 20:41:19 -08:00 |
Dhilan007
|
35246b0810
|
fix compiling error and miss file on vs.
|
2014-01-04 12:25:12 +08:00 |
CocosRobot
|
e42f721c6b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 04:22:17 +00:00 |
CocosRobot
|
d29cdb5b52
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 03:58:44 +00:00 |
CocosRobot
|
0ed307a583
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 02:58:59 +00:00 |
James Chen
|
f3eb21e748
|
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
|
2014-01-03 18:51:16 -08:00 |
James Chen
|
61af958976
|
closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings.
|
2014-01-04 10:32:04 +08:00 |
James Chen
|
baeacaddfc
|
closed #3579: Bug fix in setTouchEnabledForLayer for luabindings.
Also fixed lua module error.
|
2014-01-04 10:30:11 +08:00 |
CocosRobot
|
54ee3392fc
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 01:40:17 +00:00 |
Dhilan007
|
e017609fc4
|
fix compiling error in jsb_cocos2dx_studio_manual.cpp on android.
|
2014-01-03 23:59:05 +08:00 |
Dhilan007
|
b6e676caa4
|
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
|
2014-01-03 23:03:48 +08:00 |
Dhilan007
|
b4d392dc38
|
update js binding for studio change.
|
2014-01-03 21:33:48 +08:00 |
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 |
boyu0
|
0a06d93328
|
issue #3401: physical lua banding script and auto script
|
2014-01-02 11:45:11 +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 |
James Chen
|
bf881f3ac0
|
Merge pull request #4691 from samuele3hu/DispatcherBak1
Reconstruct the operation of handling lua script event
|
2013-12-27 03:58:08 -08:00 |
CocosRobot
|
0116866e58
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-27 10:16:22 +00:00 |
CocosRobot
|
68cf83ee7d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-27 09:55:01 +00:00 |
chengstory
|
faaf6d3f2b
|
fixed #3457 fixes some bug.
|
2013-12-27 17:21:13 +08:00 |
samuele3hu
|
ee7aa0f077
|
Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug
|
2013-12-27 12:05:12 +08:00 |
samuele3hu
|
d51440f62a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
|
2013-12-27 11:17:11 +08:00 |
samuele3hu
|
6d9e865f15
|
Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong
|
2013-12-27 10:35:44 +08:00 |
CocosRobot
|
edeeae4ff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 14:48:08 +00:00 |
James Chen
|
17ff6ef764
|
Renames: IntValueMap —> ValueMapIntKey
|
2013-12-26 22:07:20 +08:00 |
James Chen
|
93ed5a4f0f
|
long --> ssize_t for TableView callback.
|
2013-12-26 04:09:24 -08:00 |
samuele3hu
|
756a72cbca
|
Reconstruct the operation of handling lua script event
|
2013-12-26 19:43:49 +08:00 |
CocosRobot
|
50a379b8f0
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 09:04:04 +00:00 |
CocosRobot
|
09996ea82c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 08:20:26 +00:00 |