minggo
50fa15c0cd
Merge pull request #11301 from samuele3hu/v3_lua_jit
...
Add luajit support for iOS 64bit devices and related test cases
2015-04-07 18:17:09 +08:00
samuele3hu
a64e90d469
Update the related project setting for Luajit and related test cases
2015-04-06 22:41:34 +08:00
tangziwen
0193420dfc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
...
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-04-03 15:45:51 +08:00
samuele3hu
826fe4cf31
Update the Xcode project setting for luajit
2015-04-02 10:07:31 +08:00
pipu
bc7d8f0a09
Add method destroyCocosStudio() for CocoStudio
2015-03-31 19:55:56 +08:00
yangxiao
c6a86ac287
move shader to shaders
2015-03-30 13:45:50 +08:00
yangxiao
b469cfa928
merge cocos
2015-03-30 10:28:14 +08:00
yangxiao
84535feb0c
merge cocos
2015-03-26 11:59:26 +08:00
yangxiao
b6a29d80de
3d particle performance test
2015-03-19 14:43:29 +08:00
Nite Luo
18d716cfd2
Use xcode for jenkins build
2015-03-14 02:08:52 -07:00
pipu
c72c8e865d
To reconstruct object extension data.
2015-03-12 15:47:15 +08:00
Mazyad Alabduljaleel
1dee334f29
added security framework to the tests project
2015-03-10 15:04:29 +04:00
Mazyad Alabduljaleel
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
Dale Stammen
35222a8193
Merge branch 'v3' into v3-wp8-fix
2015-03-09 09:20:25 -07:00
Dale Stammen
a828f73ccb
updated expiration date of project certificates
2015-03-09 08:31:06 -07:00
minggo
b8b1c9d018
Merge pull request #9708 from minggo/use-console
...
use cocos console in build_native.py and android-build.py
2015-03-09 16:41:56 +08:00
yangxiao
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
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
ff07f62e83
fix CocosStudio 3DReader test resource
2015-02-25 15:49:04 +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
80a5b201f8
3DNode Reader lua Test
2015-02-19 17:28:51 +08:00
Ray
73e40f1c4b
Node3DReader Test
2015-02-19 16:18:54 +08:00
Ray
2f01deee89
3D Editor Reader
...
Node3DReader
2015-02-19 12:08:09 +08:00
samuele3hu
3a7cbe9d67
Add Particle3DTest for Lua and update related configure files
2015-02-15 15:56:20 +08:00
minggo
058668711b
fix conflict
2015-02-13 16:44:14 +08:00
minggo
b8e50da05e
only build c++ codes
2015-02-13 15:54:35 +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
yangxiao
66da4e8096
mac work
2015-02-03 17:38:40 +08:00
zhukaixy
ee99700ec1
add test case TextureCube
2015-01-29 09:28:14 +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
Dale Stammen
096fc13c47
added ui shader
2015-01-16 14:57:41 -08:00
minggo
6acfd612cd
Merge pull request #9984 from andyque/fixlinuxCompile
...
[ci skip]fix linux compile
2015-01-14 16:11:10 +08:00
andyque
b44f422f4d
remove glfw2
2015-01-14 14:43:01 +08:00
owen
d57509aea9
fix linux compile
2015-01-13 22:22:08 -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
5d9274acf5
fix conflicts
2014-12-31 14:22:18 +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
Dale Stammen
79e71b6c50
Merge branch 'v3' into wp8-fix2
2014-12-30 21:25:54 -08:00
Dale Stammen
4e4028fc67
added missing files
2014-12-30 21:03:57 -08:00
Dale Stammen
09efe9be04
removed unused winrt CCPlatformDefine.h
2014-12-30 21:03:33 -08:00
huangshiwu
893aded9b7
iOS HttpClient replace libcurl - fix Jenkins compile error
2014-12-31 11:32:35 +08:00
andyque
7a8634ff0e
remove libcurl.dylib
2014-12-31 10:18:44 +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
minggo
a1e8dec384
use cocos console in build_native.py and android-build.py
2014-12-30 16:24:16 +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
minggo
a86bfbf6b0
Merge pull request #9330 from pipu/v3_flatbuffers
...
newest V3 flatbuffers
2014-12-04 10:06:42 +08:00
Ricardo Quesada
803d0a268e
By default, use "dwarf with dSYM file" in cpp-tests
2014-12-03 15:07:34 -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
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
pipu
22b044805c
Add callback parse
2014-12-01 21:50:05 +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
Ricardo Quesada
4a5069244f
Ouch. DEBUG instead of RELEASE for Build on Xcode
2014-11-27 10:54:09 -08:00
Ricardo Quesada
154a059d1c
mend
2014-11-27 10:53:29 -08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
Dhilan007
a92b1733f0
Fix generate apk fail
2014-11-27 16:10:52 +08:00
Dhilan007
4cda033a04
Fixed compiling and linking error of lua tests when using NDK r10 above.
2014-11-27 13:56:15 +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
5d21c889aa
Reverts GCC_TREAT_WARNINGS_AS_ERRORS=YES for Xcode project of cpp-tests.
2014-11-25 10:33:16 +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
youyou
966100a511
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-11-24 10:35:51 +08:00
pipu
f3cb80d8f6
Add flat buffers reader and serialize
2014-11-21 15:15:38 +08:00
Ricardo Quesada
15c0b18301
Adds gnutls-dev to linux deps
2014-11-20 12:28:38 -08:00
youyou
769b2cbc75
add file to mac project
2014-11-19 20:06:10 +08:00
Dale Stammen
200cb6d3b4
fixed test solution folder names to enable building project using devenv
2014-11-17 11:52:46 -08:00
Ricardo Quesada
4d2752e84f
fixes how to check for CPU in android-build
2014-11-10 16:08:12 -08:00
Ricardo Quesada
2ec1170943
treat warnings as errors in samples
2014-11-04 15:42:29 -08:00
Dale Stammen
7794314ef1
added missing libcocos2d project file
2014-10-28 21:02:14 -07:00
Dale Stammen
71048fc906
fixed cclight and cccamera file locations
2014-10-23 08:39:36 -07:00
Dale Stammen
93cac681ab
removed DirectX namespace
2014-10-23 08:39:06 -07:00
Dale Stammen
82aad4605e
added missing Assets folder
2014-10-23 08:38:42 -07:00
Dale Stammen
d88a2fb6f1
added windows 8.1 universal app solution
2014-10-23 07:37:25 -07:00
Dhilan007
8993e490e6
Rolling back default build mode of samples to debug on Android
2014-10-21 17:14:47 +08:00
minggo
c255ffd6a6
update release note
2014-10-21 11:18:15 +08:00
Dhilan007
47629aec64
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:42:00 +08:00
samuele3hu
634d42775e
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 17:00:05 +08:00
samuele3hu
30f375ef07
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 17:37:18 +08:00
samuele3hu
1d6128443a
Update Mac project setting and some lua test cases about UI and ActionTimeline
2014-10-17 17:35:50 +08:00
minggo
31664d979a
Merge pull request #8783 from andyque/adjustUITestProject
...
fix scrollView rotate issue
2014-10-17 14:54:32 +08:00
Dhilan007
d997fdc7f7
Default build mode of samples change to release builds
2014-10-17 14:51:34 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
minggo
064f0d9042
Merge pull request #8708 from dabingnn/v3_updateSpine
...
V3 update spine
2014-10-16 17:50:07 +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
huangshiwu
0a04da0a10
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode
2014-10-16 15:53:12 +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
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +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
minggo
16ad1977b0
Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode
...
Add clipping rectangle node
2014-10-15 15:09:29 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +08:00
samuele3hu
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +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
samuele3hu
83d210ce7d
Update the Xcode project setting for related test cases
2014-10-15 11:18:22 +08:00
Dale Stammen
0cfe930078
added new WP8 solution
2014-10-14 16:39:41 -07:00
Dale Stammen
f0117239a6
added updated WP8 shader compiler project files
2014-10-14 16:38:04 -07:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
samuele3hu
70aa62a365
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-10-15 02:09:12 +08:00
samuele3hu
e0c4ff060a
Update iOS and Mac project setting
2014-10-15 00:44:44 +08:00
samuele3hu
735e86788e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-14 21:36:44 +08:00
samuele3hu
3b4fbd8fff
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
2014-10-14 21:34:55 +08:00
pipu
0a7ddd21d1
Reverting android-build.py
2014-10-13 15:41:55 +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
e7385cd634
Merge branch 'v3_pipu' of https://github.com/pipu/cocos2d-x into v3_pipu
2014-10-12 17:53:07 +08:00
pipu
7d21dcb095
1. fix git error
2014-10-12 17:51:34 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +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
pipu
a6d17d1c1b
Remove '-' character
2014-10-11 15:53:09 +08:00
samuele3hu
9b9b9d9700
Fix the lua-tests compile error
2014-10-11 14:14:08 +08:00
pipu
583a756d33
Reverting build/cocos2d-win32.vc2012.sln
...
Reverting cocos/2d/libcocos2d.vcxproj
2014-10-11 14:13:56 +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
pipu
efe22a0dd7
Modifying protocol buffers for win32 version
2014-10-10 21:55:59 +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
samuele3hu
f97a7ae52d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-10-10 09:52:29 +08:00
samuele3hu
115d81574c
Add CameraTest、OBBTest and related lua bindings
2014-10-10 09:49:25 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +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
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00