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
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
pipu
72f5808678
Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters
2014-10-13 14:48:10 +08:00
pipu
779e73dad0
1. change config.h in win32.
2014-10-12 15:27:41 +08:00
pipu
10e390557e
Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters
2014-10-12 15:07:37 +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
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
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
SunLightJuly
1062dec335
modified project files and make files
2014-10-08 18:44:58 +08:00
Dhilan007
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
Dhilan007
d52144d1e0
fix linker errors on WIN32
2014-09-28 21:45:09 +08:00
songchengjiang
39deb73c3a
move light from 3d to base(Windows)
2014-09-28 17:23:25 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
yangxiao
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
andyque
3c434ec354
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
2014-09-24 17:47:38 +08:00
Jeff
2ffbe23c50
The files name: modify underline to hyphen
2014-09-19 10:24:17 +08:00
Jeff
e4e2cea97a
link error
2014-09-18 19:59:22 +08:00
Jeff
476ede6ccb
link error
2014-09-18 19:56:53 +08:00
songchengjiang
3c67515378
Finished light reconstruction
2014-09-18 16:38:35 +08:00
Jeff
1dffbd0a7b
fix link errors
2014-09-18 01:52:08 +08:00
yangxiao
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
yangxiao
3cfc36591c
merge cocos
2014-09-11 10:13:57 +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
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
Ricardo Quesada
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -07:00
andyque
6a4397a3eb
change toolset from 12.0 to 4.0
2014-09-09 15:57:21 +08:00
andyque
08c7f32627
add chipmunk static library for win32
2014-09-05 15:38:12 +08:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
minggo
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
minggo
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +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
andyque
87af0ecdd6
add back libbox2d and libspine project to our solution
2014-09-03 17:37:34 +08:00
yangxiao
bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
andyque
2e27a6865f
update project to vs2013
2014-09-03 14:10:38 +08:00
minggo
eee9ac626a
Merge pull request #7815 from andyque/mergeExtensionEditBox
...
merge extension EditBox to ui module
2014-09-03 11:25:10 +08:00
andyque
dafbf28283
fix release mode compile error
2014-09-02 16:42:23 +08:00
andyque
fadfa87afd
fix vs2013 compile error
2014-09-02 16:42:04 +08:00
andyque
6dc45f86e4
fix windows compile error
2014-09-02 10:05:22 +08:00
Huabing.Xu
6824453804
windows work for trianglesCommand
2014-09-01 15:08:09 +08:00
songchengjiang
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
yangxiao
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
yangxiao
7d6b8ea706
merge cocos
2014-08-26 14:58:58 +08:00
yangxiao
03390a4f46
merge cocos
2014-08-26 14:05:59 +08:00
samuele3hu
07cf4d3526
Fix the win32 and android compile error
2014-08-25 14:10:13 +08:00
samuele3hu
d1b4d43a0b
Remove CCModuleManager.h/cpp and adjust the related project
2014-08-22 15:10:46 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
andyque
34629f1014
fix windows & win8 & wp8 compile error
2014-08-20 12:02:12 +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
songmiao
08a4ebba06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
songmiao
361770e0f3
add BillBorad and BillBoardTest
2014-08-15 16:15:29 +08:00
minggo
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
minggo
aa052eb1c1
add CCModuleManager into vs project
2014-08-15 14:39:15 +08:00
songchengjiang
7ed40a8051
Added Light
2014-08-15 10:32:07 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
Huabing.Xu
6aff707eab
windows work now for renderPrimitive
2014-08-11 14:18:07 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
yangxiao1
61eaa082a2
fix windows
2014-08-08 15:33:30 +08:00
lvlong
fe58c43b2d
add abb and obb to vc2012-project
2014-08-08 14:06:54 +08:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +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
yangxiao
e03d284e26
merge cocos2d
2014-07-31 18:55:41 +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
songmiao
58c32e52c7
windows works
2014-07-31 14:08:05 +08:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
Huabing.Xu
ea802580a2
add script to copy sqllite3.dll to output dir on windows
2014-07-29 15:02:34 +08:00
Huabing.Xu
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00