b8b5397e4e
Tests for Mac/iOS android Linux & Windows
2014-09-22 17:54:49 +04:00
1651c6ab23
update project
2014-09-22 15:58:50 +08:00
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
f0608a6d70
Update lua bindings for Mesh and add a Sprite3DHitTest
2014-09-22 15:29:38 +08:00
41caef878b
refactor light
2014-09-17 17:59:10 +08:00
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
51c19d4b06
update project for lua bindings of AudioEngine
2014-09-14 23:17:39 +08:00
f1f6373b6e
fix Cocos2dShaderCompile's compile error --use chipmunk static library
2014-09-12 15:29:10 +08:00
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
9901cad113
merge cocos
2014-09-11 15:55:00 +08:00
df9ab144fe
light work
2014-09-11 15:46:32 +08:00
e0df8114fa
Merge pull request #7968 from Dhilan007/v3-audio903
...
New Audio Engine[ios/android]
2014-09-11 15:23:17 +08:00
3cfc36591c
merge cocos
2014-09-11 10:13:57 +08:00
e46fa14be9
Fixes Xcode 6 warnings
2014-09-10 12:01:35 -07:00
336c85e88e
update project for audio engine on IOS.
2014-09-10 17:13:51 +08:00
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
fc27c5e32a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-09-10 14:35:33 +08:00
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
182a76a0f5
add chipmunk config for iOS & mac
2014-09-10 10:08:38 +08:00
acae8a2535
Merge branch 'v3' into addChipmunkStaticLib
...
Conflicts:
CMakeLists.txt
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
cocos/CMakeLists.txt
2014-09-10 10:00:15 +08:00
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
2014-09-09 12:18:31 -07:00
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
f2b7bd62d5
update Xcode project for audio engine
2014-09-09 11:41:17 +08:00
33a4cd396d
Adds missing xcshared data for missing projects
2014-09-05 14:32:14 -07:00
59dc56bfcb
remove chipmunk dependency
2014-09-05 21:59:30 +08:00
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
ed63f01c7e
seperate billboard test from Sprite3D test
2014-09-04 16:27:18 +08:00
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
4ae2d6fc90
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-09-04 11:27:12 +08:00
87af0ecdd6
add back libbox2d and libspine project to our solution
2014-09-03 17:37:34 +08:00
bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
58f219fc20
test extension::Scale9Sprite and remove unused file compile flags
2014-09-03 15:00:09 +08:00
3743f02c7e
finish ios/mac/android
2014-09-05 11:39:11 +08:00
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
0076953f97
fix iOS compile error
2014-09-01 15:55:09 +08:00
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
dad62ad6df
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/renderer/CCQuadCommand.h
2014-09-01 14:27:19 +08:00
06eb6c2425
put TrianglesCommand in a seperate file
2014-09-01 11:49:04 +08:00
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
043acb2fd4
rename webview to UIWebView
2014-08-29 11:28:28 +08:00
18a0f34c5c
Merge branch 'newcode' into billboard
2014-08-29 10:12:00 +08:00
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
3d97ddc739
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
c5515874d5
merge cocos
2014-08-27 11:00:14 +08:00
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
9449152caf
finish WebView Tests
2014-08-26 22:03:55 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
8a38ce10be
first version billboard
2014-08-26 15:07:37 +08:00
e12db46866
fix style
2014-08-26 12:08:26 +08:00
2226d4b420
change WebView namespace and add WebViewTest
2014-08-26 11:39:56 +08:00
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
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
c495e5266a
Remove useless win32 module project and adjust the related project setting
2014-08-25 09:59:50 +08:00
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
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
d1b4d43a0b
Remove CCModuleManager.h/cpp and adjust the related project
2014-08-22 15:10:46 +08:00
d90572fc10
engine refactor hide concept of submesh
2014-08-22 13:52:03 +08:00
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
1ed4c4eab8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-21 15:05:31 +08:00
2d8bec2ba9
remove Extension EditBox
2014-08-20 16:20:57 +08:00
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
abf6a8b128
Update Xcode project configure
2014-08-19 22:54:57 +08:00
cddb6c9fbd
Integrate all module into cocos2d on the iOS/Mac platform
2014-08-19 18:00:34 +08:00
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
cb3f20ed47
Remove lib search paths for libcocos3d
2014-08-18 15:16:57 +08:00
e0168c373c
Add manual lua bindings for 3d and adjust related test case on different platform
2014-08-18 15:04:32 +08:00
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
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
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
bf75e9996a
separate jpeg, tiff and webp
2014-08-15 14:29:10 +08:00
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
46cdd6f8dd
Merge pull request #7701 from dabingnn/v3_renderPrimitive
...
V3 render primitive
2014-08-12 16:11:40 +08:00
510b72d7c8
reset cocos2d project
2014-08-12 15:21:21 +08:00
88382994b9
Modify the gen-prebuilt tools for the lua-bindings modules.
2014-08-12 09:37:51 +08:00
031efaf242
Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3
2014-08-11 14:37:43 +08:00
3c3c05204f
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
47c034af5d
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
2014-08-11 10:25:40 +08:00
8101e2ff1a
1. move drawnode3d to Sprite3DTest
...
2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
2dacbf6f26
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-08 16:59:33 +08:00
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
00865c8abb
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 15:22:12 +08:00
97edd303b5
remove DrawNode3D
2014-08-08 15:06:45 +08:00
28769c9b15
add obb sample
2014-08-08 11:16:33 +08:00
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
ba2ae6826c
Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive
2014-08-07 15:36:41 +08:00
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
9978065d00
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive
2014-08-07 15:13:47 +08:00
495f8ffc14
Moved mingw64 build scripts out of cocos2d-x and into msys2
2014-08-06 15:52:42 +01:00
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
64c2ede765
IOS work now
...
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
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
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
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
6f763917a7
Delte liblua project for win32 and adjust cocos2d-win32 project
2014-08-06 00:26:02 +08:00
d86a37110d
Split module for win32 and adjust related test cases
2014-08-05 19:46:13 +08:00
01b69c9e4f
Merge branch 'v3' into v3_migrateFastTMX
2014-08-05 17:30:11 +08:00
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
e5f9c1b488
Adjust common script and related test cases
2014-08-04 15:22:07 +08:00
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
6f4cafcc1b
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
f269d7345e
original version of PrimitiveCommand
2014-08-01 14:46:35 +08:00
e03d284e26
merge cocos2d
2014-07-31 18:55:41 +08:00
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
2b562ace1a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-07-31 17:22:33 +08:00
5b620e610f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_module
2014-07-31 16:44:29 +08:00
ee4e479ce1
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 16:38:55 +08:00
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
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
9666f1ad7f
Split luabindings module to some independent modules
2014-07-31 15:20:23 +08:00
a5add07fb5
Merge branch 'v3' into v3_renderPrimitive
2014-07-31 14:31:24 +08:00
dfee337db1
original version of Primitive
2014-07-31 13:52:39 +08:00
407412e68b
remove .xcscheme
2014-07-31 11:54:44 +08:00
44c501ca2a
merge cocos2d
2014-07-31 09:56:23 +08:00
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
9f1cfbfca5
add skeleton and refactor skin
2014-07-30 18:32:34 +08:00
99eed6a0be
finish index data
2014-07-30 15:51:41 +08:00
428e9b1b1a
Merge branch 'v3' into v3_buildAllTarget
2014-07-30 14:12:28 +08:00
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
9c76c59e6f
resolve conflits
2014-07-29 18:48:57 +08:00
77a8d96f37
remove xcode shared scheme from code base
2014-07-29 18:39:16 +08:00
3bee93a156
add target to build All target
2014-07-29 16:43:20 +08:00
ebf05d1acc
add UIScale9Sprite tests
2014-07-29 16:24:27 +08:00
717f20571b
add UIScale9Sprite implementation
2014-07-29 16:24:27 +08:00
32ed796657
add UIScale9Sprite
2014-07-29 16:24:27 +08:00
c722c0fcd0
libcocostudio for windows
2014-07-29 11:31:37 +08:00
d53ce4d664
libcocosbuilder rename for windows
2014-07-29 11:09:17 +08:00
6d0b8852d1
libSpine rename for windows
2014-07-29 10:53:39 +08:00
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +08:00
aaa65dcae4
Merge branch 'v3' into v3_windowChangeModule
2014-07-29 10:20:23 +08:00
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
d6bc2f4998
liuGUI->libui for windows
2014-07-28 22:12:07 +08:00
c6956504bf
change CocosDenshion to libcocosdenshion
2014-07-28 21:35:16 +08:00
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
98b0797c0e
add shared xcscheme
2014-07-28 15:41:33 +08:00
bf6e706ab9
fix xcode project setting
2014-07-28 15:37:00 +08:00
2795c10627
rename box2d->libbox2d
2014-07-28 12:05:58 +08:00
b72bffab1f
change mac/ios target name
2014-07-25 14:27:52 +08:00
b9d8e84b4d
Merge pull request #7581 from andyque/fixEditBoxCompile
...
fix mac compile error
2014-07-24 21:59:31 +08:00
7dc7c95ca3
fix mac compile error
2014-07-24 14:47:54 +08:00
b110296e53
reverse win32 sln
2014-07-24 10:09:38 +08:00
e274b38a16
change mac cocosNetwork deps to relative path
2014-07-24 09:36:21 +08:00
abe0166f60
fix the bug that cocos2d_libs.xcodeproj can not be opened in cocos2d_tests.xcodeproj
2014-07-22 23:41:30 +08:00
2acce6771f
software per decompression support
2014-07-22 15:49:36 +04:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
1dc3552916
rename product name to $(TARGET_NAME)
2014-07-18 14:41:21 +08:00
dbb3e0ac2e
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
21b3e55339
Mac dylib version works now
2014-07-17 20:58:50 +08:00
52ac47aea8
Merge branch 'v3' into v3_dll
2014-07-17 18:27:36 +08:00
a9031154e0
Fix the actionTimelineTest crash on mac platform
2014-07-17 17:38:53 +08:00
0f89c6c8b5
add dependency for lua iOS targets
2014-07-17 13:58:50 +08:00
02c61af9fd
add cocosStudio cocosBuilder cocosGUI iOS target
2014-07-17 12:06:20 +08:00
4c609e11f0
add cocosSpin iOS target
2014-07-17 10:44:13 +08:00
d030c8aed3
add cocosNetwork ios target
2014-07-17 10:06:23 +08:00
add4caca5a
add cocosNetwork target for mac
2014-07-16 18:21:21 +08:00
ab76be8d47
add cocosSpine target for mac
2014-07-16 17:51:42 +08:00
778f1983b1
add cocosStudio target for mac
2014-07-16 17:35:35 +08:00
b7f6ba84c6
add cocosGUI and cocosBuilder target for mac
2014-07-16 16:37:29 +08:00
a0be6d9ac7
remove Storage project, merge code into cocos2d
2014-07-16 14:49:05 +08:00
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
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
0c4f4efc0b
merge iOS arm64 lib to fat lib, change the project setting.
2014-07-14 19:27:19 +08:00
7757df222a
Add bit extend module
2014-07-14 18:26:39 +08:00
469dbea7da
window dll version work now
2014-07-14 14:40:47 +08:00
da80170d06
fix ios project bug
2014-07-11 14:55:00 +08:00
43255e2b96
Merge branch 'v3' into addStudio1.4
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
2014-07-11 13:55:13 +08:00
646f7c7e3f
Merge branch 'v3' into addStudio1.4
2014-07-11 13:39:34 +08:00
dd76ae93f6
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
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
6de47ea53a
update ccs-res and add custom ImageView and custom particle widget support
2014-07-10 16:37:15 +08:00
8b42eb4ce9
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-10 16:37:15 +08:00
937b0ab52a
add cocostudio parser test template
2014-07-10 16:37:15 +08:00
3546c131dd
Add Lua bindings for controller and related test case project
2014-07-09 18:05:02 +08:00
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
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
1bc0397644
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-01 09:47:41 +08:00
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
6ed0ac8762
remove unnecessary file
2014-06-30 14:14:43 +08:00
ef5da0649a
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
a63216d97b
issue #4895:Add test case
2014-06-30 03:25:49 +08:00
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
1eab15ea41
add MarginZero as an external variable
2014-06-27 15:56:29 +08:00
cfb992e7cf
Upate templates project setting
2014-06-27 14:52:32 +08:00
b1d07f2711
Add VideoPlayer Test for Lua
2014-06-27 13:56:39 +08:00
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +08:00
3bd195d4ef
Add Lua binding for ActionTimeline related and related test cases
2014-06-26 09:51:32 +08:00
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
113f20094f
added building wp8 shaders instructions
2014-06-20 09:12:16 -07:00
aa4ffc33ac
updated WP8 shader compiler tool
2014-06-20 09:06:49 -07:00
1e319bc1f8
fix compile bug
2014-06-20 22:38:09 +08:00
0d07e19cd1
Merge pull request #7054 from 2youyouo2/v3
...
add TimelineAction
2014-06-19 21:05:15 +08:00
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
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
ca24ad6768
Merge branch 'v3' into cleanupBinaryLoader
2014-06-18 11:19:19 +08:00
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
5d85d93ef3
added script to copy angle dlls for testing new versions of angle
2014-06-16 10:36:50 -07:00
7ae06d44a6
cache work
2014-06-16 20:58:13 +08:00
b289106eda
add cpp to mac project
2014-06-13 19:41:08 +08:00
cb213183bc
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
320f04f79f
adjust files associated with TimeLineAction
2014-06-13 13:46:13 +08:00
1cb7dd58ec
add CCNodeReader into project
2014-06-12 19:40:58 +08:00
f191c72732
add TimeLineAction into project
2014-06-12 16:27:45 +08:00
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
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
b895018765
update parser
2014-06-11 09:35:24 +08:00
48f7743daa
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-10 15:08:10 +08:00
29ac8d746d
Merge pull request #7012 from Dhilan007/v3-testcast
...
update test cast of label.
2014-06-09 16:32:32 +08:00
c109cff099
update Xcode project.
2014-06-09 14:18:05 +08:00
7a25fbfe29
refactor touch event
2014-06-09 10:23:11 +08:00
6bbf5a1459
tests
2014-06-06 10:12:23 +08:00
ed8f8a9cad
sprite3d with skin render&bundle
2014-06-05 16:36:01 +08:00
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
0c2f8ed401
Lua compiles and runs
2014-06-04 09:26:39 -07:00
54caf26a57
animation3d
2014-06-04 18:17:09 +08:00
54e93f6c41
fix ObjectFactory refactor issue
2014-06-04 14:56:34 +08:00
cb10fb560a
not treat warnings as error
2014-06-04 09:44:34 +08:00
4b979d67db
issue #5429 : treat warning as error on Mac
2014-05-30 16:46:01 +08:00
70f3510a27
issue #5429 : treat warning as eror on iOS
2014-05-30 16:21:31 +08:00
d7cca2a044
closed #4819 : remove KeyboardTest
2014-05-28 18:31:00 +08:00
0acc4cd961
issue #4819 : remove KeyPadTest
2014-05-28 18:17:22 +08:00
0ad0f9c405
issue #4819 : remove AccelerometerTest
2014-05-28 18:10:37 +08:00
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
866a1cb9aa
Merge pull request #6820 from newnon/v3_android_improvements
...
Android project improvements
2014-05-27 10:17:03 +08:00
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
5601048829
Fixes compiler warnings for mac and ios
2014-05-22 16:34:16 -03:00
a6efd4f650
Move `setSearchPat` operation from cpp to script
2014-05-22 14:00:39 +08:00
6c8e38871c
issue #5255:Remove Sprite3D effect test
2014-05-22 10:22:10 +08:00
3971666426
updated pch file for wp8
2014-05-20 10:06:24 -07:00
49f26f3fbf
lua template & android-build.py updated
2014-05-20 13:49:02 +04:00
b6373b5303
Merge branch 'v3' into refactorLayout
2014-05-20 09:30:23 +08:00
a03a565863
issue #5138 , add Groups in Xcode
2014-05-19 14:11:39 +08:00
5ddfc41414
Merge branch 'v3' into refactorLayout
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-19 13:54:16 +08:00
9bf7ec3c20
Cleanup project file.
...
[REM]: old library references. New libraries are under prebuilt.
2014-05-19 09:08:35 +04:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
a1243ca9ed
Squashed commit of the following:
...
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:37:58 2014 -0700
little fixes in project
commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:33:11 2014 -0700
CopyTemplates working
commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:22:05 2014 -0700
Re-adds CopyTemplate to VS solution
commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 16:40:22 2014 -0700
Updated shaders
and project fixes
2014-05-16 17:38:52 -07:00
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
2014-05-16 14:36:00 -07:00
967c071c68
issue #5183 , refator LayoutExecutant
2014-05-14 18:24:23 +08:00
8c8f9611f7
issue #5183 , add CCLayoutExecutant file
2014-05-14 18:03:44 +08:00
ee4e5e4800
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-14 14:45:15 +08:00
534ad2aafb
fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
2014-05-14 14:43:10 +08:00
fca0ec696f
Undo project file changes
2014-05-12 23:32:19 -07:00
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
e1f82c174b
add TestCase for reparentChildren bug
2014-05-12 22:50:31 -07:00
5c5b0184ab
updated winrt shader compiler app to latest version
2014-05-12 09:23:48 -07:00
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
a61b1097db
issue #4660 : Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String
2014-05-10 19:24:03 +08:00
e84ccc8914
issue #4660 : Updates Xcode project
2014-05-10 19:24:03 +08:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
0b8aed3536
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 11:51:00 -07:00
88f1d8ac4e
Add ShaderTest sample and shader code
2014-05-09 11:48:11 -07:00
6727c6d19c
Adds missing files to xcode
2014-05-09 11:45:12 -07:00
78dd92a7ef
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
d12a71f738
issue #5057 , refactor UILayoutDefine
2014-05-09 17:16:11 +08:00
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
95e036dd1b
GLProgramStateCache
2014-05-08 21:54:49 -07:00
c904fff9eb
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
453b670ad2
Removes CCVertexAttribBind
2014-05-08 14:01:26 -07:00
087378926f
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-08 10:16:09 -07:00
52d7d804f7
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
9f0e25d808
Merge pull request #6628 from andyque/refactor5056
...
refactor 5056. pull gui tests from ExtensionTest to UITest
2014-05-08 17:00:38 +08:00
bea98a1416
Lua xcode project fix
2014-05-08 15:09:02 +08:00
898a66131a
issue #5056 . move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
b401f6adc1
Lots of new code
...
Adds GLProgramState
2014-05-07 20:20:19 -07:00
bbd4533c5e
Improves GLProgram
...
Adds vetex attrib bind class
2014-05-06 11:03:24 -07:00
cb5b2a4f85
issue #4861 , Merge branch 'v3' into focus3861
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
67b2fbf14b
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
d82e03b048
Xcode project fix
2014-05-05 13:31:38 +08:00
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
47acbc24e0
issue #4861 , add CCEventFocus and CCEventListener
2014-05-05 11:37:38 +08:00
530efbca7e
Reverts files for winrt project
2014-05-05 01:33:22 +08:00
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
037c57ef96
Merge branch 'develop' into perf-callback
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-25 12:07:48 +08:00
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
68e058b12d
IOS/Mac OK: remove kazMath
...
Make code compatible with old tests
2014-04-21 17:37:52 +08:00
a6b81ec772
issue #3333 , fix project unused link
2014-04-21 17:13:43 +08:00
f71178bac5
added missing files
2014-04-19 10:11:18 -07:00
1a56f435fe
added missing files
2014-04-19 09:32:12 -07:00
ec40dda7f3
Adds performance test for callbacks: 1) std::function,
...
2) (target->*selector)(), 3) simulate new api of Scheduler
2014-04-16 10:35:58 +08:00
c3bf78494a
remove CCFrustum.cpp, we will use new instead
2014-04-14 14:18:32 +08:00
Sergey