htl
3d2aa30aa7
modify trans lua value to fontdefinition error
2015-01-07 15:18:56 +08:00
htl
194fa09f30
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-07 14:14:52 +08:00
htl
e1fd472df1
modify texture format name
2015-01-07 14:11:48 +08:00
CocosRobot
54c75337c5
[AUTO]: updating luabinding automatically
2015-01-07 03:19:27 +00:00
minggo
fbf565fd59
Merge pull request #9798 from samuele3hu/v3_4_packagesize
...
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-07 11:14:22 +08:00
CocosRobot
f83daed2cf
[AUTO]: updating luabinding automatically
2015-01-07 02:27:01 +00:00
samuele3hu
58d946b578
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-05 17:10:25 +08:00
htl
c4cc6b5c34
modify event register function name
2015-01-05 14:19:27 +08:00
htl
f82404f9c9
modify node register event interface
2015-01-05 14:02:29 +08:00
dualface
432bdf3541
fix framework on iOS
2014-12-31 18:01:03 +08:00
minggo
bbfa7a9183
Merge pull request #9753 from samuele3hu/v3_4_httpclient
...
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:48:33 +08:00
samuele3hu
54d376db01
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:28:14 +08:00
CocosRobot
2e1d8b4e42
[AUTO]: updating luabinding automatically
2014-12-31 08:15:01 +00:00
CocosRobot
3614f716ae
[AUTO]: updating luabinding automatically
2014-12-31 06:23:33 +00:00
samuele3hu
6bad549285
Resolve the require file errror
2014-12-31 13:43:47 +08:00
minggo
70a29a8470
Merge pull request #9709 from htlxyz/v3_origin
...
modify widget interface for lua
2014-12-30 18:32:20 +08:00
htl
dce4383357
modify widget interface for lua
2014-12-30 16:45:26 +08:00
CocosRobot
f4fbf51905
[AUTO]: updating luabinding automatically
2014-12-30 08:30:45 +00:00
CocosRobot
5b8492770e
[AUTO]: updating luabinding automatically
2014-12-30 07:49:45 +00:00
CocosRobot
ed7823c08b
[AUTO]: updating luabinding automatically
2014-12-30 03:52:26 +00:00
minggo
3c1978fcc3
Merge pull request #9611 from super626/quaternion
...
Rotation With Quaternion
2014-12-30 10:09:08 +08:00
CocosRobot
75436db583
[AUTO]: updating luabinding automatically
2014-12-29 05:51:45 +00:00
dualface
653b15b4b8
add UIWidget support, fix typo
2014-12-29 13:37:20 +08:00
dualface
40acc98f14
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates
2014-12-29 10:58:42 +08:00
dualface
954f170e9e
remove chinese comments
2014-12-29 10:44:16 +08:00
minggo
67ae66a90e
Merge pull request #9663 from dualface/update_lua_corelib
...
update lua corelib
2014-12-29 10:30:50 +08:00
CocosRobot
35774cc0f6
[AUTO]: updating luabinding automatically
2014-12-29 02:07:20 +00:00
CocosRobot
4172e7ad7f
[AUTO]: updating luabinding automatically
2014-12-29 01:49:00 +00:00
minggo
b01b25e17e
Merge pull request #9558 from super626/frustum
...
Frustum Culling
2014-12-29 09:43:14 +08:00
dualface
8d99d8a78e
fix typo
2014-12-29 05:47:37 +08:00
dualface
9684d6e164
update corelib
2014-12-29 05:41:13 +08:00
dualface
74daae1c39
update framework
2014-12-29 01:58:16 +08:00
dualface
cc3021467f
add more usable functions
2014-12-27 15:31:31 +08:00
dualface
46a0ad11ac
update lua corelib
2014-12-27 11:59:14 +08:00
CocosRobot
f8b1b34025
[AUTO]: updating luabinding automatically
2014-12-26 08:10:13 +00:00
yangxiao
b0a6720cb2
reset auto lua, fix #9515
2014-12-26 15:52:27 +08:00
yangxiao
25ce54b43b
reset
2014-12-26 15:46:45 +08:00
lvlong
f592671df6
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
CocosRobot
a30d606fe6
[AUTO]: updating luabinding automatically
2014-12-26 02:40:22 +00:00
CocosRobot
ff37578611
[AUTO]: updating luabinding automatically
2014-12-26 01:32:36 +00:00
lvlong
75d2deb2c8
revert
2014-12-25 15:25:19 +08:00
lvlong
3f91957e79
revert
2014-12-25 15:21:53 +08:00
yangxiao
04e273e245
bind setRotationQuat
2014-12-25 14:54:20 +08:00
CocosRobot
6b15f4edcb
[AUTO]: updating luabinding automatically
2014-12-25 06:14:03 +00:00
minggo
9643b87ed0
Merge pull request #9173 from 2youyouo2/v3
...
improve ActionTimeline api
2014-12-25 14:06:02 +08:00
lvlong
a4a108f766
fix lua binding again!!
2014-12-25 14:04:41 +08:00
minggo
2ca143959b
Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile
...
execute script with full file path
2014-12-25 13:45:46 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
CocosRobot
381be0f6f0
[AUTO]: updating luabinding automatically
2014-12-24 09:41:09 +00:00
lvlong
4d1ca0966c
lua binding
2014-12-24 15:09:26 +08:00
CocosRobot
a5d3e8361b
[AUTO]: updating luabinding automatically
2014-12-24 06:42:09 +00:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
yinjimmy
24648db2b5
execute script with full file path
2014-12-24 02:18:29 +08:00
CocosRobot
864b924dfb
[AUTO]: updating luabinding automatically
2014-12-23 06:49:30 +00:00
CocosRobot
facf9a1a66
[AUTO]: updating luabinding automatically
2014-12-23 04:05:21 +00:00
CocosRobot
34e1bce6c3
[AUTO]: updating luabinding automatically
2014-12-22 08:02:05 +00:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
CocosRobot
9ffacb3f78
[AUTO]: updating luabinding automatically
2014-12-17 10:38:03 +00:00
samuele3hu
5c20885ad1
Synchronize the KeyCode Enum to Lua
2014-12-17 11:27:01 +08:00
CocosRobot
189e386846
[AUTO]: updating luabinding automatically
2014-12-16 10:44:15 +00:00
CocosRobot
3d327deb6d
[AUTO]: updating luabinding automatically
2014-12-16 02:14:01 +00:00
samuele3hu
5d3008d6ac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
2014-12-11 09:51:18 +08:00
samuele3hu
4b43fab3e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-12-09 21:03:01 +08:00
CocosRobot
b0aacdc287
[AUTO]: updating luabinding automatically
2014-12-09 10:34:49 +00:00
samuele3hu
7e8da62ebc
Add Websocket support for Mac platform
2014-12-09 18:29:20 +08:00
kaile.yin
cb509aa69f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-09 13:33:39 +08:00
CocosRobot
e510f24663
[AUTO]: updating luabinding automatically
2014-12-08 10:14:41 +00:00
youyou
04f870edb5
update head file
2014-12-05 10:08:48 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
CocosRobot
0c54f8f7a0
[AUTO]: updating luabinding automatically
2014-12-04 02:11:58 +00:00
kaile.yin
b4612447f3
change tab to 4 space
2014-12-03 16:12:44 +08:00
kaile.yin
9d49f82eb9
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-12-03 16:00:32 +08:00
minggo
0d1baf4037
Merge pull request #9327 from samuele3hu/v3_manual_bindings
...
Add more useful trace back info when got invalid arguments by calling functions
2014-12-03 14:17:16 +08:00
samuele3hu
1da44b0897
Add more useful trace back info when got invalid arguments by calling functions
2014-12-01 15:53:41 +08:00
samuele3hu
802ba311d6
Fix the error that SpritePerformanceTest lua does’t work
2014-11-28 11:54:38 +08:00
CocosRobot
f0c31172b8
[AUTO]: updating luabinding automatically
2014-11-27 13:39:15 +00:00
minggo
dcc517e8d4
Merge pull request #9267 from samuele3hu/v3_strip
...
Adjust binding structure to decrease the package size of lua_empty_test
2014-11-27 20:21:06 +08:00
samuele3hu
ed573149dd
Resolve the project setting error on the platforms
2014-11-27 19:42:32 +08:00
CocosRobot
36a5a170d2
[AUTO]: updating luabinding automatically
2014-11-27 02:55:33 +00:00
samuele3hu
dc00158d72
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-27 10:44:56 +08:00
CocosRobot
3ed78b820e
[AUTO]: updating luabinding automatically
2014-11-27 02:02:29 +00:00
samuele3hu
9fbf87c6db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-26 21:59:57 +08:00
samuele3hu
222f2cbd51
Decrease the package size of lua_empty_test
2014-11-26 21:54:18 +08:00
minggo
51b4736740
Merge pull request #9149 from samuele3hu/v3_compile_binary
...
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-26 20:05:21 +08:00
CocosRobot
39c2c8a2cb
[AUTO]: updating luabinding automatically
2014-11-26 03:20:28 +00:00
CocosRobot
0f14dee924
[AUTO]: updating luabinding automatically
2014-11-26 02:56:12 +00:00
Vladimir Timofeev
a562c70c73
Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes
...
* origin/v3:
Update CHANGELOG
Update AUTHORS
fixed typo
Updates definition of Complete.
[AUTO][ci skip]: updating cocos2dx_files.json
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
Skip binding nodeWithFlatBuffers of CSLoader for lua
2014-11-25 15:24:07 +03:00
Shrimpz
ac666d1e6d
fixed typo
2014-11-25 15:51:25 +08:00
Vladimir Timofeev
782e3bcd01
cmake: Add correct _POSIX_C_SOURCE and _BSD_SOURCE (linux) defines when build luasocket, so all types and func properly defined
2014-11-24 17:24:45 +03:00
Vladimir Timofeev
3dadcf4aea
As we have --std=c99 in CMAKE_C_FLAGS, to expose some macros and functions we should declare feature-check-marco...
...
Define _DARWIN_C_SOURCE should enable all mac os non standard extensions.
2014-11-24 17:24:11 +03:00
CocosRobot
7dc623fcab
[AUTO]: updating luabinding automatically
2014-11-24 07:24:39 +00:00
Vladimir Timofeev
9dfa26e0ec
Quick and dirty fix after my error. This defines fix build on linux with fresh gcc, but broke on mac
2014-11-20 23:20:02 +03:00
Vladimir Timofeev
012a152406
Fix build of luasocket on linux
2014-11-20 13:49:59 +03:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
CocosRobot
e52ee603ac
[AUTO]: updating luabinding automatically
2014-11-20 03:41:28 +00:00
Vladimir Timofeev
2bf77c10e8
Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code.
2014-11-19 03:28:41 +03:00
samuele3hu
78ef234e8f
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-18 16:02:38 +08:00
samuele3hu
02f46b46e3
Merge branch 'v3' of https://github.com/dantezhu/cocos2d-x into v3_compile_binary
2014-11-18 13:58:14 +08:00
Vladimir Timofeev
b5266e95bf
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
2014-11-17 01:42:04 +03:00
minggo
906316df62
Merge pull request #8985 from samuele3hu/v3_new_spine
...
Fix error that the type judgment of lua value would parse string —> int or int —> string
2014-11-13 18:59:19 +08:00
samuele3hu
a3dbd010db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-11-13 13:42:46 +08:00
samuele3hu
1d1d004c3a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-11-12 17:46:13 +08:00
dantezhu
e8d234a32a
fix lua http download binary data's bug
2014-11-10 17:11:30 +08:00
CocosRobot
a908c391b0
[AUTO]: updating luabinding automatically
2014-11-09 15:33:08 +00:00
minggo
e7d5e79e88
Merge pull request #8998 from aeonmine/v3
...
fix memory leak cocos studiov2.0 engine v3.3
2014-11-09 23:24:16 +08:00
CocosRobot
aae2fd9e2a
[AUTO]: updating luabinding automatically
2014-11-07 02:38:01 +00:00
samuele3hu
76ab86674e
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android
2014-11-06 14:32:03 +08:00
CocosRobot
13f9073e22
[AUTO]: updating luabinding automatically
2014-11-05 05:44:02 +00:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
samuele3hu
08d6b0dcff
Fix the type judgment of lua value would parse string —> int or int —> string
2014-10-31 17:50:59 +08:00
CocosRobot
9592b1f661
[AUTO]: updating luabinding automatically
2014-10-31 02:44:25 +00:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
CocosRobot
0ef3887497
[AUTO]: updating luabinding automatically
2014-10-24 13:55:25 +00:00
James Chen
dd6bb0b3eb
Uses reference in for loop inside ccvector_std_string_to_luaval
2014-10-23 10:18:09 +08:00
samuele3hu
2f9dbb7142
Update cocos2d basic lua files and LabelTestNew.lua
2014-10-21 15:56:38 +08:00
minggo
65f007f5ff
Merge pull request #8857 from zhongfq/patch-2
...
fix memory leak when add listener to ui object
2014-10-21 13:57:07 +08:00
minggo
6313f9a622
Merge pull request #8868 from samuele3hu/v3_new_spine
...
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
2014-10-21 09:33:40 +08:00
CocosRobot
e02558e391
[AUTO]: updating luabinding automatically
2014-10-20 10:17:27 +00:00
samuele3hu
20bcafa143
Fix the bug that callbacks aren’t triggered when response failed
2014-10-20 17:43:04 +08:00
samuele3hu
38b462100b
Update LuaMinXmlHttpRequest.h/.cpp
2014-10-20 16:05:13 +08:00
CocosRobot
5e09b1e3b1
[AUTO]: updating luabinding automatically
2014-10-20 06:06:43 +00:00
Eric Zhong
2206e4edb8
fix memory leak when add listener to ui object
2014-10-20 11:20:53 +08:00
samuele3hu
1195960ea7
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
2014-10-20 10:22:44 +08:00
minggo
c1128a227d
Merge pull request #8847 from samuele3hu/v3_new_spine
...
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 20:10:12 +08:00
samuele3hu
634d42775e
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 17:00:05 +08:00
CocosRobot
96d709aff3
[AUTO]: updating luabinding automatically
2014-10-18 07:36:54 +00:00
minggo
8218804c52
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
...
[LUA]Add New AudioEngine on window
2014-10-18 15:11:29 +08:00
Dhilan007
5ca3483dd8
fixed compile error
2014-10-18 13:44:19 +08:00
Dhilan007
c9bc80f831
Fix compile error
2014-10-18 13:03:28 +08:00
samuele3hu
6502beaf95
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-18 00:14:53 +08:00
samuele3hu
3348f8300e
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
2014-10-18 00:13:22 +08:00
CocosRobot
20781825f2
[AUTO]: updating luabinding automatically
2014-10-17 14:56:22 +00:00
Dhilan007
81a8e80496
[LUA]Add New AudioEngine on window
2014-10-17 17:53:33 +08:00
minggo
d241e568b0
Merge pull request #8788 from samuele3hu/v3_new_spine
...
Update the deprecated Func and update bindings-generator
2014-10-17 16:35:51 +08:00
samuele3hu
936510411b
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
2014-10-17 15:04:16 +08:00
samuele3hu
14f91ea9f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 14:38:07 +08:00
CocosRobot
e8373e9b41
[AUTO]: updating luabinding automatically
2014-10-17 06:28:36 +00:00
samuele3hu
066d94530c
Update the Deprecated Func
2014-10-17 14:15:30 +08:00
minggo
7138933344
Merge pull request #8760 from samuele3hu/v3_new_spine
...
Update lua bindings for Spine and related test case
2014-10-17 13:43:26 +08:00
samuele3hu
71f7520732
Fix win32 compile error
2014-10-17 10:19:41 +08:00
minggo
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
samuele3hu
4d75c977ca
Remove useless binding code for SkeletonAnimation
2014-10-16 20:53:40 +08:00
samuele3hu
7198ae509c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 20:35:43 +08:00
samuele3hu
c5f19c20ca
Add SpineConstants.lua
2014-10-16 20:24:47 +08:00
samuele3hu
079df20541
Update lua bindings for Spine and related test case
2014-10-16 20:23:58 +08:00
CocosRobot
4a084a4ebc
[AUTO]: updating luabinding automatically
2014-10-16 09:55:07 +00:00
minggo
064f0d9042
Merge pull request #8708 from dabingnn/v3_updateSpine
...
V3 update spine
2014-10-16 17:50:07 +08:00
CocosRobot
c4985c45e4
[AUTO]: updating luabinding automatically
2014-10-16 08:55:11 +00:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
samuele3hu
8b5f6ae52a
Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:04:09 +08:00
samuele3hu
b4c91f0712
Update the related cocosstudio lua test cases
2014-10-16 15:51:01 +08:00
CocosRobot
2bfad920ce
[AUTO]: updating luabinding automatically
2014-10-16 04:01:10 +00:00
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
Anton Sokolchenko
4f1430d25d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2014-10-15 16:36:18 +03:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
Huabing.Xu
c12f88d63c
lua compiles ok-need to make it works later
2014-10-15 17:33:58 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
samuele3hu
a95e391756
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-15 11:24:27 +08:00
samuele3hu
70aa62a365
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-10-15 02:09:12 +08:00
CocosRobot
64a7ef9173
[AUTO]: updating luabinding automatically
2014-10-14 18:01:12 +00:00
samuele3hu
5b4e81aa3a
Update Android.mk for libluacocos2d
2014-10-15 00:25:12 +08:00
samuele3hu
3e9900c40d
Update win32 project config
2014-10-15 00:08:52 +08:00
samuele3hu
4a67963420
Update CSLoader lua-bindings and adjust project config
2014-10-14 23:37:00 +08:00
samuele3hu
735e86788e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-14 21:36:44 +08:00
samuele3hu
3b4fbd8fff
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
2014-10-14 21:34:55 +08:00
minggo
abd2687cf5
Merge pull request #8683 from dualface/update_lua_template_runtime
...
update lua-template
2014-10-14 17:01:19 +08:00
dualface
cee999ebbb
update lua-template-default, lua-template-runtime, fix same proj problems.
2014-10-14 16:55:38 +08:00
CocosRobot
51e714bdae
[AUTO]: updating luabinding automatically
2014-10-14 06:32:12 +00:00
pipu
7dc837338e
Deleting cocos/scripting/lua-bindings/script/cocostudio
2014-10-13 16:34:31 +08:00
pipu
fc8be6f0ff
Reverting cocos/scripting/lua-bindings/auto
2014-10-13 13:06:42 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
CocosRobot
971d3a6653
[AUTO]: updating luabinding automatically
2014-10-11 08:12:44 +00:00
pipu
9ba51a1909
Reverting cocos/scripting/lua-bindings/auto/*.*
2014-10-11 13:49:56 +08:00
pipu
8b61c4677f
Deleting cocos/scripting/lua-bindings/auto/*.*
2014-10-11 12:09:11 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
dualface
20cbbfdbe5
update luabinding scripts
2014-10-11 02:51:58 +08:00
dualface
68f71b3df4
do not load deprecated Lua API from luabinding of modules
2014-10-10 23:59:41 +08:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
CocosRobot
53cde3f3b2
[AUTO]: updating luabinding automatically
2014-10-10 08:39:46 +00:00
pipu
d699b5809b
Modifying libprotocolbuf.a as protocolbuffer.a
2014-10-10 12:52:42 +08:00
samuele3hu
f97a7ae52d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-10-10 09:52:29 +08:00
samuele3hu
115d81574c
Add CameraTest、OBBTest and related lua bindings
2014-10-10 09:49:25 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
CocosRobot
70a2195ccf
[AUTO]: updating luabinding automatically
2014-10-08 09:53:11 +00:00
SunLightJuly
763b54e5cb
added LuaStack::loadChunksFromZIP()
2014-10-08 17:30:14 +08:00
CocosRobot
a96a2a992d
[AUTO]: updating luabinding automatically
2014-09-30 07:13:25 +00:00
SunLightJuly
c108616a01
standardized codes
2014-09-30 13:17:03 +08:00
SunLightJuly
4ba19791ed
fixed bug in Cocos2dxLuaLoader
2014-09-30 13:11:39 +08:00
CocosRobot
50a06a13ad
[AUTO]: updating luabinding automatically
2014-09-29 10:11:17 +00:00
samuele3hu
87fccd7881
Remove manaul lua-bindings for Armature::getOffsetPoints
2014-09-29 10:37:19 +08:00
samuele3hu
cb38f6bd5b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-29 10:27:46 +08:00
samuele3hu
f00187d3bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-09-29 09:48:35 +08:00
samuele3hu
99e1c6640e
Add BillBoardTest and update related bindings files
2014-09-29 09:43:22 +08:00
CocosRobot
fd9ed15d6d
[AUTO]: updating luabinding automatically
2014-09-29 01:25:31 +00:00
minggo
9511f0deb5
Merge pull request #8130 from yestein/v3
...
Add Cocostudio Armature getOffsetPoints API for Lua
2014-09-28 16:48:37 +08:00
samuele3hu
6b2acf88fc
Modify CameraTest and update related lua-bindings files
2014-09-28 16:47:06 +08:00
samuele3hu
e50eaf684f
Add CameraTest and update related lua-bindings files
2014-09-28 14:31:58 +08:00
CocosRobot
021d21a2a7
[AUTO]: updating luabinding automatically
2014-09-26 15:37:17 +00:00
samuele3hu
2ac96ed06e
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
2014-09-26 16:39:54 +08:00