pandamicro
0abe235323
Merge pull request #14030 from CocosRobot/update_lua_bindings_1443367205
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-27 23:30:14 +08:00
CocosRobot
b082620d85
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-27 15:24:49 +00:00
pandamicro
0af7f29cfd
Merge pull request #14024 from TheCodez/fix_refptr_testcase
...
Fix : RefPtr test wasn't executed even in debug build
2015-09-27 23:16:27 +08:00
pandamicro
17c78ad3b1
Merge pull request #14018 from natural-law/v3
...
Solve the crash of performance-tests on windows.
2015-09-27 23:11:19 +08:00
pandamicro
a43f56e9da
Merge pull request #14027 from CocosRobot/update_cocosfiles_1443366641
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-09-27 23:11:01 +08:00
CocosRobot
4185715c06
[AUTO][ci skip]: updating cocos2dx_files.json
2015-09-27 15:10:43 +00:00
pandamicro
45fc337733
Merge pull request #14023 from pandamicro/script-component2
...
Script Component
2015-09-27 23:08:57 +08:00
pandamicro
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
小沉
cfe076d59f
Merge pull request #1 from cocos2d/v3
...
update
2015-09-27 13:56:08 +08:00
Michael Kösel
744b7f54c9
Fix wrong debug check
2015-09-26 16:58:26 +02: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
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
pandamicro
a1bbd43f9f
Add component test to lua-tests and remove it from lua empty test
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
minggo
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
minggo
3d1318fdf1
enemy can run
2015-09-26 19:43:35 +08:00
minggo
7326369ed2
pass dt to lua update
2015-09-26 19:43:35 +08:00
minggo
63af026769
can use any lua type to extend component
2015-09-26 19:43:35 +08:00
minggo
3f066d156a
lua script can access c++'s functions
2015-09-26 19:43:35 +08:00
minggo
85c297f53b
temple save
2015-09-26 19:43:35 +08:00
minggo
10427fb7ae
add lua component
2015-09-26 19:43:35 +08:00
pandamicro
72483eb75c
Merge pull request #14015 from CocosRobot/update_lua_bindings_1443170285
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-25 22:50:47 +08:00
zhangbin
6697cad212
Solve the crash of performance-tests on windows.
2015-09-25 18:23:13 +08:00
XiaoFeng
47d9a59b41
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash.
2015-09-25 18:12:16 +08:00
CocosRobot
c135587962
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-25 08:43:00 +00:00
pandamicro
970300c3e2
Merge pull request #14012 from jianglong0156/customSpine
...
add custom spine skeletonAnimation test
2015-09-25 16:34:57 +08:00
pandamicro
c05e4fe5c9
Merge pull request #14014 from yangws/v3
...
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
2015-09-25 16:32:42 +08:00
Vincent Yang
5c0d6691ca
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
2015-09-25 14:50:20 +08:00
江龙
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
pandamicro
e16404c280
Merge pull request #14008 from thuydx55/fix_android_compile_script_load_pluginx
...
Fix loading pluginx lib when compile Android with --compile-script flag
2015-09-24 14:08:46 +08:00
pandamicro
718f5c7b88
Merge pull request #14006 from CocosRobot/update_cocosfiles_1443058624
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-09-24 14:07:52 +08:00
pandamicro
d82906d5ff
Merge pull request #14007 from ZhangMenghe/v3-buttonOpacity
...
[ci skip] button Opacity setting testcase
2015-09-24 14:07:04 +08:00
pandamicro
95379c5dc2
Merge pull request #13995 from xiaofeng11/v3
...
Fix issue http://punchbox.info:3000/issues/23146
2015-09-24 13:03:59 +08:00
Nick
003920f826
fix loading pluginx when compile Android with --compile-script flag
2015-09-24 11:41:18 +07:00
ZhangMenghe
03e5573f79
button Opacity setting
2015-09-24 11:13:41 +08:00
CocosRobot
28d1bd1d70
[AUTO][ci skip]: updating cocos2dx_files.json
2015-09-24 01:37:06 +00:00
pandamicro
149775ea10
Merge pull request #13962 from ZhangMenghe/v3-scrollView
...
[ci skip] Testcase for multiple items in scrollView
2015-09-24 09:35:05 +08:00
XiaoFeng
6db2cd7b9c
Fix issue : http://punchbox.info:3000/issues/23182
...
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
2015-09-23 18:37:12 +08:00
zilongshanren
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
XiaoFeng
f5c88c32af
Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent
2015-09-23 10:55:01 +08:00
igorzel
40a6789765
Fixed integer overflow in Device::getTextureDataForText (in CCDevice-ios.mm)
...
There was the problem when “height” and “width” were typecast to short
integer. So for values more than sizeof(short) we had integer overflow.
Steps to reproduce:
Create simple application with EditBox. Start it. Add 1000 (just
example) characters at a time to the EditBox. Method
Device::getTextureDataForText will be called and there will be integer
overflow for “height” and “width”. As a result application will crash
later.
2015-09-22 13:25:43 +03:00
pandamicro
2560b5fc6f
Merge pull request #13997 from CocosRobot/update_lua_bindings_1442913386
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-22 17:23:35 +08:00
CocosRobot
b09b146f97
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-22 09:23:14 +00:00
pandamicro
41df5a7886
Merge pull request #13996 from KAlO2/v3
...
fix typos
2015-09-22 17:11:46 +08:00
Martin Taylor
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
XiaoFeng
573f5868ca
Fix issue http://punchbox.info:3000/issues/23146
2015-09-22 14:52:16 +08:00
Martin Taylor
0ca45cf522
Merge pull request #1 from cocos2d/v3
...
Update from original
2015-09-22 14:01:00 +08:00
pandamicro
08204ec0bd
Merge pull request #13991 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 02:44:45 +08:00