samuele3hu
|
349f9bde11
|
Fix the compile error in the release mode
|
2015-05-18 17:43:20 +08:00 |
samuele3hu
|
da2314b00a
|
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
|
2015-05-18 09:41:35 +08:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
samuele3hu
|
8db62c82f8
|
Add Lua bindings for Physics3D and related test cases
|
2015-05-15 09:28:03 +08:00 |
samuele3hu
|
0d53065476
|
issue 10411:Bug in Physics manual Lua binding
|
2015-05-07 16:15:24 +08:00 |
andyque
|
db95034798
|
fix android compile error
|
2015-05-07 10:37:19 +08:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
Danut Chereches
|
5f692962b9
|
fixed 'seperate' typo
issue #8408
|
2015-04-25 00:02:39 +03:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
samuele3hu
|
9aadc2a993
|
Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B,
|
2015-04-17 17:40:28 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
tangziwen
|
176532eef4
|
update Terrain Lua binding
|
2015-04-09 10:01:40 +08:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
samuele3hu
|
bb225d052e
|
Update comments of some header files
|
2015-03-27 15:27:08 +08:00 |
samuele3hu
|
a1b054911c
|
Update comments of some header files
|
2015-03-27 11:13:28 +08:00 |
samuele3hu
|
e0bde0f789
|
Update comments of some header files
|
2015-03-26 22:07:44 +08:00 |
minggo
|
f9589d166d
|
Merge pull request #11161 from samuele3hu/v3_5_comment
Update comments of some header files
|
2015-03-26 10:37:41 +08:00 |
samuele3hu
|
1bea6a52a2
|
Update comments of some header files
|
2015-03-25 18:54:33 +08:00 |
samuele3hu
|
f3890d3bb3
|
Update comments of some header files
|
2015-03-24 21:52:56 +08:00 |
samuele3hu
|
020b3ba5cb
|
Update comments of some header files
|
2015-03-24 21:46:18 +08:00 |
samuele3hu
|
865aa886a9
|
Update comments of some header files
|
2015-03-20 14:39:33 +08:00 |
minggo
|
8075cc1602
|
Merge pull request #10986 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-19 20:01:43 +08:00 |
samuele3hu
|
5a5acc624a
|
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
|
2015-03-19 17:31:57 +08:00 |
samuele3hu
|
31b34ddf77
|
Update comments of some header files
|
2015-03-19 16:45:53 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
yangxiao
|
ea7dfe1147
|
lua test
|
2015-03-04 10:42:08 +08:00 |
yangxiao
|
dd070e177e
|
modify unproject
|
2015-02-27 10:20:32 +08:00 |
samuele3hu
|
3a7cbe9d67
|
Add Particle3DTest for Lua and update related configure files
|
2015-02-15 15:56:20 +08:00 |
samuele3hu
|
80c2e0c153
|
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-28 21:47:52 +08:00 |
samuele3hu
|
cd42806367
|
Fix the error of tolua_cocos2d_Mat4_decompose
|
2015-01-28 11:12:12 +08:00 |
samuele3hu
|
6208e9cba5
|
Add more test cases about 3D
|
2015-01-28 09:40:20 +08:00 |
minggo
|
ebc75579a2
|
Merge pull request #9838 from htlxyz/v3_origin
modify trans lua value to fontdefinition error
|
2015-01-23 16:55:01 +08:00 |
minggo
|
42b6fbd1c6
|
Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
Lua load chunks from zip supports folder structured lua
|
2015-01-23 16:13:09 +08:00 |
samuele3hu
|
d74fb0e8b5
|
Update LayoutComponent Test case of UIEditTest
|
2015-01-22 10:21:38 +08:00 |
minggo
|
08d392dd5f
|
Merge pull request #10132 from samuele3hu/v3_4_issue9537
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 13:39:29 +08:00 |
samuele3hu
|
205ead5b63
|
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 11:48:34 +08:00 |
minggo
|
abc6511ceb
|
Merge pull request #10125 from samuele3hu/v3_4_issue9537
issue #10107: Binding AnimationInfo to lua
|
2015-01-21 11:02:11 +08:00 |
samuele3hu
|
666af29681
|
issue #10107: Binding AnimationInfo to lua
|
2015-01-21 10:06:48 +08:00 |
samuele3hu
|
cc732743da
|
Add macro judgement for CC_PLATFORM_MAC
|
2015-01-19 13:58:03 +08:00 |
htl
|
5a87908344
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-19 09:38:34 +08:00 |
samuele3hu
|
4601331dee
|
Update the luaval_to_int32 conversional function to get correct value
|
2015-01-16 09:50:22 +08:00 |
htl
|
ecbef0c45c
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-15 16:14:52 +08:00 |
samuele3hu
|
c026aa82f9
|
Add CC_DEPRECATED_ATTRIBUTE flag
|
2015-01-14 15:09:37 +08:00 |
samuele3hu
|
951324a230
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
Conflicts:
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
|
2015-01-14 13:58:12 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
minggo
|
1bb4c12b1d
|
Merge pull request #9948 from samuele3hu/v3_4_fix_bug
issue #9886: fix the number conversion error when passing 0x80000000
|
2015-01-13 14:11:49 +08:00 |
samuele3hu
|
203d20161c
|
issue #9886: fix the number conversion error when passing 0x80000000
|
2015-01-13 10:02:09 +08:00 |
minggo
|
eb74647210
|
Merge pull request #9933 from SunLightJuly/support_func_call_chain
Support func call chain
|
2015-01-13 09:35:12 +08:00 |
SunLightJuly
|
4d2a425450
|
fixed typo
|
2015-01-13 01:02:04 +08:00 |
pipu
|
d9adda89c2
|
Update cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp
|
2015-01-12 16:51:50 +08:00 |
SunLightJuly
|
3a64d723de
|
modified lua_cocos2dx_Node_setRotationQuat() to to support chain call
|
2015-01-12 15:21:21 +08:00 |
SunLightJuly
|
a902df93c6
|
modified the manual binding files to support functions call chain
|
2015-01-12 15:12:01 +08:00 |
Edward Zhou
|
c2929a30d5
|
fix compile error
|
2015-01-11 23:01:13 +08:00 |
Edward Zhou
|
5bd9e7f1a7
|
support to loading folder structured lua(a.k.a normal zip file) for luaLoadChunksFromZIP
|
2015-01-11 22:57:14 +08:00 |
htl
|
0cf63712e9
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-09 10:02:45 +08:00 |
yinjimmy
|
bdac739541
|
Fix: executeScriptFile can not load .luac file when .lua is not exist
|
2015-01-09 04:18:41 +08:00 |
Huabing.Xu
|
b5f8666caf
|
Merge pull request #9855 from huangshiwu/v3_XmlHttpRequest
Fix XmlHttpRequestTest parsing error of response header on iOS platform
|
2015-01-08 10:28:34 +08:00 |
htl
|
240b43891a
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-08 10:20:56 +08:00 |
yinjimmy
|
70e0874add
|
Compatibility code for executeScriptFile
|
2015-01-08 09:01:39 +08:00 |
huangshiwu
|
be02233815
|
Fix XmlHttpRequestTest parsing error of response header on iOS platform
|
2015-01-08 00:23:27 +08:00 |
htl
|
66dd8bb449
|
modify float convert to unsigned int
|
2015-01-07 16:03:46 +08:00 |
yinjimmy
|
7d430742f1
|
Merge branch 'bugfix_executeScriptFile' into combine
|
2015-01-07 15:33:15 +08:00 |
yinjimmy
|
cbf9741dfd
|
Compatibility code for executeScriptFile
|
2015-01-07 15:23:58 +08:00 |
htl
|
3d2aa30aa7
|
modify trans lua value to fontdefinition error
|
2015-01-07 15:18:56 +08: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 |
minggo
|
3c1978fcc3
|
Merge pull request #9611 from super626/quaternion
Rotation With Quaternion
|
2014-12-30 10:09:08 +08:00 |
yangxiao
|
04e273e245
|
bind setRotationQuat
|
2014-12-25 14:54:20 +08:00 |
minggo
|
9643b87ed0
|
Merge pull request #9173 from 2youyouo2/v3
improve ActionTimeline api
|
2014-12-25 14:06:02 +08:00 |
yinjimmy
|
24648db2b5
|
execute script with full file path
|
2014-12-24 02:18:29 +08: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 |
samuele3hu
|
7e8da62ebc
|
Add Websocket support for Mac platform
|
2014-12-09 18:29:20 +08:00 |
youyou
|
04f870edb5
|
update head file
|
2014-12-05 10:08:48 +08: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 |
samuele3hu
|
1da44b0897
|
Add more useful trace back info when got invalid arguments by calling functions
|
2014-12-01 15:53:41 +08: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 |
Shrimpz
|
ac666d1e6d
|
fixed typo
|
2014-11-25 15:51:25 +08: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 |
samuele3hu
|
a3dbd010db
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-11-13 13:42:46 +08:00 |
dantezhu
|
e8d234a32a
|
fix lua http download binary data's bug
|
2014-11-10 17:11:30 +08: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 |
James Chen
|
dd6bb0b3eb
|
Uses reference in for loop inside ccvector_std_string_to_luaval
|
2014-10-23 10:18:09 +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 |
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 |
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 |
samuele3hu
|
634d42775e
|
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 17:00:05 +08:00 |
Dhilan007
|
c9bc80f831
|
Fix compile error
|
2014-10-18 13:03:28 +08:00 |
Dhilan007
|
81a8e80496
|
[LUA]Add New AudioEngine on window
|
2014-10-17 17:53:33 +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
|
079df20541
|
Update lua bindings for Spine and related test case
|
2014-10-16 20:23:58 +08: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 |
samuele3hu
|
3f667fac85
|
Update the related AssetsManagerEx files and related project configure
|
2014-10-16 10:28:52 +08: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
|
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
|
4a67963420
|
Update CSLoader lua-bindings and adjust project config
|
2014-10-14 23:37:00 +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 |
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
|
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 |
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 |
SunLightJuly
|
763b54e5cb
|
added LuaStack::loadChunksFromZIP()
|
2014-10-08 17:30:14 +08: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 |
samuele3hu
|
87fccd7881
|
Remove manaul lua-bindings for Armature::getOffsetPoints
|
2014-09-29 10:37:19 +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 |
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 |
samuele3hu
|
23fb2062c9
|
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
|
2014-09-25 15:05:42 +08:00 |
yestein
|
b19b2c5786
|
replace tab to 4 spaces
|
2014-09-24 15:14:47 +08:00 |
yestein
|
72c5d77273
|
Add Cocostudio Armature getOffsetPoints API for Lua
|
2014-09-24 11:20:36 +08:00 |
Dhilan007
|
077ffb2b43
|
update lua binding
|
2014-09-22 15:54:35 +08:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
minggo
|
7bb391ce55
|
Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
|
2014-09-15 13:43:27 +08:00 |
minggo
|
788f3c5c38
|
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
|
2014-09-15 09:36:36 +08:00 |
Dhilan007
|
cf2a60898f
|
Lua bindings of AudioEngine.
|
2014-09-14 22:54:04 +08:00 |
andyque
|
02d2282b83
|
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
|
2014-09-12 17:07:06 +08:00 |
andyque
|
d4b2e8d154
|
remove deprecated warning
|
2014-09-12 17:06:13 +08:00 |
huangshiwu
|
8922121ed1
|
Deprecate DrawPrimitives and enhance DrawNode --make some modify
|
2014-09-12 07:33:34 +08:00 |
huangshiwu
|
d9634057ab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
|
2014-09-11 16:41:54 +08:00 |
huangshiwu
|
fb1d47900c
|
Deprecate DrawPrimitives and enhance DrawNode
|
2014-09-11 15:39:56 +08:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
samuele3hu
|
6209530e66
|
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
|
2014-09-05 09:39:43 +08:00 |