yusheng.lu
02b9269cff
completed multiplatform projects
2014-12-22 19:39:10 +08:00
yusheng.lu
b0bfc2906a
change armature codes files path
2014-12-22 18:26:50 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
WenhaiLin
4366fb7230
Fix compile error on WIN32.
2014-12-19 11:49:40 +08:00
zhounan
7ffc6f9784
Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters
2014-12-01 13:18:57 +08:00
zhangcheng
0c89db7675
Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp
2014-11-27 18:32:35 +08:00
zhangcheng
32ce3dca2e
1, Update windows project.
2014-11-21 18:12:46 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +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
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
93a7e22eb6
Modifying libcocos2d.vcxproj.filters
2014-10-12 18:55:43 +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
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
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +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
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
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
Ricardo Quesada
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -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
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
34070677ad
Added testing Model Number
2014-08-29 17:11:18 +08:00
songchengjiang
43eb725c27
resolve conflict
2014-08-29 11:02:34 +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