James Chen
|
eec0ba3c19
|
Getting full path in before playing sound.
|
2013-01-27 19:20:49 +08:00 |
James Chen
|
2b9f79efc0
|
Merge pull request #1882 from dumganhar/memoryleak-action
Fixed memory leaks in CCActionCatmullRom class.
|
2013-01-22 22:41:44 -08:00 |
James Chen
|
b5efd699bf
|
Fixed a memory leak in ActionsTest.
|
2013-01-23 14:40:11 +08:00 |
James Chen
|
de8a237d73
|
Merge pull request #1881 from dumganhar/linux-fix
fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.
|
2013-01-22 03:22:41 -08:00 |
James Chen
|
3f57b01f94
|
Fix for 32bit.
|
2013-01-22 18:30:16 +08:00 |
James
|
1d7650767b
|
Updated Makefile and project configurations for linux port.
|
2013-01-22 16:45:35 +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
|
680fbe3517
|
Fixed compilation errors for linux port.
|
2013-01-22 15:21:37 +08:00 |
James Chen
|
0187bb6504
|
Merge pull request #1876 from dumganhar/iss1639-custom-property
fixed #1639: Added custom property support for CCBReader.
|
2013-01-21 23:03:53 -08:00 |
PickleMan
|
c4d5bf8c85
|
Added test for rotation is dir in particle system
|
2013-01-21 12:35:59 -05:00 |
James Chen
|
c0d568da9b
|
fixed #1639: Added custom property support for CCBReader.
|
2013-01-21 18:37:17 +08:00 |
moadib
|
e39829269d
|
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
|
2013-01-21 13:03:55 +04:00 |
James Chen
|
4a68e4ab89
|
fixed #1670: Fixed memory leak in CCBReader.
|
2013-01-21 14:40:29 +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 |
johnangel
|
a1155f52e6
|
Merge remote branch 'upstream/gles20' into gles20
|
2013-01-11 21:48:47 +01: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 |
Jozef Prídavok
|
229ad55dfa
|
Fixed and refactored Mac Implementation.
|
2013-01-09 15:34:53 +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
|
8fa2eb080b
|
issue #1640: Updated Box2dTest and ChipmunkTest.
|
2013-01-06 10:22:07 +08:00 |
James Chen
|
0c28510513
|
issue #1640: Updated ChipmunkTest.cpp.
|
2013-01-06 10:13:59 +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
|
7bcbcfa187
|
fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
|
2013-01-05 10:56:57 +08:00 |
James Chen
|
3263d06830
|
Merge pull request #1814 from fape/marmalade_simplegame
fixed #1631: Making SimpleGame force landscape for Marmalade.
|
2013-01-03 19:07:41 -08:00 |
James Chen
|
f6b57a9b92
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-04 10:16:18 +08:00 |
fape
|
e34f190f36
|
add SimpleGame Marmalade config files
|
2013-01-03 15:20:58 +01:00 |
fape
|
f3f67f62e1
|
.gitignores moved
|
2013-01-03 15:16:11 +01:00 |
Dale Ducharme
|
611db78b39
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-02 18:53:31 -05: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 |
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
|
c68884a121
|
issue #1625: Updated EffectsTest.cpp and EffectsTest.lua.
|
2012-12-27 11:48:46 +08:00 |
James Chen
|
0e7934a8ce
|
Revert TestCpp/proj.win32/main.cpp.
|
2012-12-27 11:40:32 +08:00 |
James Chen
|
7d9f06b48c
|
fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
|
2012-12-27 10:55:25 +08:00 |
James Chen
|
eb417274fb
|
fixed #1621: fix compilation error of eclipe project.
|
2012-12-24 11:15:56 +08:00 |
ivzave
|
fcce930188
|
repair linux eclipse build & add 64-bit project configurations
|
2012-12-22 07:14:59 +04:00 |
minggo
|
89fb58e791
|
issue #1603:change pathes of android codes
|
2012-12-21 17:28:14 +08:00 |
minggo
|
f71f13fc53
|
issue #1536:add permissions and modify module path error
|
2012-12-21 14:40:34 +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 |
James Chen
|
f47c5e1714
|
Added app.icf, development.icf.
|
2012-12-20 18:29:25 +08:00 |
minggo
|
65e01b9ade
|
issue #1603:build ok on mac
|
2012-12-20 18:02:24 +08:00 |
James Chen
|
f65717cd86
|
issue #1603: updated linux project configuration.
|
2012-12-20 17:49:34 +08:00 |
James Chen
|
08aa5066a5
|
issue #1603: updated blackberry, linux, marmalade project configurations.
|
2012-12-20 17:47:30 +08:00 |
minggo
|
977046cc32
|
issue #1603:make some samples build ok on iOS
|
2012-12-20 17:20:10 +08:00 |
James Chen
|
dcfd38756d
|
Updated android build files.
|
2012-12-20 14:04:49 +08:00 |
James Chen
|
4660e72eda
|
issue #1603: Moved the position of some projects.
|
2012-12-20 12:58:21 +08:00 |