yangxiao
3db3d9ae11
merge cocos
2015-03-03 17:23:33 +08:00
yangxiao
db5c098ca8
adjust
2015-03-03 15:13:47 +08:00
yangxiao
6023777133
reset modify
2015-03-03 14:12:12 +08:00
Ray
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
Ray
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
Ray
2f01deee89
3D Editor Reader
...
Node3DReader
2015-02-19 12:08:09 +08:00
yangxiao
954fd52493
rename folder and fix warning
2015-02-12 17:54:27 +08:00
yangxiao
8f290b2d24
modify according to minggo
2015-02-12 16:09:08 +08:00
yangxiao
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
Huabing.Xu
65b6500491
Merge branch 'v3' into FixCrashOnWin32
...
Conflicts:
cocos/2d/CCDrawNode.cpp
cocos/renderer/ccShaders.cpp
2015-01-20 18:09:11 +08:00
huangshiwu
fea492ab4f
DrawNode enable draw different size points
2015-01-13 22:30:50 +08:00
WenhaiLin
2847a940ed
Update project
2015-01-06 14:40:15 +08:00
andyque
62b1404213
Merge branch 'v3' into update-curl
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-12-31 14:04:04 +08:00
huangshiwu
893aded9b7
iOS HttpClient replace libcurl - fix Jenkins compile error
2014-12-31 11:32:35 +08:00
andyque
5caccfd053
upgrade libcurl mac project settings
2014-12-31 10:18:44 +08:00
andyque
60ec08eef4
upgrade libcurl for iOS
2014-12-31 10:18:44 +08:00
huangshiwu
7426b5c4b5
iOS HttpClient replace libcurl
2014-12-31 10:02:14 +08:00
lvlong
f592671df6
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
andyque
29e9ef7edf
Merge branch 'v3' into modifyWidgetDefaultBehavior
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
youyou
3f46f2e641
update project file
2014-12-24 16:22:25 +08:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
yusheng.lu
d543f8f6a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-23 16:12:50 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
yangxiao
3d77c7535d
merge cocos
2014-12-23 10:35:35 +08:00
yusheng.lu
1e05361873
ios/mac project compeleted
2014-12-22 20:08:27 +08:00
kaile.yin
f792b4ac68
remove same line
2014-12-22 14:08:15 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
lvlong
73a2a6385a
add frustum culling.
2014-12-16 16:34:35 +08:00
mannewalis
c50bf94c59
removing Allocator<T> and inheriting base directly.
2014-12-15 09:34:25 -08:00
yangxiao
5ad408530c
merge cocos
2014-12-15 17:47:05 +08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
kaile.yin
9d49f82eb9
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-12-03 16:00:32 +08:00
pipu
4aea718c13
Delete protobuf-lite in User Head Search Path
2014-12-01 12:56:49 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
pipu
889f84e540
newest v3 flatbuffers
2014-11-26 13:29:23 +08:00
yangxiao
35020c7c71
async task pool
2014-11-26 11:28:14 +08:00
James Chen
2c0445b25d
Updates Xcode project for Math perf test
2014-11-25 10:33:16 +08:00
Ricardo Quesada
9e10d2d32b
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
...
This reverts commit fa22b12628
, reversing
changes made to 8dce62b94c
.
2014-11-24 10:19:53 -08:00
pipu
f3cb80d8f6
Add flat buffers reader and serialize
2014-11-21 15:15:38 +08:00
youyou
769b2cbc75
add file to mac project
2014-11-19 20:06:10 +08:00
Ricardo Quesada
2ec1170943
treat warnings as errors in samples
2014-11-04 15:42:29 -08:00
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