Rohan Kuruvilla
|
360519dad5
|
Removing /bin/bash for executing build command, and keep only bash
|
2013-03-07 12:09:17 -08:00 |
Rohan Kuruvilla
|
7d90fc2254
|
Adding README files to each sample project
|
2013-03-04 11:50:39 -08:00 |
Rohan Kuruvilla
|
bb31ea232b
|
Updating project files for Javascript based sample projects
|
2013-03-04 11:50:39 -08:00 |
Rohan Kuruvilla
|
4eed15c977
|
Adding eclipse project files for Javascript projects
|
2013-03-04 11:50:39 -08:00 |
James Chen
|
219657ee1a
|
Merge pull request #1872 from moadib/android_manifest_gles20
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
|
2013-01-21 23:52:32 -08:00 |
James Chen
|
a3dbfaafd3
|
Merge pull request #1856 from funkaster/master
fixed #1660: Some fixes to the js debugger.
|
2013-01-21 17:54:39 -08:00 |
moadib
|
e39829269d
|
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
|
2013-01-21 13:03:55 +04:00 |
James Chen
|
31e91e554e
|
issue #1661: Added CrystalCraze for win32 and fix some compilation errors.
|
2013-01-17 17:07:18 +08:00 |
Rolando Abarca
|
49432ef742
|
removes old header file reference
|
2013-01-16 13:42:41 -08:00 |
Rolando Abarca
|
e94d8d1693
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
scripting/javascript/bindings/ScriptingCore.h
scripting/javascript/bindings/js_bindings_config.h
|
2013-01-15 16:52:47 -08:00 |
Rolando Abarca
|
320068930e
|
more debug stuff
|
2013-01-11 14:29:40 -08:00 |
Rolando Abarca
|
5df4b4d997
|
adding debug support for js
|
2013-01-11 14:01:36 -08:00 |
johnangel
|
a1155f52e6
|
Merge remote branch 'upstream/gles20' into gles20
|
2013-01-11 21:48:47 +01:00 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +01:00 |
James Chen
|
b3be1e9e90
|
fixed #1646: GCC_OPTIMIZATION=1 for every jsb project setting of debug mode. This can avoid 'vm_protect' error when debugging jsb project on device.
|
2013-01-09 18:23:33 +08: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
|
3fa771f0c4
|
fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android.
|
2013-01-07 17:22:06 +08:00 |
James Chen
|
1882ca30f5
|
issue #1620: Binding sqlite3 to sys.localStorage. And updated win32 project configuration.
|
2013-01-06 14:42:24 +08:00 |
James Chen
|
8a21f4fa3c
|
issue #1640: Added some files to iOS Project.
|
2013-01-05 17:41:19 +08:00 |
James Chen
|
9ef74bef80
|
fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
Added platform macro for CCEditBoxImpl* files.
|
2013-01-05 11:10:24 +08:00 |
James Chen
|
d2ad820a48
|
fixed #1627: Adding view name for sample applications.
|
2012-12-29 14:50:00 +08: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 |
minggo
|
89fb58e791
|
issue #1603:change pathes of android codes
|
2012-12-21 17:28:14 +08:00 |
James Chen
|
a36446cba2
|
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory
|
2012-12-20 18:39:52 +08:00 |
minggo
|
977046cc32
|
issue #1603:make some samples build ok on iOS
|
2012-12-20 17:20:10 +08:00 |
James Chen
|
1562658bd8
|
issue #1603: Added libJSBinding project for win32 platform.
|
2012-12-20 17:18:02 +08:00 |
James Chen
|
7b19ab2689
|
Updated vs project configuration after adjusting directory.
|
2012-12-20 15:07:19 +08:00 |
minggo
|
959b7a3f0d
|
issue #1603:build MoonWarriors ok on iOS and android
|
2012-12-20 15:06:02 +08:00 |
minggo
|
f9a9d45f88
|
issue #1603:adjust samples directory
Signed-off-by: minggo <ming@cocos2d-x.org>
|
2012-12-20 14:14:53 +08:00 |