Dhilan007
47629aec64
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:42:00 +08:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
Huabing.Xu
8135b09c98
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-15 15:55:17 +08:00
samuele3hu
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
SunLightJuly
f2286eaf94
added ClippingRectangleNode
2014-10-15 13:38:14 +08:00
Huabing.Xu
93158a1cfb
update spine runtime and test case
2014-10-15 11:23:02 +08:00
pipu
96c8fde63a
1. Modifying UIButton.cpp
...
2. Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
2014-10-13 12:49:15 +08:00
pipu
86aee1e548
Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk
2014-10-12 15:39:22 +08:00
SunLightJuly
a36dbf5362
ClippingRegionNode --> ClippingRectangleNode
2014-10-11 11:49:01 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
SunLightJuly
ba064167a8
modified project files and make files
2014-10-10 18:43:40 +08:00
pipu
d699b5809b
Modifying libprotocolbuf.a as protocolbuffer.a
2014-10-10 12:52:42 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Ricardo Quesada
d326db427f
removes the `3d_export.h` file
2014-10-08 18:30:23 -07:00
SunLightJuly
763b54e5cb
added LuaStack::loadChunksFromZIP()
2014-10-08 17:30:14 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
Ricardo Quesada
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
yangxiao
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
minggo
ebf0562b84
remove armv7s support on iOS
2014-09-26 10:35:50 +08:00
yangxiao
ca9eb3d203
support ambient light without normal & optimaze code
2014-09-25 18:32:33 +08:00
yangxiao
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
minggo
fdb30f1ee7
Merge pull request #8115 from Dhilan007/v3-audio903
...
New Audio Engine -MAC
2014-09-24 15:00:53 +08:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Dhilan007
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
yangxiao
41caef878b
refactor light
2014-09-17 17:59:10 +08:00
yangxiao
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
yangxiao
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
yangxiao
9901cad113
merge cocos
2014-09-11 15:55:00 +08:00
yangxiao
df9ab144fe
light work
2014-09-11 15:46:32 +08:00
minggo
e0df8114fa
Merge pull request #7968 from Dhilan007/v3-audio903
...
New Audio Engine[ios/android]
2014-09-11 15:23:17 +08:00
yangxiao
3cfc36591c
merge cocos
2014-09-11 10:13:57 +08:00
Ricardo Quesada
e46fa14be9
Fixes Xcode 6 warnings
2014-09-10 12:01:35 -07:00
Dhilan007
336c85e88e
update project for audio engine on IOS.
2014-09-10 17:13:51 +08:00
yangxiao
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
yangxiao
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
andyque
182a76a0f5
add chipmunk config for iOS & mac
2014-09-10 10:08:38 +08:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
yangxiao
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
Ricardo Quesada
33a4cd396d
Adds missing xcshared data for missing projects
2014-09-05 14:32:14 -07:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +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
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
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
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
yangxiao
c5515874d5
merge cocos
2014-08-27 11:00:14 +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
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
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
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
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
samuele3hu
cb3f20ed47
Remove lib search paths for libcocos3d
2014-08-18 15:16:57 +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
lvlong
8101e2ff1a
1. move drawnode3d to Sprite3DTest
...
2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +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
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
Huabing.Xu
64c2ede765
IOS work now
...
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
Huabing.Xu
01b69c9e4f
Merge branch 'v3' into v3_migrateFastTMX
2014-08-05 17:30:11 +08:00
yangxiao
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +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
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
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
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
717f20571b
add UIScale9Sprite implementation
2014-07-29 16:24:27 +08:00
andyque
32ed796657
add UIScale9Sprite
2014-07-29 16:24:27 +08:00
yangxiao
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +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
b72bffab1f
change mac/ios target name
2014-07-25 14:27:52 +08:00
Huabing.Xu
7dc7c95ca3
fix mac compile error
2014-07-24 14:47:54 +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
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
boyu0
0c4f4efc0b
merge iOS arm64 lib to fat lib, change the project setting.
2014-07-14 19:27:19 +08:00
LinWenhai
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
minggo
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
Dhilan007
ef5da0649a
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +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
yangxiao
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +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
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
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
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
7a25fbfe29
refactor touch event
2014-06-09 10:23:11 +08:00