samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
samuele3hu
|
e5f9c1b488
|
Adjust common script and related test cases
|
2014-08-04 15:22:07 +08:00 |
samuele3hu
|
6f4cafcc1b
|
Add module register functions and adjust iOS and Mac test cases
|
2014-08-04 09:39:42 +08:00 |
samuele3hu
|
a47e52b5bc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-07-31 15:22:46 +08:00 |
samuele3hu
|
9666f1ad7f
|
Split luabindings module to some independent modules
|
2014-07-31 15:20:23 +08:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
Huabing.Xu
|
c722c0fcd0
|
libcocostudio for windows
|
2014-07-29 11:31:37 +08:00 |
Huabing.Xu
|
d53ce4d664
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:17 +08:00 |
Huabing.Xu
|
6d0b8852d1
|
libSpine rename for windows
|
2014-07-29 10:53:39 +08:00 |
Huabing.Xu
|
eacf003eed
|
change libExtensions for windows
|
2014-07-29 10:07:46 +08:00 |
Huabing.Xu
|
d6bc2f4998
|
liuGUI->libui for windows
|
2014-07-28 22:12:07 +08:00 |
Huabing.Xu
|
c6956504bf
|
change CocosDenshion to libcocosdenshion
|
2014-07-28 21:35:16 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
Sergey
|
92ac809bfe
|
Mac fonts tests
|
2014-07-24 12:27:17 +04:00 |
Huabing.Xu
|
e666ab88ed
|
fix windows compile error
|
2014-07-21 14:59:47 +08:00 |
samuele3hu
|
e975b0d5f9
|
Update experimental lua bindings、related test cases and project setting
|
2014-07-17 14:54:34 +08:00 |
samuele3hu
|
eb8d1d70f7
|
Update the FastTileMapTest and VideoPlayerTest
|
2014-07-17 12:55:28 +08:00 |
samuele3hu
|
d6d182cb59
|
Fix the action can’t be triggered in the TriggerTest
|
2014-07-16 23:18:10 +08:00 |
samuele3hu
|
b782814b4b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-16 22:08:48 +08:00 |
samuele3hu
|
1b2d389011
|
Update ListViewEventType for Lua
|
2014-07-16 17:18:01 +08:00 |
zhangcheng
|
80de57be39
|
1、 fixes lua TriggerTest bug.
|
2014-07-16 14:50:35 +08:00 |
samuele3hu
|
15a7ab8450
|
Update the TextureAsyncTest
|
2014-07-15 13:33:36 +08:00 |
samuele3hu
|
55e77d8fd2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-15 11:34:57 +08:00 |
samuele3hu
|
3ab7520667
|
Delete SceneEditorTest from ExtensionTest and add related binary loading to CocoStudioSceneTest
|
2014-07-15 11:34:24 +08:00 |
samuele3hu
|
b3bfa87f51
|
Fix the TMXOrthoFlipRunTimeTest bugs.
|
2014-07-14 18:30:59 +08:00 |
samuele3hu
|
f1ed090f4f
|
Fix the OpenGLTest display bugs.
|
2014-07-14 18:30:02 +08:00 |
minggo
|
7f68bdf179
|
Merge pull request #7434 from samuele3hu/v3_hot_fix
Fix the crash that CocoStudioGuiTest in the Linux platform and error display than Sprite3DTest
|
2014-07-14 16:26:42 +08:00 |
samuele3hu
|
4cb6c1c74f
|
Add lua bindings for TextureCache::addImageAsync and update the related test cases
|
2014-07-14 16:05:48 +08:00 |
Dhilan007
|
a5317dde87
|
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
|
2014-07-14 15:50:20 +08:00 |
samuele3hu
|
5f453d0105
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-14 15:32:03 +08:00 |
samuele3hu
|
ace0d05bd4
|
Fix the crash that CocoStudioGuiTest in the Linux platform and errors than Sprite3DTest
|
2014-07-14 15:28:52 +08:00 |
Dhilan007
|
8949d90212
|
update test case of new label[lua].
|
2014-07-14 13:48:28 +08:00 |
samuele3hu
|
9c7999d1c2
|
Fix the tests-lua crash on windows platform
|
2014-07-11 18:13:08 +08:00 |
samuele3hu
|
3c8dc7a596
|
Update the cocos2d.ini config
|
2014-07-11 17:21:55 +08:00 |
samuele3hu
|
01c3f2a4ed
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/tolua/cocos2dx.ini
|
2014-07-11 16:44:59 +08:00 |
samuele3hu
|
82070e5205
|
Remove glView setting form cpp to lua script
|
2014-07-11 15:34:56 +08:00 |
samuele3hu
|
bf3e0cb132
|
Update ini configure and bindings-generator submodule
|
2014-07-08 15:17:46 +08:00 |
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
|
c57fd4aa45
|
Merge branch 'support-regular-expression' of https://github.com/minggo/cocos2d-x into v3_animation3D
|
2014-07-03 15:07:14 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +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 |
gin0606
|
2c837b0960
|
add new line at the end of a file to *.mk
|
2014-06-19 20:43:27 +09: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 |
minggo
|
866a1cb9aa
|
Merge pull request #6820 from newnon/v3_android_improvements
Android project improvements
|
2014-05-27 10:17:03 +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 |
Sergey
|
4da8ad502f
|
tests release/debug build
|
2014-05-21 21:13:44 +04:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |
minggo
|
e3f2c3985d
|
Merge pull request #6777 from boyu0/physics_rollback_for_lua
Roll back lua PhysicsTest.
|
2014-05-16 21:55:52 +08:00 |
boyu0
|
74335a92f7
|
Roll back lua PhysicsTest.
|
2014-05-16 17:19:02 +08:00 |
Jason Xu
|
67a558c83d
|
for 93562d6aa6
update Cocos2dxHelper and AndroidManifest.xml template.
|
2014-05-16 15:55:00 +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
|
0ed33cacf4
|
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which
was set in '.user' file
|
2014-05-08 21:19:54 +08:00 |
minggo
|
a8d728ffc9
|
Merge pull request #6610 from zawasp/vs2013project
upgrade win32 projects for Visual Studio 2013
|
2014-05-08 15:40:02 +08:00 |
James Chen
|
bea98a1416
|
Lua xcode project fix
|
2014-05-08 15:09:02 +08:00 |
Mircea Rila
|
b66b4c6f1d
|
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
remove C4005 warnings after upgrading projects
|
2014-05-07 17:41:04 +03:00 |
James Chen
|
9862fab58f
|
Comments fix in CCRenderTexture.h
|
2014-05-07 16:37:21 +08:00 |
James Chen
|
e16d6fa63f
|
Re-adds resources in cpp-tests and lua-tests, but removes some large
files. We need to reuse some resources when doing some tests.
|
2014-05-05 13:27:47 +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 |