James Chen
|
3a9346e6ff
|
issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms.
|
2013-02-01 11:20:46 +08:00 |
minggo
|
c071620951
|
set build option to -O1 for js xcode project when building with debug option
|
2013-01-29 20:58:34 +08:00 |
James Chen
|
31681e005e
|
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
|
2013-01-29 10:40:44 +08:00 |
James Chen
|
2694cb150b
|
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
|
2013-01-29 09:56:38 +08:00 |
James Chen
|
c80d438110
|
issue #1683: Exporting `fullPathForFilename` to Lua.
|
2013-01-27 20:26:04 +08:00 |
James Chen
|
119115502d
|
issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
|
2013-01-26 22:31:57 +08:00 |
James Chen
|
294509c4c0
|
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils
|
2013-01-23 19:52:17 +08:00 |
James Chen
|
f2303b854a
|
Fixed a typo, and regenerated luabinding codes.
|
2013-01-23 15:59:13 +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
|
5a41e1fc86
|
fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp.
|
2013-01-22 14:40:54 +08:00 |
moadib
|
e39829269d
|
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
|
2013-01-21 13:03:55 +04:00 |
James Chen
|
0a42829428
|
issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports.
|
2013-01-18 18:05:32 +08:00 |
James Chen
|
8a4d7cfe12
|
fixed #1653: Updated the configuration files of jsbinding.
|
2013-01-15 10:17:01 +08:00 |
James Chen
|
121519b7cd
|
Merge pull request #1831 from dumganhar/iss1653-jsb-int
fixed #1653: Handling correctly when parsing int value in JSB.
|
2013-01-14 17:49:57 -08:00 |
johnangel
|
a1155f52e6
|
Merge remote branch 'upstream/gles20' into gles20
|
2013-01-11 21:48:47 +01:00 |
James Chen
|
1a659bdacb
|
issue #1653: Updated the submodule of cxx-generator.
|
2013-01-11 21:46:45 +08:00 |
James Chen
|
273ffcc571
|
issue #1653: Updated the submodule of cxx-generator.
|
2013-01-11 13:55:36 +08:00 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +01:00 |
James Chen
|
a4ea453ade
|
fixed #1645: Excluded proj.win32.
|
2013-01-08 15:15:44 +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
|
bf0cc23336
|
Update tools/tojs/README.mdown
|
2013-01-06 18:31:35 +08:00 |
James Chen
|
b712a9349a
|
fixed #1642: Updated tools/tojs/README.mdown.
|
2013-01-06 18:24:02 +08:00 |
James Chen
|
b5b1df6a07
|
Added tools/tojs/README.mdown.
|
2013-01-06 18:10:43 +08:00 |
James Chen
|
be1be2771b
|
fixed #1642: Adding tools for generating jsbinding codes on windows.
|
2013-01-06 18:01:44 +08:00 |
James Chen
|
0ee9cf027b
|
Merge pull request #1803 from dumganhar/iss1627-vs2012
fixed #1627: VS version check in project file.
|
2012-12-28 22:54:04 -08:00 |
James Chen
|
9bd302e35b
|
fixed #1627: VS version check in project file.
|
2012-12-29 13:54:46 +08:00 |
dualface
|
d1e39a9c00
|
[luabinding] add CCDirector::setDisplayStats()
|
2012-12-29 11:16:07 +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
|
df5c6aae04
|
Binded more actions to js.
|
2012-12-27 13:38:48 +08:00 |
James Chen
|
f07987418c
|
Merge pull request #1794 from dumganhar/sync
fixed #1625: Added stackable action support. Exchanged the order of parameter for 3d actions.
|
2012-12-26 20:50:32 -08:00 |
James Chen
|
d1c33960b2
|
issue #1625: Updated lua pkg files.
|
2012-12-27 11:47:49 +08:00 |
minggo
|
c5e62206e0
|
Merge pull request #1791 from minggo/gles20
issue #1603:delete space when setting language
|
2012-12-25 18:44:08 -08:00 |
minggo
|
d94e4c30b8
|
issue #1603:delete space when setting language
|
2012-12-26 10:42:35 +08:00 |
minggo
|
8b522c326c
|
Merge pull request #1790 from minggo/gles20
issue #1603:modify android resource path
|
2012-12-24 22:21:31 -08:00 |
minggo
|
e7ca426b3d
|
issue #1603:modify android resource path
|
2012-12-25 14:20:35 +08:00 |
minggo
|
c47553ece9
|
Merge pull request #1789 from minggo/gles20
issue #1603:modify windows auto-build script
|
2012-12-24 21:02:35 -08:00 |
minggo
|
79530616ea
|
issue #1603:modify windows auto-build script
|
2012-12-25 12:57:24 +08:00 |
minggo
|
fb0a9d9058
|
Merge pull request #1787 from minggo/gles20
issue #1603:modify auto-building script
|
2012-12-24 19:12:40 -08:00 |
minggo
|
c3e44f0e26
|
issue #1603:modify auto-building script
|
2012-12-25 11:11:44 +08:00 |
James Chen
|
e301b9af1e
|
Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition.
|
2012-12-25 09:52:30 +08:00 |
johnangel
|
08cd9e37fc
|
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
|
2012-12-24 10:27:56 +01:00 |
minggo
|
fab196dcbe
|
issue #1603:modify some auto-building script
|
2012-12-24 14:26:57 +08:00 |
minggo
|
380cadebce
|
issue #1603:modify some path for auto building
|
2012-12-21 18:06:36 +08:00 |
minggo
|
b0e752eac3
|
issue #1603:modify path of cocos2d-x
|
2012-12-21 17:40:54 +08:00 |
minggo
|
9beac15305
|
issue #1603: modify some pathes
|
2012-12-21 15:05:22 +08:00 |
minggo
|
7b81217c3c
|
issue #1603:modify pathes for auto test
|
2012-12-21 14:06:20 +08:00 |
unknown
|
adb68ddbb6
|
Enable Windows XP support in Visual Studio 2012 Update 1.
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
|
2012-12-19 19:28:25 +01:00 |
James Chen
|
190e6c1de5
|
Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-12-10 17:25:23 +08:00 |
dualface
|
f815cdc423
|
merge gles20
|
2012-12-10 17:00:16 +08:00 |
James Chen
|
65d81b0de7
|
fixed #1608: Updated tools/tolua++/CCAction.pkg.
|
2012-12-10 16:50:02 +08:00 |