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 |
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 |
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 |