andyque
|
58f219fc20
|
test extension::Scale9Sprite and remove unused file compile flags
|
2014-09-03 15:00:09 +08:00 |
andyque
|
85ce801fdd
|
remove ccscale9sprite , cceditBox
|
2014-09-01 17:06:22 +08:00 |
andyque
|
0076953f97
|
fix iOS compile error
|
2014-09-01 15:55:09 +08:00 |
andyque
|
aef0f5e729
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
|
2014-09-01 15:26:25 +08:00 |
minggo
|
e4920ffdea
|
fix conflict
|
2014-08-29 15:45:21 +08:00 |
andyque
|
043acb2fd4
|
rename webview to UIWebView
|
2014-08-29 11:28:28 +08:00 |
minggo
|
7baf873bf6
|
remove unneeded includes
|
2014-08-28 17:03:29 +08:00 |
andyque
|
3d97ddc739
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/ui/Android.mk
|
2014-08-27 14:08:16 +08:00 |
minggo
|
04bfbdd5a1
|
fix conflict
|
2014-08-27 13:50:01 +08:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
andyque
|
9449152caf
|
finish WebView Tests
|
2014-08-26 22:03:55 +08:00 |
minggo
|
b9c51e6994
|
remove unneeded codes
|
2014-08-26 18:19:28 +08:00 |
andyque
|
e12db46866
|
fix style
|
2014-08-26 12:08:26 +08:00 |
andyque
|
2226d4b420
|
change WebView namespace and add WebViewTest
|
2014-08-26 11:39:56 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
samuele3hu
|
c495e5266a
|
Remove useless win32 module project and adjust the related project setting
|
2014-08-25 09:59:50 +08:00 |
samuele3hu
|
281da9f1d7
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
|
2014-08-25 09:51:08 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
samuele3hu
|
d1b4d43a0b
|
Remove CCModuleManager.h/cpp and adjust the related project
|
2014-08-22 15:10:46 +08:00 |
yangxiao
|
d90572fc10
|
engine refactor hide concept of submesh
|
2014-08-22 13:52:03 +08:00 |
samuele3hu
|
2f60e610a2
|
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
|
2014-08-22 13:49:21 +08:00 |
samuele3hu
|
1ed4c4eab8
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-21 15:05:31 +08:00 |
andyque
|
2d8bec2ba9
|
remove Extension EditBox
|
2014-08-20 16:20:57 +08:00 |
andyque
|
9a3c2dc6a4
|
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-20 09:56:16 +08:00 |
samuele3hu
|
abf6a8b128
|
Update Xcode project configure
|
2014-08-19 22:54:57 +08:00 |
samuele3hu
|
cddb6c9fbd
|
Integrate all module into cocos2d on the iOS/Mac platform
|
2014-08-19 18:00:34 +08:00 |
andyque
|
8d1c422ac5
|
merge extension EditBox to ui module
|
2014-08-19 10:28:24 +08:00 |
samuele3hu
|
cb3f20ed47
|
Remove lib search paths for libcocos3d
|
2014-08-18 15:16:57 +08:00 |
samuele3hu
|
e0168c373c
|
Add manual lua bindings for 3d and adjust related test case on different platform
|
2014-08-18 15:04:32 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
samuele3hu
|
85ef11ae56
|
Split cocos3d from cocos2d on the iOS/Mac platform and adjust the related iOS/Mac test project
|
2014-08-16 21:51:39 +08:00 |
minggo
|
f2f8035724
|
Merge pull request #7708 from super626/obb
AABB, OBB
|
2014-08-15 15:32:14 +08:00 |
minggo
|
bf75e9996a
|
separate jpeg, tiff and webp
|
2014-08-15 14:29:10 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |
gin0606
|
17aa2833db
|
Fix xcode warning that cause `getEngine` inline expansion
|
2014-08-12 18:07:17 +09:00 |
minggo
|
46cdd6f8dd
|
Merge pull request #7701 from dabingnn/v3_renderPrimitive
V3 render primitive
|
2014-08-12 16:11:40 +08:00 |
yangxiao
|
510b72d7c8
|
reset cocos2d project
|
2014-08-12 15:21:21 +08:00 |
zhangbin
|
88382994b9
|
Modify the gen-prebuilt tools for the lua-bindings modules.
|
2014-08-12 09:37:51 +08:00 |
Huabing.Xu
|
031efaf242
|
Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3
|
2014-08-11 14:37:43 +08:00 |
samuele3hu
|
3c3c05204f
|
Split files in lua-bindings/script into different module and adjust related project
|
2014-08-11 12:54:30 +08:00 |
samuele3hu
|
47c034af5d
|
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
|
2014-08-11 10:25:40 +08:00 |
lvlong
|
8101e2ff1a
|
1. move drawnode3d to Sprite3DTest
2. add getAABB to sprite3D and mesh
|
2014-08-08 17:54:39 +08:00 |
samuele3hu
|
2dacbf6f26
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-08-08 16:59:33 +08:00 |
yangxiao
|
ceb6549ec8
|
merge cocos2d
|
2014-08-08 16:25:52 +08:00 |
samuele3hu
|
00865c8abb
|
Modify the mechanism that files copy to lua-empty-test and lua-template
|
2014-08-08 15:22:12 +08:00 |
yangxiao
|
97edd303b5
|
remove DrawNode3D
|
2014-08-08 15:06:45 +08:00 |
lvlong
|
28769c9b15
|
add obb sample
|
2014-08-08 11:16:33 +08:00 |
yangxiao
|
813e954f4e
|
aabb, obb
|
2014-08-08 00:00:58 +08:00 |