James Chen
|
c8dfa45993
|
Merge pull request #1859 from dumganhar/crystal-game
issue #1661: Adding jsb sample game CrystallCraze.
|
2013-01-17 01:09:18 -08:00 |
James Chen
|
31e91e554e
|
issue #1661: Added CrystalCraze for win32 and fix some compilation errors.
|
2013-01-17 17:07:18 +08:00 |
minggo
|
3e482e30d3
|
Merge pull request #1861 from minggo/iss1547-ccmenuitem
fixed #1547:set selected menu item to null when it is removed from a menu
|
2013-01-16 23:06:53 -08:00 |
minggo
|
a7dca5c05a
|
fixed #1547:set selected menu item to null when it is removed from a menu
|
2013-01-17 15:04:48 +08:00 |
James Chen
|
f70e4db254
|
fixed #1662: Getting full path will fail if texture name in the plist is without relative path.
|
2013-01-17 11:42:41 +08:00 |
James Chen
|
375666fd6c
|
fixed #1468: Exported CCPoint, CCSize and CCRect.
|
2013-01-15 18:59:35 +08:00 |
James Chen
|
5d7cc39edd
|
issue #1650: Inline function needs to be implemented in header file on Android platform.
|
2013-01-15 18:15:14 +08:00 |
James Chen
|
547f95d761
|
issue #1650: Made the destructor of CCDictElement as public method.
|
2013-01-15 17:20:04 +08:00 |
James Chen
|
c3d697a0f8
|
issue #1650: Adding detailed doxgen comments for CCDictionary.
|
2013-01-15 17:09:25 +08:00 |
ivzave
|
806398519a
|
repair CCTransitionSplitCols & CCTransitionSplitRows
|
2013-01-15 00:49:05 +04:00 |
minggo
|
78fc7cb5b5
|
Merge pull request #1840 from walzer/gles20
Doxygen sample in CCSprite.h
|
2013-01-14 06:07:50 -08:00 |
walzer
|
4ae43e5901
|
fix typos in doxygen of CCSprite and CCProtocol
|
2013-01-14 21:51:47 +08:00 |
minggo
|
90a4653530
|
Merge pull request #1839 from fnz/gles20
Fix addImageAsync iOS memory leak
|
2013-01-14 03:22:11 -08:00 |
walzer
|
c9c227873f
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-14 17:07:07 +08:00 |
walzer
|
1ab552b482
|
Add a sample doxygen sample in CCSprite.h and CCProtocol.h
|
2013-01-14 16:54:20 +08:00 |
Victor K
|
bf01df0f52
|
Fix addImageAsync iOS memory leak
Bug: http://www.cocos2d-x.org/issues/1087
Thread: http://www.cocos2d-x.org/boards/6/topics/17031
|
2013-01-14 15:32:30 +07:00 |
James Chen
|
6733f786a5
|
fixed #1649: Reverted some invokings of function that returns const reference.
|
2013-01-14 16:06:18 +08:00 |
James Chen
|
22ebf3a5e5
|
Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const
|
2013-01-14 15:52:42 +08:00 |
James Chen
|
6565fa92cc
|
fixed #1649: Changed return type to const reference for member variable access.
|
2013-01-14 15:51:53 +08:00 |
minggo
|
c08c982f89
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint
|
2013-01-14 15:07:21 +08:00 |
minggo
|
984b304ec5
|
issue #1468:change CCPoint CCSize CCRect from class to struct
|
2013-01-14 14:45:16 +08:00 |
James Chen
|
0fd16e7b31
|
Merge pull request #1827 from folecr/assert_fix
fixed #1654: Assert fix for android.
|
2013-01-13 22:15:11 -08:00 |
johnangel
|
a1155f52e6
|
Merge remote branch 'upstream/gles20' into gles20
|
2013-01-11 21:48:47 +01:00 |
folecr
|
58874dc7a5
|
CCAssert uses CC_ASSERT directly
* ... after call to cc_assert_script_compatible()
* CCAssert will now report the correct line number
|
2013-01-10 12:26:12 -08:00 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +01:00 |
James Chen
|
9f322d9646
|
fix a typo.
|
2013-01-10 15:58:52 +08:00 |
folecr
|
e3cf517f32
|
Assert implementation for Android
* __android_log_assert is not stable
* Uses __android_log_print instead
|
2013-01-09 18:51:49 -08:00 |
folecr
|
c0ecad31fe
|
Consistent use of CCAssert
* Remove @
* Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
|
2013-01-08 14:11:34 -08:00 |
johnangel
|
e32a193561
|
Setting Windows app title for non-Debug mode, also.
|
2013-01-07 12:17:50 +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
|
b662d5c569
|
fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.
|
2013-01-07 18:06:53 +08: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
|
266e6e8acc
|
fixed #1641: The coins in Watermelon Me fail to animate in cocos2d-x JS binding.
|
2013-01-05 18:54:08 +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 |
minggo
|
539bb56256
|
Merge pull request #1799 from tks2shimizu/gles20
Added CCFloat, CCDouble and CCBool
|
2013-01-03 19:32:35 -08:00 |
James Chen
|
f95d1677df
|
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry
|
2013-01-04 09:52:01 +08:00 |
James Chen
|
b50bf716a2
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-03 19:58:10 +08:00 |
James Chen
|
760a8c1d39
|
fix a compilation error for android.
|
2013-01-03 19:56:34 +08:00 |
Dale Ducharme
|
611db78b39
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-02 18:53:31 -05:00 |
fape
|
29a2f273b1
|
reorganize third party libs
|
2012-12-29 23:56:14 +01:00 |
fape
|
4421b6bf7a
|
remove unused libs
|
2012-12-29 23:53:39 +01: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
|
b120874a87
|
fix compilation errors.
|
2012-12-29 11:23:31 +08:00 |
Tomoaki Shimizu
|
1293c8a6c2
|
added licence
|
2012-12-29 11:32:27 +09: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 |
Tomoaki Shimizu
|
b4edd167af
|
The variable name was changed.The check of pRet was added.
|
2012-12-28 12:24:28 +09:00 |
Tomoaki Shimizu
|
87146d82e1
|
Added CCFloat, CCDouble and CCBool
|
2012-12-27 23:15:13 +09:00 |
James Chen
|
f159df2e13
|
Compilation warning fix for CCAssert macro.
|
2012-12-27 16:48:02 +08:00 |
minggo
|
4cdc984b0e
|
Merge pull request #1797 from dumganhar/gles20
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest.
|
2012-12-27 00:10:53 -08:00 |