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 |