minggo
|
6d80de181a
|
revert binding-generators to correct commit
|
2014-06-19 17:39:14 +08:00 |
Mircea Rila
|
69f1bb6193
|
fix warning Uniform is struct, not class.
|
2014-06-19 11:46:00 +03:00 |
minggo
|
b042f28ccd
|
Merge pull request #7138 from minggo/v3
revert bindings-generator submodule
|
2014-06-19 16:04:13 +08:00 |
minggo
|
07d86d40ef
|
revert bindings-generator submodule
|
2014-06-19 16:03:19 +08:00 |
lvlong
|
8493c4579b
|
before switch branch save
|
2014-06-19 15:43:02 +08:00 |
minggo
|
a549fdccdc
|
Merge pull request #7134 from samuele3hu/v3_keypad_fix
Update bindings-generator
|
2014-06-19 15:28:43 +08:00 |
CocosRobot
|
c638cb8816
|
[AUTO]: updating luabinding automatically
|
2014-06-19 07:22:49 +00:00 |
minggo
|
1a241ca350
|
Merge pull request #7135 from minggo/orrderOfArrival
not set _orderOfArrival to 0 after visit
|
2014-06-19 15:17:55 +08:00 |
minggo
|
136033c282
|
not set _orderOfArrival to 0 after visit
|
2014-06-19 15:09:27 +08:00 |
minggo
|
cecd96105e
|
Merge pull request #7132 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-06-19 14:49:20 +08:00 |
zhangbin
|
bd6aed8a7b
|
Update the reference of submodule cocos2d-console.
|
2014-06-19 14:47:16 +08:00 |
samuele3hu
|
477816e883
|
update bindings-generator submodule
|
2014-06-19 14:42:09 +08:00 |
samuele3hu
|
46ce1c917d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-19 14:37:00 +08:00 |
2youyou2
|
0ce51162af
|
support Label widget
|
2014-06-19 14:11:37 +08:00 |
yangxiao
|
c5bb10e5f4
|
add comments
|
2014-06-19 14:11:14 +08:00 |
yangxiao
|
4db0bea73f
|
bone original pose
|
2014-06-19 12:01:03 +08:00 |
minggo
|
dff3feeeb7
|
Merge pull request #7128 from natural-law/v3
Modify the lua runtime template for prebuilt engine.
|
2014-06-19 11:49:04 +08:00 |
zhangbin
|
3b19b07915
|
Modify the lua runtime template for prebuilt engine.
|
2014-06-19 11:33:39 +08:00 |
minggo
|
56777e6d61
|
[ci skip]
|
2014-06-19 09:47:01 +08:00 |
minggo
|
e60e3c217d
|
Merge pull request #7046 from Dhilan007/v3-label-improve
1.Support setting up the line height and additional kerning of label.
|
2014-06-19 09:44:51 +08:00 |
Dhilan007
|
9351172baf
|
add test case for new API of Label.
|
2014-06-18 18:01:55 +08:00 |
yangxiao
|
9eaff7465d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-18 17:17:33 +08:00 |
yangxiao
|
052b4fa1ce
|
bone origin matrix
|
2014-06-18 17:16:54 +08:00 |
minggo
|
719c8995cf
|
Merge pull request #7118 from natural-law/v3
Remove the debug symbols for release mode in xcode projects.
|
2014-06-18 17:10:34 +08:00 |
zhangbin
|
1b056b6c49
|
Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
|
2014-06-18 17:06:56 +08:00 |
2youyou2
|
b323f5772e
|
optimize frame
|
2014-06-18 14:21:33 +08:00 |
minggo
|
a587931ce3
|
Merge pull request #7115 from minggo/windows-fix
fix compiling error on windows
|
2014-06-18 14:14:39 +08:00 |
minggo
|
b28a482ec4
|
Merge pull request #7116 from CocosRobot/update_lua_bindings_1403071752
[AUTO]: updating luabinding automatically
|
2014-06-18 14:12:53 +08:00 |
CocosRobot
|
155638f2de
|
[AUTO]: updating luabinding automatically
|
2014-06-18 06:10:38 +00:00 |
minggo
|
a68d89bce3
|
Merge pull request #7113 from samuele3hu/v3_lua_fix
Skip some functions for Lua bindings for compile error
|
2014-06-18 14:05:41 +08:00 |
minggo
|
d6776b664a
|
fix compiling error on windows
|
2014-06-18 14:01:57 +08:00 |
samuele3hu
|
ed72202e68
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-18 13:44:27 +08:00 |
samuele3hu
|
98fde94647
|
Skip some functions for Lua bindings
|
2014-06-18 13:43:22 +08:00 |
minggo
|
afb49f2e81
|
Merge pull request #7112 from CocosRobot/update_cocosfiles_1403069812
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-18 13:38:14 +08:00 |
minggo
|
08453b911d
|
Merge pull request #7071 from pandamicro/Script_onEnter_fix
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-18 13:37:57 +08:00 |
CocosRobot
|
9aeb1510ed
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-18 05:36:54 +00:00 |
minggo
|
a672f03382
|
Merge pull request #7110 from CocosRobot/update_lua_bindings_1403062939
[AUTO]: updating luabinding automatically
|
2014-06-18 13:35:36 +08:00 |
pandamicro
|
950894de80
|
Fixed #5563: Fix include issue
|
2014-06-18 12:47:48 +08:00 |
pandamicro
|
94fdff1da9
|
Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
|
2014-06-18 11:51:52 +08:00 |
samuele3hu
|
15d070f7fc
|
Update submodule
|
2014-06-18 11:50:24 +08:00 |
samuele3hu
|
00611f7ec1
|
Update cocos2dx_spine.ini
|
2014-06-18 11:47:43 +08:00 |
CocosRobot
|
d58d36d1c8
|
[AUTO]: updating luabinding automatically
|
2014-06-18 03:44:06 +00:00 |
minggo
|
c9492cbbef
|
[ci skip]
|
2014-06-18 11:31:16 +08:00 |
minggo
|
6ecca08340
|
Merge pull request #7039 from minggo/get-child-by-name
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-18 11:30:14 +08:00 |
minggo
|
246d6f12c9
|
Merge pull request #7047 from samuele3hu/v3_keypad_fix
Resolve the compile warning for Lua bindings project
|
2014-06-18 11:29:54 +08:00 |
minggo
|
bd499d4bd6
|
Merge pull request #7003 from andyque/back_compatible_fix
fix KeyCode back compatible
|
2014-06-18 11:29:02 +08:00 |
minggo
|
2e84368e48
|
Merge pull request #7108 from minggo/v3
fix compiling error
|
2014-06-18 11:27:49 +08:00 |
2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
minggo
|
df798baa8b
|
Merge pull request #7059 from Rumist/v3
BUG FIX : #5553
|
2014-06-18 11:18:33 +08:00 |
minggo
|
f05eb9532d
|
fix compiling error
|
2014-06-18 11:11:08 +08:00 |