yangxiao
|
cf9094207a
|
merge cocos
|
2014-09-09 16:00:55 +08:00 |
Dhilan007
|
f2b7bd62d5
|
update Xcode project for audio engine
|
2014-09-09 11:41:17 +08:00 |
Ricardo Quesada
|
33a4cd396d
|
Adds missing xcshared data for missing projects
|
2014-09-05 14:32:14 -07:00 |
andyque
|
59dc56bfcb
|
remove chipmunk dependency
|
2014-09-05 21:59:30 +08:00 |
yangxiao
|
8da7a4b2de
|
merge cocos reslove conflict
|
2014-09-04 17:40:14 +08:00 |
yangxiao
|
ed63f01c7e
|
seperate billboard test from Sprite3D test
|
2014-09-04 16:27:18 +08:00 |
minggo
|
43e2b39bc0
|
Merge pull request #7921 from dabingnn/v3_trianglesCommand
V3 triangles command
|
2014-09-04 13:58:50 +08:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +08:00 |
Huabing.Xu
|
4ae2d6fc90
|
Merge branch 'v3' into v3_trianglesCommand
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-09-04 11:27:12 +08:00 |
andyque
|
87af0ecdd6
|
add back libbox2d and libspine project to our solution
|
2014-09-03 17:37:34 +08:00 |
yangxiao
|
bb90fe48ef
|
merge cocos
|
2014-09-03 16:54:17 +08:00 |
andyque
|
58f219fc20
|
test extension::Scale9Sprite and remove unused file compile flags
|
2014-09-03 15:00:09 +08:00 |
andyque
|
3743f02c7e
|
finish ios/mac/android
|
2014-09-05 11:39:11 +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 |
Huabing.Xu
|
dad62ad6df
|
Merge branch 'v3' into v3_trianglesCommand
Conflicts:
cocos/renderer/CCQuadCommand.h
|
2014-09-01 14:27:19 +08:00 |
Huabing.Xu
|
06eb6c2425
|
put TrianglesCommand in a seperate file
|
2014-09-01 11:49:04 +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 |
yangxiao
|
18a0f34c5c
|
Merge branch 'newcode' into billboard
|
2014-08-29 10:12:00 +08:00 |
minggo
|
7baf873bf6
|
remove unneeded includes
|
2014-08-28 17:03:29 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +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 |
yangxiao
|
c5515874d5
|
merge cocos
|
2014-08-27 11:00:14 +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 |
yangxiao
|
8a38ce10be
|
first version billboard
|
2014-08-26 15:07:37 +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 |
gin0606
|
5349aa7efb
|
Add ccRandom.h
|
2014-08-07 21:17:36 +09:00 |
Huabing.Xu
|
ba2ae6826c
|
Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive
|
2014-08-07 15:36:41 +08:00 |
yangxiao
|
3c9483899e
|
camera, cameratest, drawNode3D squash
|
2014-08-07 15:23:31 +08:00 |
Huabing.Xu
|
9978065d00
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive
|
2014-08-07 15:13:47 +08:00 |
martell
|
495f8ffc14
|
Moved mingw64 build scripts out of cocos2d-x and into msys2
|
2014-08-06 15:52:42 +01:00 |
martell
|
75911658aa
|
Make CMake More Robust
|
2014-08-06 15:43:19 +01:00 |
Huabing.Xu
|
64c2ede765
|
IOS work now
reset binding buffer to 0 after drawing
|
2014-08-06 15:46:35 +08:00 |
samuele3hu
|
497847f7e8
|
Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files.
|
2014-08-06 14:46:30 +08:00 |
samuele3hu
|
9912b596f8
|
Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake
|
2014-08-06 13:51:46 +08:00 |
samuele3hu
|
0daa30419b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
|
2014-08-06 00:37:19 +08:00 |
samuele3hu
|
6f763917a7
|
Delte liblua project for win32 and adjust cocos2d-win32 project
|
2014-08-06 00:26:02 +08:00 |
samuele3hu
|
d86a37110d
|
Split module for win32 and adjust related test cases
|
2014-08-05 19:46:13 +08:00 |
Huabing.Xu
|
01b69c9e4f
|
Merge branch 'v3' into v3_migrateFastTMX
|
2014-08-05 17:30:11 +08:00 |
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 |
yangxiao
|
4452d9579a
|
merge cocos2d, fix lua
|
2014-08-04 12:07:27 +08:00 |
samuele3hu
|
6f4cafcc1b
|
Add module register functions and adjust iOS and Mac test cases
|
2014-08-04 09:39:42 +08:00 |
huangshiwu
|
575c9787c0
|
Merge branch 'v3' into v3_pr
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-01 15:11:34 +08:00 |
Huabing.Xu
|
f269d7345e
|
original version of PrimitiveCommand
|
2014-08-01 14:46:35 +08:00 |
yangxiao
|
e03d284e26
|
merge cocos2d
|
2014-07-31 18:55:41 +08:00 |
samuele3hu
|
6bb21c0f4d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
tools/tolua/cocos2dx.ini
|
2014-07-31 17:52:22 +08:00 |
samuele3hu
|
2b562ace1a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-07-31 17:22:33 +08:00 |
samuele3hu
|
5b620e610f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_module
|
2014-07-31 16:44:29 +08:00 |
samuele3hu
|
ee4e479ce1
|
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
|
2014-07-31 16:38:55 +08:00 |
Huabing.Xu
|
2bf2bbeed7
|
1. remove mac 32bit
2. remove copy files for mac(because of mac use .a instead of dylib)
|
2014-07-31 15:46:16 +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 |
Huabing.Xu
|
a5add07fb5
|
Merge branch 'v3' into v3_renderPrimitive
|
2014-07-31 14:31:24 +08:00 |
Huabing.Xu
|
dfee337db1
|
original version of Primitive
|
2014-07-31 13:52:39 +08:00 |
yangxiao
|
407412e68b
|
remove .xcscheme
|
2014-07-31 11:54:44 +08:00 |
yangxiao
|
44c501ca2a
|
merge cocos2d
|
2014-07-31 09:56:23 +08:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
yangxiao
|
9f1cfbfca5
|
add skeleton and refactor skin
|
2014-07-30 18:32:34 +08:00 |
Huabing.Xu
|
99eed6a0be
|
finish index data
|
2014-07-30 15:51:41 +08:00 |
Huabing.Xu
|
428e9b1b1a
|
Merge branch 'v3' into v3_buildAllTarget
|
2014-07-30 14:12:28 +08:00 |
minggo
|
e99879467d
|
Merge pull request #7620 from heliclei/jenkins-ios-build
remove xcode shared scheme from code base
|
2014-07-30 09:48:02 +08:00 |
heliclei
|
9c76c59e6f
|
resolve conflits
|
2014-07-29 18:48:57 +08:00 |
heliclei
|
77a8d96f37
|
remove xcode shared scheme from code base
|
2014-07-29 18:39:16 +08:00 |
Huabing.Xu
|
3bee93a156
|
add target to build All target
|
2014-07-29 16:43:20 +08:00 |
andyque
|
ebf05d1acc
|
add UIScale9Sprite tests
|
2014-07-29 16:24:27 +08:00 |
andyque
|
717f20571b
|
add UIScale9Sprite implementation
|
2014-07-29 16:24:27 +08:00 |
andyque
|
32ed796657
|
add UIScale9Sprite
|
2014-07-29 16:24:27 +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 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +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 |
minggo
|
98b0797c0e
|
add shared xcscheme
|
2014-07-28 15:41:33 +08:00 |
minggo
|
bf6e706ab9
|
fix xcode project setting
|
2014-07-28 15:37:00 +08:00 |
Huabing.Xu
|
2795c10627
|
rename box2d->libbox2d
|
2014-07-28 12:05:58 +08:00 |
Huabing.Xu
|
b72bffab1f
|
change mac/ios target name
|
2014-07-25 14:27:52 +08:00 |
minggo
|
b9d8e84b4d
|
Merge pull request #7581 from andyque/fixEditBoxCompile
fix mac compile error
|
2014-07-24 21:59:31 +08:00 |
Huabing.Xu
|
7dc7c95ca3
|
fix mac compile error
|
2014-07-24 14:47:54 +08:00 |
Huabing.Xu
|
b110296e53
|
reverse win32 sln
|
2014-07-24 10:09:38 +08:00 |
Huabing.Xu
|
e274b38a16
|
change mac cocosNetwork deps to relative path
|
2014-07-24 09:36:21 +08:00 |
minggo
|
abe0166f60
|
fix the bug that cocos2d_libs.xcodeproj can not be opened in cocos2d_tests.xcodeproj
|
2014-07-22 23:41:30 +08:00 |
Sergey
|
2acce6771f
|
software per decompression support
|
2014-07-22 15:49:36 +04:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
Huabing.Xu
|
1dc3552916
|
rename product name to $(TARGET_NAME)
|
2014-07-18 14:41:21 +08:00 |
Huabing.Xu
|
dbb3e0ac2e
|
copy dylib to *.app bundle
|
2014-07-18 14:00:14 +08:00 |
Huabing.Xu
|
21b3e55339
|
Mac dylib version works now
|
2014-07-17 20:58:50 +08:00 |
Huabing.Xu
|
52ac47aea8
|
Merge branch 'v3' into v3_dll
|
2014-07-17 18:27:36 +08:00 |
samuele3hu
|
a9031154e0
|
Fix the actionTimelineTest crash on mac platform
|
2014-07-17 17:38:53 +08:00 |
Huabing.Xu
|
0f89c6c8b5
|
add dependency for lua iOS targets
|
2014-07-17 13:58:50 +08:00 |
Huabing.Xu
|
02c61af9fd
|
add cocosStudio cocosBuilder cocosGUI iOS target
|
2014-07-17 12:06:20 +08:00 |
Huabing.Xu
|
4c609e11f0
|
add cocosSpin iOS target
|
2014-07-17 10:44:13 +08:00 |
Huabing.Xu
|
d030c8aed3
|
add cocosNetwork ios target
|
2014-07-17 10:06:23 +08:00 |
Huabing.Xu
|
add4caca5a
|
add cocosNetwork target for mac
|
2014-07-16 18:21:21 +08:00 |
Huabing.Xu
|
ab76be8d47
|
add cocosSpine target for mac
|
2014-07-16 17:51:42 +08:00 |
Huabing.Xu
|
778f1983b1
|
add cocosStudio target for mac
|
2014-07-16 17:35:35 +08:00 |
Huabing.Xu
|
b7f6ba84c6
|
add cocosGUI and cocosBuilder target for mac
|
2014-07-16 16:37:29 +08:00 |
Huabing.Xu
|
a0be6d9ac7
|
remove Storage project, merge code into cocos2d
|
2014-07-16 14:49:05 +08:00 |
Huabing.Xu
|
0350186589
|
Merge branch 'v3' into v3_dll
|
2014-07-16 11:15:16 +08:00 |
minggo
|
a59a86df0a
|
Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib
merge iOS arm64 libs to fat libs, change the project setting.
|
2014-07-15 16:57:10 +08:00 |
boyu0
|
0c4f4efc0b
|
merge iOS arm64 lib to fat lib, change the project setting.
|
2014-07-14 19:27:19 +08:00 |
samuele3hu
|
7757df222a
|
Add bit extend module
|
2014-07-14 18:26:39 +08:00 |
Huabing.Xu
|
469dbea7da
|
window dll version work now
|
2014-07-14 14:40:47 +08:00 |
andyque
|
da80170d06
|
fix ios project bug
|
2014-07-11 14:55:00 +08:00 |
andyque
|
43255e2b96
|
Merge branch 'v3' into addStudio1.4
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
|
2014-07-11 13:55:13 +08:00 |
andyque
|
646f7c7e3f
|
Merge branch 'v3' into addStudio1.4
|
2014-07-11 13:39:34 +08:00 |
samuele3hu
|
dd76ae93f6
|
Update controller lua binding and related test cases
|
2014-07-11 11:52:05 +08:00 |
samuele3hu
|
caae8392d4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
|
2014-07-10 22:42:09 +08:00 |
andyque
|
6de47ea53a
|
update ccs-res and add custom ImageView and custom particle widget support
|
2014-07-10 16:37:15 +08:00 |
andyque
|
8b42eb4ce9
|
add Cocostudio 1.3,1.4, 1.5 ui tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
937b0ab52a
|
add cocostudio parser test template
|
2014-07-10 16:37:15 +08:00 |
samuele3hu
|
3546c131dd
|
Add Lua bindings for controller and related test case project
|
2014-07-09 18:05:02 +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 |
LinWenhai
|
2ca5c01902
|
issue #4689: Refactoring game controller API[ios]
|
2014-07-04 21:24:32 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +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 |
minggo
|
3b13855374
|
fix compiling error on iOS
|
2014-06-30 17:20:13 +08:00 |
Dhilan007
|
6ed0ac8762
|
remove unnecessary file
|
2014-06-30 14:14:43 +08:00 |
Dhilan007
|
ef5da0649a
|
issue #4895:Add test case[ios]
|
2014-06-30 12:53:26 +08:00 |
Dhilan007
|
a63216d97b
|
issue #4895:Add test case
|
2014-06-30 03:25:49 +08:00 |
minggo
|
7f28e81d09
|
Merge pull request #7226 from super626/v3
Animation3D
|
2014-06-29 16:41:13 +08:00 |
andyque
|
1eab15ea41
|
add MarginZero as an external variable
|
2014-06-27 15:56:29 +08:00 |
samuele3hu
|
cfb992e7cf
|
Upate templates project setting
|
2014-06-27 14:52:32 +08:00 |
samuele3hu
|
b1d07f2711
|
Add VideoPlayer Test for Lua
|
2014-06-27 13:56:39 +08:00 |
yangxiao
|
392a769c8f
|
merge cocos2d v3
|
2014-06-26 22:48:42 +08:00 |
samuele3hu
|
3bd195d4ef
|
Add Lua binding for ActionTimeline related and related test cases
|
2014-06-26 09:51:32 +08:00 |
andyque
|
5624da5448
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
|
2014-06-23 09:37:39 +08:00 |
Dale Stammen
|
113f20094f
|
added building wp8 shaders instructions
|
2014-06-20 09:12:16 -07:00 |
Dale Stammen
|
aa4ffc33ac
|
updated WP8 shader compiler tool
|
2014-06-20 09:06:49 -07:00 |
yangxiao
|
1e319bc1f8
|
fix compile bug
|
2014-06-20 22:38:09 +08:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
zhangbin
|
1b056b6c49
|
Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
|
2014-06-18 17:06:56 +08:00 |
andyque
|
ca24ad6768
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-18 11:19:19 +08:00 |
minggo
|
26cca348cb
|
Merge pull request #7085 from super626/v3
Sprite3D animation
|
2014-06-17 21:05:58 +08:00 |
Dale Stammen
|
5d85d93ef3
|
added script to copy angle dlls for testing new versions of angle
|
2014-06-16 10:36:50 -07:00 |
yangxiao
|
7ae06d44a6
|
cache work
|
2014-06-16 20:58:13 +08:00 |
yinkaile
|
b289106eda
|
add cpp to mac project
|
2014-06-13 19:41:08 +08:00 |
pipu
|
cb213183bc
|
adjust project.pbxproj and files associated with ActionTimeLine
|
2014-06-13 16:33:07 +08:00 |
pipu
|
320f04f79f
|
adjust files associated with TimeLineAction
|
2014-06-13 13:46:13 +08:00 |
pipu
|
1cb7dd58ec
|
add CCNodeReader into project
|
2014-06-12 19:40:58 +08:00 |
pipu
|
f191c72732
|
add TimeLineAction into project
|
2014-06-12 16:27:45 +08:00 |
Huabing.Xu
|
f1bc0971aa
|
extract mesh data, material data, skin data into a header file for reuse in converter and engine
|
2014-06-11 18:24:14 +08:00 |
Huabing.Xu
|
65acec013b
|
Merge branch 'v3' into v3Animation
|
2014-06-11 17:45:31 +08:00 |
andyque
|
b895018765
|
update parser
|
2014-06-11 09:35:24 +08:00 |
andyque
|
48f7743daa
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-10 15:08:10 +08:00 |
minggo
|
29ac8d746d
|
Merge pull request #7012 from Dhilan007/v3-testcast
update test cast of label.
|
2014-06-09 16:32:32 +08:00 |
Dhilan007
|
c109cff099
|
update Xcode project.
|
2014-06-09 14:18:05 +08:00 |
andyque
|
7a25fbfe29
|
refactor touch event
|
2014-06-09 10:23:11 +08:00 |
andyque
|
6bbf5a1459
|
tests
|
2014-06-06 10:12:23 +08:00 |
yangxiao
|
ed8f8a9cad
|
sprite3d with skin render&bundle
|
2014-06-05 16:36:01 +08:00 |
andyque
|
c96a6086c3
|
improve parsing code
|
2014-06-05 11:43:43 +08:00 |
Ricardo Quesada
|
0c2f8ed401
|
Lua compiles and runs
|
2014-06-04 09:26:39 -07:00 |
yangxiao
|
54caf26a57
|
animation3d
|
2014-06-04 18:17:09 +08:00 |