samuele3hu
|
521f805219
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
|
2014-07-08 14:57:19 +08:00 |
minggo
|
982d7441a0
|
Merge pull request #7310 from boyu0/lua_SceneEditorTest
Add SceneEditorTest for lua
|
2014-07-06 16:01:49 +08:00 |
samuele3hu
|
b68ee428b0
|
Remove useless codes
|
2014-07-04 17:15:34 +08:00 |
samuele3hu
|
85dd2e55bf
|
Add Lua bindings for utils and CaptureScreen test case
|
2014-07-04 16:24:00 +08:00 |
boyu0
|
dc81b07998
|
add new line at the end of the file
|
2014-07-04 10:27:24 +08:00 |
boyu0
|
fc994d5ec0
|
add SceneEditorTest for lua
|
2014-07-04 10:08:17 +08:00 |
samuele3hu
|
320dc4737b
|
Update Sprite3D test cases for Lua
|
2014-07-02 17:00:31 +08:00 |
samuele3hu
|
2aee9ed35d
|
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
|
2014-07-02 14:26:56 +08:00 |
samuele3hu
|
1bc0397644
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-01 09:47:41 +08:00 |
samuele3hu
|
318e39a6d2
|
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
|
2014-06-27 17:58:59 +08:00 |
samuele3hu
|
b1d07f2711
|
Add VideoPlayer Test for Lua
|
2014-06-27 13:56:39 +08:00 |
samuele3hu
|
c892939968
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
|
2014-06-26 09:52:41 +08:00 |
samuele3hu
|
3bd195d4ef
|
Add Lua binding for ActionTimeline related and related test cases
|
2014-06-26 09:51:32 +08:00 |
samuele3hu
|
5f63514d6b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus
|
2014-06-25 15:15:05 +08:00 |
samuele3hu
|
3a0e750926
|
Add deprecated support for lua binding of `getSize` and `setSize` of Widget
|
2014-06-25 15:13:08 +08:00 |
samuele3hu
|
5c765f6883
|
Add coco studio ui focus test cases for Lua
|
2014-06-25 15:08:59 +08:00 |
minggo
|
986f77a827
|
Merge pull request #7156 from samuele3hu/v3_keypad_fix
Update controller.lua for CocosIDE’s need
|
2014-06-25 14:40:08 +08:00 |
samuele3hu
|
617e2bc592
|
Add a newline
|
2014-06-25 09:36:34 +08:00 |
samuele3hu
|
300821e61f
|
Add UI Editor test case for Lua
|
2014-06-25 09:29:06 +08:00 |
samuele3hu
|
03a4e014e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-24 11:04:38 +08:00 |
samuele3hu
|
a339afb2c0
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-23 17:53:41 +08:00 |
samuele3hu
|
dce4c8a0a8
|
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases
|
2014-06-23 17:29:56 +08:00 |
samuele3hu
|
d9848a62d2
|
Update controller.lua for CocosIDE’s need
|
2014-06-20 11:09:26 +08:00 |
minggo
|
af88cf053b
|
Merge pull request #7022 from samuele3hu/v3_fix
Add bytecode and encrypted files test cases for Lua
|
2014-06-19 21:20:05 +08:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
samuele3hu
|
6c7b538ee1
|
Add deprecated support for the related UI addEventListener functions
|
2014-06-12 12:02:22 +08:00 |
samuele3hu
|
54379f48a9
|
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
|
2014-06-11 11:24:17 +08:00 |
samuele3hu
|
2d50df8b01
|
Update the KeyCodeTest in the NewEventDispatcherTest
|
2014-06-11 10:19:07 +08:00 |
samuele3hu
|
d200dd83a4
|
Update the KeyCodeTest in the NewEventDispatcherTest
|
2014-06-11 10:15:38 +08:00 |
samuele3hu
|
2252bc271b
|
Update the KeyCodeTest in the NewEventDispatcherTest
|
2014-06-11 10:14:24 +08:00 |
samuele3hu
|
4ce2d7f193
|
Update values of KeyCode used in the Lua to fix related error
|
2014-06-11 10:10:11 +08:00 |
samuele3hu
|
5a80b4da2e
|
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
|
2014-06-10 11:30:39 +08:00 |
samuele3hu
|
f6f75e8810
|
Update controller.lua
|
2014-06-10 10:01:08 +08:00 |
samuele3hu
|
eba954b410
|
Add bytecode and encrypted files test cases for Lua
|
2014-06-06 17:17:43 +08:00 |
samuele3hu
|
5ab8b81205
|
Update control.lua for lua-tests
|
2014-06-06 11:42:18 +08:00 |
samuele3hu
|
919524cf89
|
Update controller.lua for lua-tests and bindings-generator submoudle
|
2014-06-05 14:39:09 +08:00 |
samuele3hu
|
3bd196f077
|
Update the openGL lua binding and related test case
|
2014-05-23 19:12:30 +08:00 |
samuele3hu
|
dc03571076
|
fix some bugs for lua-tests
|
2014-05-23 16:48:18 +08:00 |
samuele3hu
|
f76e2a5476
|
Readd the lua binding for `visit` and modify a requirement for IDE
|
2014-05-23 10:00:59 +08:00 |
samuele3hu
|
a6efd4f650
|
Move `setSearchPat` operation from cpp to script
|
2014-05-22 14:00:39 +08:00 |
samuele3hu
|
6c8e38871c
|
issue #5255:Remove Sprite3D effect test
|
2014-05-22 10:22:10 +08:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08:00 |
boyu0
|
74335a92f7
|
Roll back lua PhysicsTest.
|
2014-05-16 17:19:02 +08:00 |
samuele3hu
|
cde4e4811b
|
Update some GuiConstants and resubmission pr#6361.
|
2014-05-15 16:54:55 +08:00 |
samuele3hu
|
5a14b1d67b
|
fix compile error and synchronizate the UI change for Lua
|
2014-05-15 15:39:15 +08:00 |
Ricardo Quesada
|
51f498fc94
|
fixed deprecation warnings
|
2014-05-08 16:42:36 -07:00 |
Ricardo Quesada
|
8f2ba467ff
|
Yeahhhhhh
it is working
|
2014-05-08 12:34:26 -07:00 |
James Chen
|
9862fab58f
|
Comments fix in CCRenderTexture.h
|
2014-05-07 16:37:21 +08:00 |
James Chen
|
8cbcf17163
|
issue #4674: Re-added deleted source files.
|
2014-05-04 14:37:55 +08:00 |
James Chen
|
3b3c1c4dbb
|
issue #4674: Removed large files and updated .gitignore
|
2014-05-04 14:36:16 +08:00 |
James Chen
|
cd6fe294b8
|
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
closed #4771: Move PhysicsWorld to Layer
|
2014-04-25 11:52:32 +08:00 |
samuele3hu
|
771ce05d95
|
fix the bugs of SpriteTest that the Sprite created by passing rect display error
|
2014-04-22 13:41:10 +08:00 |
samuele3hu
|
582e961f2a
|
Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest
|
2014-04-21 18:28:05 +08:00 |
minggo
|
0a5b92c56f
|
Merge pull request #6305 from samuele3hu/developAudio
fix the bug that exit layer can’t end the SimpleAudioEngine
|
2014-04-21 14:40:40 +08:00 |
samuele3hu
|
914516a4e0
|
fix the compile error about luabindings and add the `RichText` test cases.
|
2014-04-18 11:54:57 +08:00 |
samuele3hu
|
1331fff62c
|
fix the bug that exit layer can’t end SimpleAudioEngine
|
2014-04-17 10:36:08 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
James Chen
|
427ca4ecf0
|
Small fix in Lua test.
|
2014-04-11 05:45:18 -07:00 |
zhangbin
|
99766cdd03
|
fix the error show of ` FontTest`
|
2014-04-11 20:17:34 +08:00 |
zhangbin
|
0eee9bc288
|
Solve the incorrect effect of some transition test case in lua-tests.
|
2014-04-11 20:02:11 +08:00 |
boyu0
|
b69b14382e
|
Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont
|
2014-04-11 15:25:18 +08:00 |
samuele3hu
|
c687b97c6e
|
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-10 23:36:25 +08:00 |
samuele3hu
|
2800133c99
|
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 14:54:14 +08:00 |
James Chen
|
5615717617
|
issue #4729: NULL -> nullptr in constructor or setXXX(NULL)
|
2014-04-10 00:36:43 +08:00 |
samuele3hu
|
7de6552f54
|
Update the NewEventDispatcherTest
|
2014-04-09 16:22:03 +08:00 |
samuele3hu
|
dbd01051d8
|
close #4721:clone for EventListeners of lua didn't clone the related property
|
2014-04-09 14:26:05 +08:00 |
samuele3hu
|
b68f6bf65e
|
fix the error about `draw` of GLNode and modify the related test cases
|
2014-04-03 17:02:14 +08:00 |
samuele3hu
|
bff1d6c2a6
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-03 11:15:59 +08:00 |
samuele3hu
|
b9ff51782f
|
Synchronize LabelTest of cpp to lua to fix some bug and add more tests
|
2014-04-03 11:08:59 +08:00 |
samuele3hu
|
0c93c6ae60
|
fix error that “lua-test/opengltest/shader retro effect” test case have no effect
|
2014-04-02 15:34:26 +08:00 |
samuele3hu
|
056303ea35
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
|
2014-03-29 14:58:45 +08:00 |
samuele3hu
|
219a91a641
|
Add the omitted socket script for lua-tests
|
2014-03-29 14:58:23 +08:00 |
samuele3hu
|
403e96b943
|
Use the New Label in the Extension test case
|
2014-03-29 10:34:52 +08:00 |
samuele3hu
|
a387f60f80
|
Update the font size for new label test display
|
2014-03-28 23:32:11 +08:00 |
samuele3hu
|
7ca207f993
|
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 17:18:41 +08:00 |
andyque
|
57d8f155df
|
issue #4401. resolve conflicts
|
2014-03-26 14:54:50 +08:00 |
minggo
|
dfb3b6719c
|
Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
|
2014-03-15 01:22:28 +08:00 |
boyu0
|
f23db68151
|
build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.
|
2014-03-15 01:19:06 +08:00 |
samuele3hu
|
a05d6a55e2
|
fix: Make Close Menu invisible for iOS platform
|
2014-03-14 17:38:58 +08:00 |
samuele3hu
|
4aef65d4b7
|
fix the error that AssetManager test case can’t find correct resource path
|
2014-03-14 09:48:48 +08:00 |
samuele3hu
|
9713a246ee
|
Replace cc.LabelBMFont:create with cc.Label:createBMFont
|
2014-03-12 18:33:28 +08:00 |
samuele3hu
|
1c32c6d96f
|
Replace cc.LabelTTF:create with cc.Label:create
|
2014-03-12 17:51:34 +08:00 |
samuele3hu
|
d06bb83f19
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
Conflicts:
tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
|
2014-03-12 14:33:39 +08:00 |
samuele3hu
|
9c95c1e456
|
Replace cc.LabelTTF:create with cc.Label:create
|
2014-03-12 14:27:52 +08:00 |
James Chen
|
4a55e98adf
|
[lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
|
2014-03-12 14:06:57 +08:00 |
andyque
|
0634a1accd
|
fix lua resource path
|
2014-03-12 10:19:41 +08:00 |
James Chen
|
b88de91a15
|
Renames 'samples' folder to 'tests', ouch....
|
2014-03-11 19:10:34 +08:00 |