yinkaile
|
10ed7ebdf4
|
merge newest version
|
2013-06-06 16:22:58 +08:00 |
chengstory
|
cfb424a6c9
|
1. add Component struct.
|
2013-06-04 17:38:43 +08:00 |
James Chen
|
d0680258c6
|
fixed #1647: [WebSocket] Fixing compilation errors on win32.
|
2013-06-03 10:03:38 +08:00 |
James Chen
|
cedb427a6e
|
fixed #1647: Adding WebSocket support for Cpp and JSB.
Conflicts:
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-06-02 18:55:57 +08:00 |
James Chen
|
731b3c2324
|
fixed #2215: Updating project configuration for other platforms after adding ConfigurationTest.
|
2013-05-23 10:09:35 +08:00 |
James Chen
|
db464530fb
|
fixed #2142: updating win32.
|
2013-05-10 15:46:24 +08:00 |
minggo
|
5e660e9c71
|
add TexturePackerEncryptionTest into vs2010 project
|
2013-05-08 11:32:59 +08:00 |
James Chen
|
7b138c6be9
|
issue #2075: Adding spinetest in TestCpp for win32.
|
2013-04-24 14:48:39 +08:00 |
James Chen
|
3ed479d7f4
|
Updating project configuration of TestCpp for win32.
|
2013-03-19 17:06:12 +08:00 |
James Chen
|
3bdfb82e9c
|
Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
|
2013-01-30 22:31:19 +08:00 |
James Chen
|
031380d4e9
|
issue #1683: Updating CCFileUtils.cpp for Win32.
|
2013-01-28 19:49:34 +08:00 |
Jozef Prídavok
|
9889b4f9fd
|
Added the very first implementation of CCEditBox for Win32.
|
2013-01-10 23:59:21 +01:00 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +01:00 |
johnangel
|
674bb8e728
|
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
|
2013-01-07 11:51:05 +01:00 |
James Chen
|
9bd302e35b
|
fixed #1627: VS version check in project file.
|
2012-12-29 13:54:46 +08:00 |
James Chen
|
f2f3aa55bf
|
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
|
2012-12-29 09:48:22 +08:00 |
James Chen
|
4660e72eda
|
issue #1603: Moved the position of some projects.
|
2012-12-20 12:58:21 +08:00 |