minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
minggo
86af4cdab8
Merge pull request #15897 from halx99/patch-4
...
luabindings: Add script with utf-8 bom support.
2016-06-24 09:58:41 +08:00
halx99
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
mogemimi
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
halx99
90434e58d0
fix compile error.
2016-06-23 11:37:20 +08:00
halx99
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
James Chen
710ab777dd
Some lua bindings fixes:
...
1) Reverts changes in #15443 , the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904 )
2016-06-22 17:48:17 +08:00
halx99
f41130bafe
luabindings: Add script with utf-8 bom support.
2016-06-21 14:31:25 +08:00
mogemimi
de5dd21ded
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-08 15:41:44 +09:00
Xpol Wan
a7d9dd9a75
Print as Lua 5.1 does and remove duplicate code.
2016-05-14 14:09:58 +08:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
zilongshanren
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
Xpol Wan
bd263d6be4
Fixes deprecated warnings
...
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
xpol
24db45e925
Fixes some warnings in Lua manual bindings. ( #15443 )
...
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
2016-04-18 16:35:50 +08:00
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
mogemimi
985155749b
Remove unnecessary const from return types in PU and Lua
2016-04-06 12:36:20 +09:00
mogemimi
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
Xpol Wan
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
mogemimi
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
zilongshanren
366407ca1c
fix win32 compile issue
2016-01-27 20:21:32 +08:00
mogemimi
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
Ricardo Quesada
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
Wenhai Lin
66b0a0e9b1
Adds `std::nothrow` to the `new` statements
2015-12-16 17:06:56 +08:00
lunhao.guo
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
pandamicro
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
XiaoFeng
8f9ea8a87e
Add missing lua engine export declaration.
2015-12-04 15:23:59 +08:00
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
XiaoFeng
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
XiaoFeng
ec1d76b15e
Fix compile error
2015-11-27 13:08:22 +08:00
XiaoFeng
58dd27efd3
add missing return type
2015-11-26 17:33:45 +08:00
XiaoFeng
108d145bf0
Add missing luaval and color3b conversion function export
2015-11-26 15:08:49 +08:00
XiaoFeng
928dc3ab1f
Add lua value conversion function for cocos studio
2015-11-25 23:03:25 +08:00
XiaoFeng
145943068f
Add missing function export
2015-11-25 22:35:02 +08:00
XiaoFeng
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
yangxiao
e8d853934b
terrain lua bindings
2015-11-23 14:33:39 +08:00
mogemimi
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
pandamicro
7d93b419fd
Merge pull request #14303 from xiaofeng11/v3_fix
...
Fix ComponentTest in la-test can not load lua file under iOS & Android
2015-11-04 13:52:14 +08:00
XiaoFeng
3223a97b26
Fix ComponentTest in la-test can not load lua file under iOS & Android
2015-11-03 15:49:46 +08:00
mogemimi
8f632365c3
Fix typos in documentation
2015-11-03 04:43:44 +09:00
mogemimi
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
mogemimi
59d7868d4c
Fix minor typos
2015-10-14 15:12:22 +09:00
pandamicro
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
WenhaiLin
f4c56e8605
Fixed compile errors
2015-09-26 19:43:36 +08:00
pandamicro
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
pandamicro
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
pandamicro
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
WenhaiLin
b77d04f593
Fixed link errors
2015-09-19 00:59:28 +08:00
James Chen
0eaf4c6866
[lua] Wrong callback setting for webview:setOnDidFailLoading
2015-09-17 10:52:17 +08:00
pandamicro
89d81bd959
Merge pull request #12281 from lijinlong/v3
...
luabinding enumerateChildren bug
2015-09-14 22:32:56 +08:00