James Chen
|
dab99eeb8b
|
Adds PerformanceMathTest for win32.
|
2014-11-25 10:33:17 +08:00 |
andyque
|
f3f15c58fe
|
remove UIWebView.cpp in win32
|
2014-10-16 16:46:49 +08:00 |
pandamicro
|
a26e91f839
|
no message
|
2014-10-09 18:30:39 +08:00 |
Dhilan007
|
90769ef242
|
fix compile error on win32
|
2014-09-30 14:40:24 +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 |
yangxiao
|
98d9cea774
|
merge cocos
|
2014-09-26 15:14:57 +08:00 |
yangxiao
|
56313aa895
|
merge cocos
|
2014-09-25 11:05:02 +08:00 |
Sergey
|
b8b5397e4e
|
Tests for Mac/iOS android Linux & Windows
|
2014-09-22 17:54:49 +04:00 |
songchengjiang
|
3c67515378
|
Finished light reconstruction
|
2014-09-18 16:38:35 +08:00 |
Jeff
|
418ec69abf
|
compile error
|
2014-09-18 15:18:30 +08:00 |
Jeff
|
e9c6f5d02b
|
fix compile errors
|
2014-09-18 01:30:14 +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 |
andyque
|
6a4397a3eb
|
change toolset from 12.0 to 4.0
|
2014-09-09 15:57:21 +08:00 |
yangxiao
|
8da7a4b2de
|
merge cocos reslove conflict
|
2014-09-04 17:40:14 +08:00 |
liuliang
|
c42bef1f02
|
Add a bulletin board test example
|
2014-09-04 16:58:00 +08:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +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 |
andyque
|
aef0f5e729
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
|
2014-09-01 15:26:25 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +08:00 |
songchengjiang
|
731d1165c3
|
Spot Light Shader optimization
|
2014-08-27 17:09:20 +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
|
03390a4f46
|
merge cocos
|
2014-08-26 14:05:59 +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
|
8d1c422ac5
|
merge extension EditBox to ui module
|
2014-08-19 10:28:24 +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 |
songchengjiang
|
9b3a02f350
|
Added Light Test
Added Point Light
|
2014-08-17 21:33:33 +08:00 |
yangxiao1
|
e904ee646a
|
windows work
|
2014-08-08 18:25:36 +08:00 |
yangxiao
|
3c9483899e
|
camera, cameratest, drawNode3D squash
|
2014-08-07 15:23:31 +08:00 |
Huabing.Xu
|
65775f2d30
|
remove CC_CONSTUCTOR_ACCESS fow win32 release
|
2014-07-30 16:39:21 +08:00 |
andyque
|
5a22636441
|
fix windows compile error
|
2014-07-29 17:51:34 +08:00 |
Huabing.Xu
|
c722c0fcd0
|
libcocostudio for windows
|
2014-07-29 11:31:37 +08:00 |
Huabing.Xu
|
d53ce4d664
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:17 +08:00 |
Huabing.Xu
|
6d0b8852d1
|
libSpine rename for windows
|
2014-07-29 10:53:39 +08:00 |
Huabing.Xu
|
eacf003eed
|
change libExtensions for windows
|
2014-07-29 10:07:46 +08:00 |
Huabing.Xu
|
d6bc2f4998
|
liuGUI->libui for windows
|
2014-07-28 22:12:07 +08:00 |
Huabing.Xu
|
c6956504bf
|
change CocosDenshion to libcocosdenshion
|
2014-07-28 21:35:16 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
Huabing.Xu
|
2795c10627
|
rename box2d->libbox2d
|
2014-07-28 12:05:58 +08:00 |
Huabing.Xu
|
7f5782c207
|
chang module name for windows project file
|
2014-07-28 09:20:02 +08:00 |
Huabing.Xu
|
c7bfc934fd
|
windows works now
|
2014-07-24 12:57:39 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
Huabing.Xu
|
e666ab88ed
|
fix windows compile error
|
2014-07-21 14:59:47 +08:00 |