James Chen
2235f745d3
issue #1683 : Fixed compilation error for Win32.
2013-01-25 22:30:16 +08:00
James Chen
ef131beed1
Merge pull request #1885 from dumganhar/refactor-ccfileutils
...
issue #1683 :Refactoring CCFileUtils.TO BE DONE:
Making the api of CCFileUtils more c++ friendly.
2013-01-25 05:55:10 -08:00
James Chen
fde39c6dcb
Adding cache support for CCFileUtils.
2013-01-25 21:52:35 +08:00
James Chen
55af1fd3bf
Removing unneeded codes in CCFileUtils.mm for iOS port.
2013-01-25 21:17:28 +08:00
James Chen
a1574fe9f6
Reverted this commit ( be305f84b6
) since i didn't find the crash.
2013-01-25 20:59:58 +08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
martell
684b46dd74
Initial Import of tinyxml2 to replace libxml2
2013-01-25 10:39:54 +00:00
James Chen
b3f54f6c1d
Merge remote-tracking branch 'origin/refactor-ccfileutils' into refactor-ccfileutils
2013-01-25 17:23:58 +08:00
James Chen
70b8e624d6
Merge pull request #8 from rohankuruvilla/fileutils_test
...
Merged @Rohan's improvements for CCFileUtils.
2013-01-25 01:20:51 -08:00
minggo
dcaa3900a4
fixed #1679 : use unstripped libs for armeabi-v7a
2013-01-25 14:49:25 +08:00
James Chen
805067b046
Refactored CCFileUtils for blackberry port.
2013-01-25 14:09:56 +08:00
James Chen
314445e1ca
Refectored CCFileUtils for MAC port.
2013-01-25 11:12:38 +08:00
Rohan Kuruvilla
9750bbab95
removing absolute path lookup in fullPathForFilename
2013-01-24 19:04:27 -08:00
Rohan Kuruvilla
f5c74d9022
Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread
2013-01-24 18:37:24 -08:00
Rohan Kuruvilla
be305f84b6
Fixing bug where it doesn't use embedded texture data, if texture filename is not available
2013-01-24 18:37:23 -08:00
Rohan Kuruvilla
287b5575f4
Changing architecture of CCFileUtils
2013-01-24 18:37:23 -08:00
James Chen
cefef60e11
Refactored CCFileUtils for Marmalade port.
2013-01-24 17:38:43 +08:00
James Chen
73389d68d5
Refactor CCFileUtils for Linux port.
2013-01-24 16:44:13 +08:00
James Chen
e954ce4f75
Made compatibility with old api CCFileUtils::setResourceDirectory.
2013-01-24 14:07:48 +08:00
James Chen
7589be6fb7
Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now.
2013-01-24 13:56:50 +08:00
James Chen
dcf1127d31
Merge branch 'master' into refactor-ccfileutils
2013-01-24 11:21:23 +08:00
Ed Bartley
908035bdee
Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int).
2013-01-23 14:00:23 -05:00
James Chen
46f38c57fb
issue #1661 : CrystalCraze works ok on android.
2013-01-24 00:32:22 +08:00
James Chen
8cfd912a06
CrystalCraze works ok on iOS.
2013-01-23 23:17:44 +08:00
James Chen
388e1d82c3
Added resource structure which is the same as cocos2d-iphone.
2013-01-23 22:29:00 +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
c92d00dfa1
Merge pull request #1857 from walzer/master
...
fixed #1678 : Well documented CCNode member functions and variables.
2013-01-22 23:35:14 -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
317ac3dd95
Fixed memory leaks in CCActionCatmullRom class.
2013-01-23 14:38:46 +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
8ec1a66db4
Removed glew-1.7.0.tgz.
2013-01-22 18:34:51 +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
PickleMan
ae9c56f084
Fixed syntax, integrated lines.png and lines.plist
2013-01-21 21:30:22 -05:00
ivzave
03f1efff78
ignore unpacked glew
2013-01-21 18:01:57 +04:00
walzer
db59b047f0
remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags.
2013-01-21 20:57:06 +08:00
PickleMan
5c915fc584
Added rotationIsDir to Particle System. It sets the rotation of each particle to its direction
2013-01-21 04:39:48 -05:00
moadib
e39829269d
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
2013-01-21 13:03:55 +04:00
walzer
b1285ca7a7
CCNode: add [set|get]Position[X|Y](void) back.
2013-01-21 16:26:33 +08:00
walzer
996d2be2b6
CCNode: add [set|get]Position[X|Y](void) back.
2013-01-21 16:26:02 +08:00
James Chen
b810aac103
issue #1667 : Updated the comments for CCFileUtils.h.
2013-01-21 10:11:57 +08:00
James Chen
30b2a8a882
issue #1867 : Updated CCFileUtils.cpp for android.
2013-01-18 22:18:55 +08:00
James Chen
9eb149efda
Updated CCFileUtils.mm.
2013-01-18 22:14:03 +08:00
James Chen
bc76cf09c4
Added filename lookup support for win32.
2013-01-18 21:54:48 +08:00
walzer
8657da80a6
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-01-18 18:06:51 +08: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
minggo
6379b61400
fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB()
2013-01-18 16:40:42 +08:00
minggo
fcecd43f55
Merge pull request #1862 from Horcruxes/master
...
getFileData("a.png") doesn't work on iOS.
2013-01-17 17:46:23 -08:00
Michael Ding
088e568c8e
Update cocos2dx/platform/ios/CCFileUtils.mm
...
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
2013-01-18 09:27:22 +11:00
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
walzer
7b16494862
well documented CCNode
2013-01-17 11:20:25 +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
dualface
37a0f19c46
remove RGB565 support
2013-01-04 23:34: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
dualface
d9ef93bbe5
fix some issues
2012-12-30 02:14:30 +08:00
dualface
0b25220f22
update libwebp to 2.1
...
add support RGB888, RGB565,RGBA4444
2012-12-30 02:12:02 +08:00
dualface
1dcb3742e9
fix for win32
2012-12-29 17:43:34 +08:00
James Chen
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
dualface
39c4765423
fix for mac
2012-12-29 14:17:52 +08:00
dualface
806138d990
fix some issues
2012-12-29 13:58:02 +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
dualface
b50e4cdf2b
add WebP support
2012-12-29 10:27:43 +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
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
James Chen
b62d254f63
fixed #1597 : Added return pointer check.
2012-12-27 16:07:48 +08:00
James Chen
ac7755e68b
fixed #1597 : TestCpp crashes when running ActionEaseTest after running ParticlesTest
2012-12-27 15:42:55 +08:00
minggo
0adc6abe30
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
...
[luabinding] make CCAssert compatible Lua
2012-12-26 23:28:32 -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
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
bb486af6a7
Added stackable action support. Exchanged the order of action.
2012-12-26 18:59:31 +08:00
dualface
09b1d9f520
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
2012-12-26 18:37:51 +08:00
dualface
57bccc7e4a
remove CC_LUA_ENGINE_ENABLED macro
2012-12-26 18:33:55 +08:00
fape
3550550568
marmalade acceleromater improvement
2012-12-24 17:24:10 +01:00
johnangel
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
minggo
df73cd12a6
fixed #1623:use file descriptor instead of file path to create media player
2012-12-24 17:20:44 +08:00
minggo
0f669114fc
Merge pull request #1775 from mingulov/music
...
CocosDenshion Android - missing sound effects with some conditions
2012-12-23 22:45:47 -08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
dualface
cc69e39c8a
[luabinding] make CCAssert compatible Lua
2012-12-22 10:13:37 +08:00
Denis Mingulov
ca00d50259
CocosDenshion Android - missing sound effects with some conditions
...
Android SoundPool.load returns 0 if sound might not be loaded - for
example, it does not exist. Previously - 0 has been ignored and
incorrectly written to HashMap, so it was not possible to
understand on the application side that something goes wrong
(and use some additional workaround).
Use case:
1) On the game loading - preload all possible sound effects
(to speed up their playing later, when it will be needed)
2) Game APK does not have any sound file, they are downloaded
later in a separate thread.
3) Application tries to play sound effects as usual, when needed.
So due to this bug - as there was no any sound file exist
during the game loading - internal HashMap contains incorrect
0 as id for every effect, and there is no any sound effect during
the first application start.
2012-12-21 23:15:29 +02:00
James Chen
d94a0cf4c7
issue #1603 : fixed a warning in unzip.cpp.
2012-12-20 18:39:29 +08:00
James Chen
9a0a5e6b31
issue #1603 : fixed some warnings.
2012-12-20 17:18:49 +08:00
johnangel
b8eaf00359
ESC button on Windows behaves like Back button
2012-12-19 21:11:26 +01:00
johnangel
f409aba724
Setting Windows app title
2012-12-19 20:43:09 +01: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
minggo
e9c7db5a36
Merge pull request #1761 from dualface/fix_ccnode_scheduleupdate_lua
...
[lua] remove current schedule before register new script schedule
2012-12-16 17:26:59 -08:00
dualface
c3f900d36c
[lua] remove current schedule before register new script schedule
2012-12-14 18:06:21 +08:00
dualface
98ea80329e
fix android compile warning
2012-12-14 18:01:54 +08:00
dualface
d6a84e0d16
fix compile error for ios/mac c++11
2012-12-10 18:10:41 +08:00
minggo
e15c0a33ae
fixed #1610:skip only white character
2012-12-10 17:18:20 +08:00
James Chen
15251626b0
Merge pull request #1748 from guanqun/fix-doxygen
...
fix the doxygen output of CCAtlasNode
2012-12-10 01:01:21 -08:00
James Chen
0adc070146
Merge pull request #1749 from guanqun/fix-reorder
...
fix the reorder warning of class CCCallFunc
2012-12-10 00:59:00 -08:00
James Chen
6cca9b6548
Merge pull request #1750 from dumganhar/iss1608-lua-scheduleUpdateWithPriority
...
fixed #1608 : Adding CCNode::scheduleUpdateWithPriorityLua() for LuaBinding.
2012-12-10 00:54:16 -08:00
James Chen
fcead8ba34
Merge branch 'lua_add_CCNode_scheduleUpdateScriptHandlerWithPriority' of https://github.com/dualface/cocos2d-x into lua-schedule-improvement
2012-12-10 16:36:46 +08:00
minggo
0f58987ad1
Merge pull request #1740 from rtissera/gles20
...
[android] Cocos2dxHelper/CCFileUtils JNI fixes and improvements
2012-12-10 00:33:11 -08:00
dualface
f08b9c4573
performance fix
2012-12-10 16:31:57 +08:00
dualface
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
Lu Guanqun
b2c13cba9d
fix the reorder warning of class CCCallFunc
...
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning: 'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning: when initialized here [-Wreorder]
2012-12-10 16:07:19 +08:00
Lu Guanqun
497ae7c33f
fix the reorder warning of class CCCallFunc
...
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning: 'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning: when initialized here [-Wreorder]
2012-12-10 16:05:17 +08:00
Lu Guanqun
64772d09b0
fix the doxygen output of CCAtlasNode
2012-12-10 15:31:26 +08:00
James Chen
fc16cd8d01
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-12-10 14:21:18 +08:00
James Chen
839288671e
fixed #1606 : Override update function for ExtraAction.
2012-12-10 14:11:42 +08:00
minggo
71f61596e9
fixed #1580:request focus after keyboard closed
2012-12-10 14:08:01 +08:00
dualface
d854f68c63
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:51:37 +08:00
dualface
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
James Chen
f8c96483a0
fixed #1606 : Return CCSequence pointer for CCSequence::create.
2012-12-10 12:02:24 +08:00
James Chen
73dd652604
fixed #1605 : Crash occurs when adding just one action to CCSequence.
2012-12-10 11:10:11 +08:00
James Chen
062179c497
fixed #1604 : The enum values in ccPVR3TexturePixelFormat are truncated to 32bit
2012-12-10 10:22:06 +08:00
Mat Hopwood
f75f6c2b64
Mac OS Marmalade fixes
...
Fixed compile issues on Mac OS
2012-12-10 09:54:34 +08:00
Romain TISSERAND
bc0309f1a3
[android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment)
2012-12-09 19:40:41 +01:00
Romain TISSERAND
4cb7506932
Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side
2012-12-09 13:44:41 +01:00
James Chen
0d90fea7b3
Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary
...
Conflicts:
cocos2dx/cocoa/CCDictionary.cpp
cocos2dx/cocoa/CCDictionary.h
2012-12-07 10:40:32 +08:00
Tomoaki Shimizu
e680e5f0f2
Add randomObject to CCDictionary
...
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
2012-12-06 23:56:49 +09:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
minggo
cfd6e6c82a
Merge pull request #1726 from fape/hungarian_language_support
...
Add Hungarian language support
2012-12-05 17:39:46 -08:00
fape
e488361e3b
cosmetics: fix formating
2012-12-05 11:43:04 +01:00
fape
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
minggo
d858ce2fe2
some android devices can not compile this frag
2012-12-05 17:15:47 +08:00
minggo
99781368c4
Merge pull request #1677 from chenium/gles20
...
Fix for CCRenderTexture on Android sleep/resume
2012-12-04 22:40:00 -08:00
minggo
c3a5e870af
Merge pull request #1725 from minggo/merge_jp_support
...
Merge jp support
2012-12-04 22:11:42 -08:00
minggo
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
minggo
75d7df5bcf
Merge pull request #1684 from lvklabs/gles20-for-pull
...
Added removeAllObjects() to CCSet
2012-12-04 20:05:56 -08:00
minggo
cb2427e780
do some modification
2012-12-04 17:25:40 +08:00
James Chen
3e88f8d2e4
fix compilation errors in eclipse project for linux.
2012-12-04 16:48:23 +08:00
James Chen
8a8038b342
Enable stencil buffer for linux.
2012-12-04 16:48:23 +08:00
James Chen
6aa15e0636
Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode.
2012-12-04 16:48:23 +08:00
James Chen
cedd58bb77
#extension GL_OES_standard_derivatives : enable only valid in GL_ES, this fixes crashes on some Linux machines.
2012-12-04 16:47:57 +08:00
James Chen
ed86e2967f
Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm
...
fixed #1590 : JPEG and File fixes and CocosDenshion fix for marmalade.
2012-12-03 19:10:14 -08:00
Mat Hopwood
3b2eea2541
JPEG and File fixes
...
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
2012-12-04 11:03:34 +08:00
minggo
bbcbfa71ef
Merge pull request #1704 from minggo/cclayer_script_support
...
Cclayer script support
2012-12-03 18:55:11 -08:00
James Chen
609fce7e2f
fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
2012-12-04 10:36:13 +08:00
minggo
7ad2484a91
Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support
2012-12-04 09:50:01 +08:00
James Chen
7c074d4ced
issue #1550 : fixed a memory leak in jsbinding.
2012-12-03 22:17:53 +08:00
minggo
af530878fd
Merge pull request #1690 from dualface/fix_CCCallFunc_script_support
...
Fix cc call func script support
2012-12-02 18:26:05 -08:00
dualface
e0ee27cb17
[luabinding] fix CCLayer:getScriptTOuchHandlerEntry()
...
[luabinding] add CCLayer keypad, accelerometer support
2012-12-02 15:17:34 +08:00
dualface
030f5e7079
[luabinding] cleanup script handler when release CCCallFunc
2012-12-02 15:01:12 +08:00
dualface
393ce26330
rollback commit
2012-12-02 14:56:44 +08:00
dualface
d929fe2893
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-12-01 22:20:08 +08:00
dualface
058b6e9f65
fix CCCallFunc for script
2012-12-01 22:19:54 +08:00
folecr
fc65b786ad
Use the "old" particle system quad code.
2012-11-30 13:22:01 -08:00
Andres Pagliano
97efff6e46
Removed unnescessary header
2012-11-30 11:30:45 -03:00
Andres Pagliano
8adb3eb6eb
Refactoring in CCSet
2012-11-30 11:23:44 -03:00
Gonzalo Buteler
43cc383346
Implementation of removeAllObjects() methods in CCSet
2012-11-30 10:44:09 -03:00
James Chen
95875112fa
Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
2012-11-30 21:19:19 +08:00
James Chen
98045f667f
issue #1583 : Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray.
2012-11-30 21:13:25 +08:00
minggo
54309c56b2
change accelerometer accurate to SENSOR_DELAY_GAME
2012-11-30 14:07:01 +08:00
minggo
75fb997513
Merge pull request #1670 from rohankuruvilla/gles20
...
Fixing Accelerometer crash on Android
2012-11-29 22:01:16 -08:00
minggo
84b35c6d48
Merge pull request #1680 from minggo/gles20
...
comment codes for FPS controlling
2012-11-29 21:58:49 -08:00
minggo
61b2e2b880
comment codes for FPS controlling
2012-11-30 13:55:25 +08:00
James Chen
23629b8187
Made all projects compiled ok on Blackberry port.
2012-11-30 12:40:47 +08:00
William Chen
132a76d801
Fix for CCRenderTexture on Android sleep/resume
...
When an android app goes into the background, all gl context is lost, including any frame buffer objects that are required for rendering to a texture. When the android app returns to focus, a new FBO is generated for each render texture allowing rendering to the texture to continue.
2012-11-29 18:04:07 -05:00
James Chen
788b478b3c
Make sure HelloCpp can be full screen.
2012-11-29 16:31:29 +08:00
Rohan Kuruvilla
a4b55b5217
Fixing Accelerometer crash on Android
2012-11-28 15:56:57 -08:00
Taro Kobayashi
3a814de07e
implemented CCApplication::getCurrentLanguage() for linux platform
2012-11-28 19:41:50 +09:00
Taro Kobayashi
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09:00
fape
1843d576d8
create cocos2dx-ext marmalade project
2012-11-26 20:14:10 +01:00
James Chen
d7ebd681ec
fix a warning in CCRenderTexture.
2012-11-26 22:11:56 +08:00
James Chen
be914811fb
fixed #1576 : CCNode::setUserObject needs to be retained.
2012-11-26 22:11:04 +08:00
minggo
69f6b3970a
Merge pull request #1647 from guanqun/fix-doxygen
...
Fix doxygen related errors and warnings
2012-11-25 23:26:48 -08:00
minggo
6bb11d8d71
Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20
2012-11-26 15:09:34 +08:00
minggo
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
minggo
1b9a38e195
issue #1564:work ok on linux
2012-11-26 11:46:37 +08:00
James Chen
a730f8866f
Merge pull request #1644 from fape/testcpp_marmalade
...
fixed #1575 : Update samples/TestCpp to compatible with marmalade
2012-11-25 17:51:32 -08:00
Lu Guanqun
64bec838c0
fix doxygen rendering output of CCLayerGradient
...
Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
2012-11-25 23:27:29 +08:00
fape
e259467873
update marmalade languages
2012-11-25 12:13:30 +01:00
fape
3cc5920aac
Update samples/TestCpp to compatible with marmalade
2012-11-24 20:14:01 +01:00
minggo
1cf237d296
Merge pull request #1643 from minggo/gles20
...
issue #1564:make iOS test work ok
2012-11-23 00:31:06 -08:00
minggo
a423317abc
issue #1564:make iOS test work ok
2012-11-23 16:30:09 +08:00
minggo
3980a710a3
Merge pull request #1641 from minggo/gles20
...
issue #1564 : make tests run on mac osx
2012-11-22 22:24:25 -08:00
minggo
96ecb05ca9
issue #1564 : make tests run on mac osx
2012-11-23 14:22:50 +08:00
minggo
f82e800695
Merge pull request #1640 from minggo/gles20
...
modify lua project setting
2012-11-22 18:42:45 -08:00
minggo
226b10a9e2
modify lua project setting
2012-11-23 10:41:41 +08:00
James Chen
00ad0689ec
Merge pull request #1620 from fape/remove_physics_nodes
...
remove physics_nodes from marmalade
2012-11-22 03:43:24 -08:00
minggo
2ba1bcb5af
Merge pull request #1633 from minggo/gles20
...
issue #1564:enable depth test by default
2012-11-22 00:02:28 -08:00
minggo
76197f1126
issue #1564:enable depth test by default
2012-11-22 16:01:30 +08:00
James Chen
b79b3335bd
Merge pull request #1630 from dumganhar/iss1564-update-tests
...
issue #1564 : Made ChipmunkTest of TestJavascript works
2012-11-21 23:30:14 -08:00
James Chen
b66bc98a46
issue #1564 : Made ChipmunkTest of TestJavascript works
2012-11-22 15:19:16 +08:00
James Chen
aa8e582b7e
Merge pull request #1629 from dumganhar/iss1564-update-tests
...
issue #1564 : fix the wrong order of parameters in CCScheduler::scheduleSelector.
2012-11-21 20:07:45 -08:00
James Chen
51d61ba214
issue #1564 : fix the wrong order of parameters in CCScheduler::scheduleSelector.
...
Made MoonWarriors works.
2012-11-22 12:05:38 +08:00
minggo
14dbe091c8
fix a logical bug in CCRenderTExture
2012-11-22 11:06:07 +08:00
James Chen
73b409f116
issue #1564 : Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest.
2012-11-22 10:04:35 +08:00
James Chen
6c81e21935
issue #1564 : Set depth buffer to 24bit, stencil buffer to 8bit.
2012-11-22 09:55:44 +08:00
James Chen
e1f7c0bab6
issue #1564 : Removing one unnecessary line in CCRenderTexture::visit.
2012-11-22 09:55:43 +08:00
fape
db883f4efc
remove physics_nodes from marmalade
2012-11-21 21:34:33 +01:00
James Chen
24c83cb461
Merge pull request #1617 from dumganhar/iss1564-update-tests
...
issue #1564 : Fix crash of ParticlesTest.
2012-11-21 01:24:59 -08:00
James Chen
3fc2f9888b
issue #1564 : Fix crash of ParticlesTest.
2012-11-21 17:22:26 +08:00
minggo
a69ff7957c
issue #1564:fix a logical erroe in CCRotationTo
2012-11-21 16:53:23 +08:00
James Chen
170978d6a5
issue #1564 : Added ClippingNodeTest.
2012-11-21 15:22:54 +08:00
James Chen
b632c3cd7c
issue #1564 : Minor fix in CCLabelBMFont::createFontChars().
2012-11-21 10:06:03 +08:00
minggo
a246d11110
issue #1564 : update some test cases
2012-11-20 17:30:05 +08:00
James Chen
8f6c8e202e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
...
Conflicts:
samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
2012-11-20 16:35:42 +08:00
James Chen
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
James Chen
eed80761be
issue #1564 : Bugs fixes in CCDrawNode.cpp.
2012-11-20 16:31:33 +08:00
James Chen
e8cf71407d
issue #1564 : Deleted physics_nodes in cocos2dx since it was moved to extension.
2012-11-20 16:27:47 +08:00
James Chen
76c5ad8b32
issue #1564 : Deleted physics_nodes in cocos2dx since it was moved to extension.
2012-11-20 16:24:40 +08:00
James Chen
8a21d4e824
issue #1564 : Moved physics_node to extension.
2012-11-20 16:17:20 +08:00
folecr
03d9a04608
cc_utf8_strlen is used in Android native code; should not be static
2012-11-19 15:57:16 -08:00
James Chen
c3e02f3e52
Merge pull request #1597 from dumganhar/iss1555-update
...
issue #1555 : Updated ActionsTest.cpp, enabled point size in DrawPrimitivesTest.cpp.
2012-11-19 02:15:22 -08:00
James Chen
18d583153b
setUniformLocationwithMatrix4fv ~> setUniformLocationWithMatrix4fv
2012-11-19 17:16:06 +08:00
minggo
2d191befe0
Merge pull request #1596 from minggo/iss1562-label-test
...
fix a memory leak in CCLabelBMFont
2012-11-19 00:10:36 -08:00
minggo
9dc5302b4b
fixed #1562:fix a memory leak in CCLabelBMFont
2012-11-19 16:08:18 +08:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
minggo
fb5b7ed7bb
fixed #1560:fix a logical error in CCNode::schedule()
2012-11-19 11:24:03 +08:00
James Chen
db2175e41c
Merge pull request #1582 from guanqun/build-fixes
...
two simple build fixes
2012-11-17 02:13:22 -08:00
James Chen
b892993a83
Merge pull request #1587 from mrmop/gles20
...
fixed #1559 : If file in resource directory doesn't exist, it will not search the root directory.
2012-11-16 04:56:59 -08:00
Mat Hopwood
fcb265088d
Rssource path root change
...
fullPathFromRelativePath will now search root if file is not found in
path
2012-11-16 10:56:11 +00:00
James Chen
18273e06e3
issue #1555 : Fixed coordinate conversion errors.
...
It needs to be based on 'Design Resolution Size' rather than 'Frame Size'
Please refer to the implementations of CCDirector::convertToGL and CCDirector::convertToUI.
2012-11-16 18:55:57 +08:00
James Chen
df6a50a23a
issue #1555 : Fixed some compilation error for marmalade and blackberry ports.
2012-11-16 18:13:55 +08:00
James Chen
c5b5b978fa
issue #1555 : Made win32 works ok.
2012-11-16 17:08:34 +08:00
James Chen
7601cc7e27
Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
...
Conflicts:
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-11-16 16:21:16 +08:00
James Chen
7557a78e05
issue #1530 : Defined a macro 'snprintf' since it's named '_snprintf' on win32.
2012-11-16 15:58:19 +08:00
James Chen
bb6df91749
issue #1530 : Exported CCUserDefault to js.
2012-11-16 15:58:18 +08:00
James Chen
da7f3f2969
issue #1530 : Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports.
2012-11-16 15:56:51 +08:00
Rohan Kuruvilla
6d59009953
Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
50fbf86180
Uncommenting accelerometer callback in CCLayer
2012-11-16 15:56:28 +08:00
Rohan Kuruvilla
af3bc76062
Fixing script callbacks for schedule updates with negative and positive priorities
2012-11-16 15:55:34 +08:00
minggo
605771697a
Merge pull request #1566 from mingulov/unzip_crc
...
Zip support: broken CRC check / unzCloseCurrentFile
2012-11-15 23:31:14 -08:00
minggo
6a1feb70bc
issue #1555:linux work ok
2012-11-16 15:16:55 +08:00
Lu Guanqun
8270ee3e48
fix -Wreorder warning
...
In the class definition, the field m_nScriptHandler is declared before
m_pCallFunc, so we should follow the order in initialization as well.
2012-11-16 15:10:25 +08:00
minggo
b497143f93
issue #1555:menu can receive touch event now
2012-11-16 14:51:48 +08:00
minggo
a4a53df159
issue #1555:build ok on android
2012-11-16 14:23:14 +08:00
minggo
cb2bc37513
issue #1555 : make tests work
2012-11-15 18:34:23 +08:00
minggo
e19b418c62
issue #1555 : update to v2.1 beta3
2012-11-15 17:16:51 +08:00
James Chen
a3437d09df
issue #1557 : Fixed particle crash.We should check the file format by the file header when the format isn't defined.
2012-11-15 10:43:29 +08:00
James Chen
c79cac3af6
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
2012-11-15 10:10:53 +08:00
Mat Hopwood
148a558405
Tiff support and resource location
...
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
2012-11-14 17:46:09 +00:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
minggo
5fd56370d8
issue #1555:fix a bug about CCGLProgram
2012-11-13 11:06:32 +08:00
minggo
6661f2c88d
issue 1555:add CCPhysicsSprite
2012-11-12 15:22:26 +08:00
minggo
bfa78a8d73
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1555-update
2012-11-12 11:02:30 +08:00
minggo
d4aeb8076c
Merge pull request #1562 from mingulov/apk
...
Android: Access to files from APK is boosted
2012-11-11 18:55:03 -08:00
James Chen
833b5b1be8
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
...
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
2012-11-12 10:20:04 +08:00
Denis Mingulov
869168a884
ZipFile - speedup initialization for zip archive by 30-50%
...
unzip.h/.cpp - unzGoToFirstFile/unzGoToNextFile retrieves information
about the current file, so it is possible to remove redundant calls
to unzGetCurrentFileInfo and speed up general execution.
unzip.h/.cpp are modified accordingly by creation unzGoToFirstFile64
and unzGoToNextFile64 with file info (unz_file_info64) and name as
possible output parameters.
ZipFile::setFilter (it is used to create a file list at ZipFile
constructor) - redundant calls to unzGetCurrentFileInfo64 are removed,
so briefly the time required to generate a zip file list is something
like 1 average old unzLocateFile call.
2012-11-11 15:04:41 +02:00
Denis Mingulov
eaed42c8bd
Zip support: broken CRC check / unzCloseCurrentFile
...
A fix for changes at 75ae8d2201
- unzOpenCurrentFile3 has set pfile_in_zip_read_info->crc32_wait
just in case if Zip file has unknown structure / might not be
unpacked, so almost any unpacked file was considered as having
UNZ_CRCERROR.
2012-11-11 10:22:48 +02:00
minggo
ac363576a9
issue #1555:add CCPyhsicsDebugNode
2012-11-09 17:52:12 +08:00
Denis Mingulov
83cf8aaf29
Android: Access to files from APK is boosted - 1st review update
2012-11-09 09:53:40 +02:00
minggo
d2a5723973
issue #1555:add CCDrawNode
2012-11-09 12:08:18 +08:00
Denis Mingulov
071d264cc5
Android: Access to files from APK is boosted
...
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.
Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
full archive (unzLocateFile).
So if file does not exist - still an archive has to be handled
fully, even slower than a file exists.
- Read file.
- Close zip archive
After this commit:
- Once - open zip/apk file and collect file list information
(average consumed time - the same like a search for 2 different
files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
setting it up to the zip reader and reading file
ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
2012-11-08 13:46:53 +02:00
minggo
6159a8b592
issue #1555:add CCClippingNode
2012-11-08 17:55:25 +08:00
James Chen
6d1a7e089b
fixed #1556 : Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist).
2012-11-08 12:55:32 +08:00
James Chen
4d48e79d47
fixed #1556 : Added a newline at the end of firePngData.h file.
2012-11-08 12:06:02 +08:00
James Chen
4a37c8fa8b
fixed #1556 : Set a defaut texture for CCParticleFire, CCParticleFireworks, etc.
...
Added some static constructors.
2012-11-08 12:03:49 +08:00
minggo
3f3d09fabb
Merge pull request #1532 from wenbin1989/gles20
...
Add error handler when read image data using libjpeg.
2012-11-06 20:10:21 -08:00
James Chen
21e4f80fbd
Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS.
2012-11-06 14:18:13 +08:00
James Chen
270676b74d
issue #1549 : Added some functions for CCNode.
...
virtual void removeFromParent();
virtual void removeChild(CCNode* child);
virtual void removeChildByTag(int tag);
virtual void removeAllChildren();
2012-11-05 18:41:52 +08:00
James Chen
26547c7b30
fixed #1548 : Updated libcurl header files to 7.26.0 on iOS.
2012-11-05 13:13:46 +08:00
James Chen
2f5f7a601b
issue #1526 : Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp.
2012-11-02 10:06:48 +08:00
James Chen
0abcd694c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test-js-device-crash
2012-11-01 22:19:20 +08:00
James Chen
0ace12fc52
issue #1526 : Moved implementations of static functions in CCParticleExample.h, CCLayer.h to CCParticleExample.cpp, CCLayer.cpp.
2012-11-01 22:17:12 +08:00
minggo
d16a6bbe2f
issue #1526:move implementation of static methond into .cpp file
2012-11-01 22:12:13 +08:00
wenbin1989
470fcacc81
Add error handler when read image data using libjpeg.
...
Fix errors when read image using libjpeg.
Fix errors when read image with broken data using libjpeg.
2012-11-01 21:45:51 +08:00
minggo
95d3f87bd7
fix compiling error on linux 64 bit
2012-11-01 15:38:48 +08:00
minggo
21900c26db
update xcode template and version string
2012-11-01 12:06:15 +08:00
James Chen
e8bf21e6a6
fixed #1543 : The CCLayerGradient background of CocosBuilderTest can't be shown.
2012-10-31 18:00:51 +08:00
YuLei Liao
4fe16a262b
fix incorrect delete
2012-10-31 14:08:28 +08:00
YuLei Liao
01866ddc95
fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output
2012-10-31 11:02:36 +08:00
minggo
af12b8dfc2
revert CCSpriteBatchNode::removeSpriteFromAtlas()
2012-10-30 18:20:47 +08:00
minggo
4d8f1aa678
Merge pull request #1420 from sburavtsov/gles20-fixSpriteBatch
...
Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org ...
2012-10-29 20:12:21 -07:00
James Chen
9f6d263c15
fixed #1531 : The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode.
2012-10-30 10:24:28 +08:00
James Chen
9113702903
Merge pull request #1510 from dumganhar/gles20
...
fixed #1312 : Upgraded libcurl to 7.26.0 for linux port
2012-10-29 01:24:29 -07:00
James Chen
2cfad104fa
issue #1530 : Corrected the logic of CClayer::registerWithTouchDispatcher function.
2012-10-29 15:38:44 +08:00
Rohan Kuruvilla
d6753f8a2f
Adding accelerometer setInterval support to Android
2012-10-29 15:08:16 +08:00
Rohan Kuruvilla
ecee64d07c
Adding accelerometer setInterval support to iOS
2012-10-29 15:08:07 +08:00
Rohan Kuruvilla
a2ee6c3761
Changing Touch API in cocos2d-x. Also change ScriptEngine callbacks for targetted Touches
2012-10-29 15:01:30 +08:00
Rohan Kuruvilla
16d5659b17
Adding ScriptingEngine callback for onCleanup event
2012-10-29 15:00:52 +08:00
minggo
5aad6eeb9b
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into update-curl
2012-10-29 14:44:26 +08:00
minggo
e992408a86
issue #1312:update libcurl for linux 64
2012-10-29 14:39:44 +08:00
James Chen
45783574fd
Upgraded libcurl to 7.26.0 for linux port(32bit).
2012-10-29 11:27:25 +08:00
James Chen
6d34e66018
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-10-29 10:51:58 +08:00
James Chen
9673b20775
issue #1312 : Upgraded libcurl to 7.26.0 for windows port.
2012-10-29 10:49:28 +08:00
Andrew Perrault
138ea49b0e
fixed a couple typos
2012-10-27 09:58:49 -04:00
minggo
9d530c8d54
fix a compiling error
2012-10-26 12:04:45 +08:00
minggo
77b69262c8
not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews
2012-10-26 10:10:34 +08:00
Mat Hopwood
2b265929e2
Marmalade Sample data removed and merged changes
...
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
2012-10-25 21:40:37 +01:00
minggo
81ff3d3495
issue #1312 : use --strip-unneeded parameter to strip lib
2012-10-25 16:30:14 +08:00
minggo
84e48ed7e7
issue #1312:update libcurl for android and strip all libs
2012-10-25 14:32:28 +08:00
James Chen
7d9b3d3969
Merge pull request #1488 from dumganhar/iss1520-comments
...
fixed #1520 : Added comments for using multiresolution in HelloCpp.
2012-10-24 01:00:39 -07:00
James Chen
c797af0fe9
fixed #1522 : CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
2012-10-24 10:03:19 +08:00
James Chen
b3db7e91f8
fixed #1520 : Updated some comments.
2012-10-23 14:01:48 +08:00
James Chen
9b644f2757
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1520-comments
2012-10-23 10:51:05 +08:00
James Chen
f4f63fd824
fixed #1520 : Added comments for using multiresolution in HelloCpp.
2012-10-23 10:50:47 +08:00
James Chen
56cdb76867
fixed #1493 : Updated one comment.
2012-10-22 15:52:11 +08:00
James Chen
7af2f7c5ce
fixed #1493 : Updated one comment.
2012-10-22 15:51:06 +08:00
James Chen
6f4e56cd92
fixed #1493 : Corrected some comments for CCNotificationCenter.
2012-10-22 15:49:33 +08:00
James Chen
1c0240b5de
fixed #1493 : Added doxygen comments in CCNotificationCenter.h
2012-10-22 13:48:11 +08:00
minggo
677ba22b5c
Merge pull request #1485 from mingulov/menu_cast
...
CCMenu - prevent a crash if some child item is not CCMenuItem
2012-10-21 19:18:20 -07:00
minggo
9cf3f4c5f6
Merge pull request #1474 from wenbin1989/gles20
...
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
2012-10-21 18:49:42 -07:00
Denis Mingulov
d4f65b5348
CCMenu - prevent a crash if some child item is not CCMenuItem
...
CCMenu::itemForTouch expects that all children are CCMenuItems.
But it is still possible to add other child types, for example
if CCAssert is disabled or some other addChild method is called.
In this case dynamic_cast to CCNode and later try to do
((CCMenuItem*)pChild)->isEnabled() triggers an undefined behaviour
- up to a crash or something else.
Fixed by a dynamic_cast straightforward to CCMenuItem.
2012-10-21 11:16:10 +03:00
Mat Hopwood
24115675b0
Marmalade Cocos2d-x Main Repo Changes
...
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
2012-10-19 16:38:58 +01:00
Mat Hopwood
988835560d
Marmalade Support
...
Full Marmalade support added for Cocos2d-x
2012-10-19 16:26:34 +01:00
James Chen
5751d82e6b
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'.
2012-10-19 17:39:55 +08:00
James Chen
e905da1b73
Merge branch 'gles20' of https://github.com/ImperialPenguin/cocos2d-x into iss1024-bb-ttf
2012-10-19 16:19:55 +08:00
James Chen
c9ce1892af
Merge branch 'gles20' into iss1024-bb-ttf
2012-10-19 16:18:30 +08:00
minggo
f40b6ac4eb
fixed #1515 : implement zoom function on mac os
2012-10-19 11:33:06 +08:00
John Garrison
f4d68a707f
More BB Font fixes
2012-10-18 13:43:31 -04:00
wenbin1989
62351462a8
Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage()
2012-10-18 17:17:11 +08:00
minggo
986a0a34c0
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale
2012-10-18 17:01:27 +08:00
minggo
fa044d3cee
Merge pull request #1472 from wenbin1989/gles20
...
Fix stack overflow in CCLog
2012-10-18 01:57:27 -07:00
James Chen
549dd92d8e
fixed #1516 : The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions.
2012-10-18 15:53:08 +08:00
wenbin1989
29a63a3b0f
Fix stack overflow in CCLog
2012-10-18 14:39:56 +08:00
James Chen
a5639281ec
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-10-18 12:01:55 +08:00
James Chen
a5e260dbdb
issue #1515 : Refactored some codes for win32 port.
2012-10-18 12:01:30 +08:00
James Chen
41c784ec61
issue #1515 : [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
2012-10-18 11:51:02 +08:00
James Chen
0b101bedd0
issue #1515 : Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
2012-10-18 10:54:19 +08:00
James Chen
c1ab8a6ead
fixed #1511 : Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'.
2012-10-18 09:54:24 +08:00
James Chen
9f7019e48c
Updated a comment.
2012-10-17 16:52:09 +08:00
James Chen
5ab37c86b2
Fix a bug about calculating client area on win32.
2012-10-17 16:50:07 +08:00
James Chen
249ef92697
fix a bug about wrong touch area for windows.
2012-10-17 15:38:03 +08:00
James Chen
3f7b79fb08
issue #1511 : Rename some static variables.
2012-10-17 15:14:34 +08:00
James Chen
2779b4f1ab
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel
2012-10-17 15:08:25 +08:00
James Chen
ddfc08904a
issue #1024 : Made blackberry/CCImage.cpp compiled ok.
2012-10-17 10:57:21 +08:00
John Garrison
8e7b939f61
Added TTF support to Blackberry
2012-10-16 13:47:04 -04:00
johnangel
cd82403638
Fix to make MultiTouchTest work properly
2012-10-16 19:02:24 +02:00
johnangel
054128c5ee
Correction for touch and display area
2012-10-16 18:53:31 +02:00
johnangel
a2e1400402
Merge remote branch 'upstream/gles20' into gles20
2012-10-16 08:42:30 +02:00
minggo
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
johnangel
8d0dc8d2a7
Windows Touch support for desktop
2012-10-15 10:39:42 +02:00
James Chen
a6b57f7d79
Merge pull request #1451 from micahli/gles20
...
fixed #1508 : Potential observer array modification while it's traversed in CCNotificationCenter.
2012-10-14 22:50:47 -07:00
James Chen
a65f13defe
issue #1486 : Fix bugs for CCEditBox iOS port.
2012-10-15 13:01:36 +08:00
minggo
93d702e3cc
fixed #1491:remove dependency of FontLabel lib
2012-10-15 12:03:15 +08:00
micahli
c69a11296e
fix the potential Container iterator bug with CCNotification
...
revert last fix which may contain other bugs
2012-10-15 09:55:37 +08:00
minggo
67383ff7ce
Merge pull request #1453 from shinriyo/patch-2
...
getDelta() is delta function
2012-10-14 18:34:03 -07:00
minggo
eadbbf6928
Merge pull request #1447 from minggo/android-effect
...
use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
2012-10-14 18:29:35 -07:00
shinriyo
1569550528
getDelta() is delta function
...
I'm sorry, I mistook the pull request.
2012-10-14 21:20:31 +09:00
James Chen
2c670a9efc
issue #1486 : Fix a bug in CCRenderTexture.cpp about calculate width and height by multiply CC_CONTENT_SCALE_FACTOR().
2012-10-13 18:19:37 +08:00
micahli
7d1d46ee3f
fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address
2012-10-13 16:44:46 +08:00
James Chen
6cf602ea3b
issue #1486 : CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture.
2012-10-13 10:18:03 +08:00
minggo
0a39fa8bef
fixed #1507 : use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
2012-10-12 17:43:43 +08:00
James Chen
965540ecec
issue #1486 : fix a warning in CCAutoreleasePool.cpp.
2012-10-12 16:03:53 +08:00
James Chen
f5abe422ea
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res
2012-10-12 15:50:11 +08:00
James Chen
e1c0ea761b
issue #1486 : Removed some unused codes, made it works on WINDOWS.
2012-10-12 09:58:42 +08:00
Rohan Kuruvilla
540b41c091
Fixing LabelAtlas to read texture relative to path of plist file
2012-10-11 18:44:46 -07:00
James Chen
cdf54a872f
issue #1486 : A bug fix.
2012-10-11 17:02:27 +08:00
James Chen
ade54a3de7
Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res
...
Conflicts:
samples/HelloCpp/Classes/AppDelegate.cpp
samples/HelloCpp/Classes/HelloWorldScene.cpp
2012-10-11 16:12:22 +08:00
James Chen
26a5f31f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors
2012-10-10 15:25:49 +08:00
James Chen
48b146a098
issue #1469 : Exported 'cocos2dVersion'.
2012-10-10 15:08:11 +08:00
minggo
d8b0c75675
fixed #1500:fix a memory leak
2012-10-10 12:02:56 +08:00
minggo
96b3232910
fixed #1500:make rendertexture work ok on certain Qualcomm Andreno gpu
2012-10-10 11:36:02 +08:00
johnangel
e510bee238
Displaying window size in Debug mode
2012-10-09 10:58:56 +02:00
johnangel
e7340f6c1b
ESC button on Windows will now behave like Back button on mobile phones
2012-10-08 18:46:19 +02:00
johnangel
72aa46afe5
Refactoring code
2012-10-08 18:38:04 +02:00
johnangel
c6da27b793
Debug app uses executable directory; Non-debug app uses local app data
...
directory
2012-10-08 17:22:27 +02:00
johnangel
ad7dacc281
Merge remote branch 'upstream/gles20' into gles20
2012-10-08 16:35:43 +02:00
James Chen
be236155e9
Fix a typo.
2012-10-08 14:58:24 +08:00
James Chen
f6c34e23e6
Adding some comments for CCDictionary::objectForKey method.
2012-10-08 14:55:46 +08:00
James Chen
70286073e1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-10-08 14:53:22 +08:00
James Chen
719cb7b7a6
fixed #1496 : An error of comparing font's face name in CCImage of win32 port.
2012-10-08 14:52:08 +08:00
James Chen
6d29e63294
fixed #1494 : Change the value of CCObject::m_uAutoreleaseCount in CCAutoreleasePool class.
2012-10-08 14:05:03 +08:00
James Chen
54b4c690d1
fixed #1494 : Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times.
2012-10-08 13:41:48 +08:00
Ed Bartley
04527f7378
Added some flexibility to the Cocos2dxActivity. View creation can be overridden by developers that use a custom Layout and custom views.
2012-10-06 23:39:47 -04:00
Ed Bartley
a9177fed6f
Fix Typo.
...
Make mGLSurfaceView public so that subclasses can may initialize mGLSurfaceView from a custom xml layout.
2012-10-05 10:24:17 -04:00
Sergey Buravtsov
9eec2d69ee
Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org/boards/6/topics/4336
2012-10-01 16:08:11 +04:00
johnangel
0f2dac9d8e
Saving data to C:\Documents and Settings\<User Name>\Local
...
Settings\Application Data as designed for Windows apps
2012-10-01 11:55:21 +02:00
minggo
6b9affae65
Merge pull request #1402 from Horcruxes/patch-1
...
Update cocos2dx/platform/ios/CCFileUtils.mm
2012-09-29 00:35:35 -07:00
minggo
936cb19684
Merge pull request #1405 from dualface/complete_delete_ccdirector
...
Complete delete CCDirector after called CCDirector::purgeDirector()
2012-09-28 19:20:36 -07:00
walzer
0cca568ffe
fixed #1492 , assert if user add an CCObject* into CCAutoreleasePool twice.
2012-09-28 18:22:00 +08:00
Horcruxes
cb66f1673e
Update cocos2dx/platform/ios/CCFileUtils.mm
...
fixing cannot read data using CCArray::createWithContentsOfFile
2012-09-27 12:31:53 +10:00
walzer
c9772c76ec
fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums
2012-09-27 00:44:40 +08:00
James Chen
0d8e7deb10
Reverted CCNotificationCenter.cpp. 'object' and 'target' should not be retained. We must use weak reference, otherwise the life-cycle of target object will be delayed until the destruction of CCNotificationCenter.
2012-09-26 16:25:13 +08:00
James Chen
a4e04d70c9
A memory leak fix in CCNotificationCenter.
2012-09-26 15:51:14 +08:00
James Chen
48a5ed22c8
Merge pull request #1379 from jzgenius/fix_CCNotificationObserver_performSelector
...
fixed #1485 : [1] The parameters 'target' and 'object' in the constructor of CCNotificationObserver needs to be retained;
[2] perform m_object to performSelector target.
2012-09-26 00:47:28 -07:00
James Chen
0ca7e00700
fixed some compilation errors for linux platform.
2012-09-26 15:23:10 +08:00
jzgenius
0517372557
add CC_SAFE_RETAIN into constructor of CCNotificationObserver.
2012-09-26 14:10:52 +08:00
James Chen
0dfa1b566b
Fixed compilation errors of blackberry platform.
2012-09-26 11:16:44 +08:00
James Chen
4a3127f41f
Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
2012-09-25 21:52:30 +08:00
James Chen
3e442d161f
Merge pull request #1381 from dumganhar/iss1483_sync_cccontrol
...
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 02:30:30 -07:00
James Chen
f7229f74d8
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 16:57:51 +08:00
jzgenius
e24ad0380b
[fix] CCNotificationObserver performSelector & CCNotificationObserver function. Let's m_object is right perform to target.
2012-09-25 14:54:13 +08:00
minggo
364d7a487a
Update cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
...
Comment some debug codes, because it will cause auto-building fail.
2012-09-25 14:42:45 +08:00
minggo
df24c919a4
Merge pull request #1377 from minggo/gles20
...
fix auto building error
2012-09-24 21:14:10 -07:00
minggo
74b9e2539b
fix auto building error
2012-09-25 12:13:06 +08:00
Walzer
450f8f3a30
Merge pull request #1360 from jzgenius/NEWplatform-third_party-ios-libraries-libcurl
...
Ne wplatform third party ios libraries libcurl
2012-09-24 21:05:17 -07:00
minggo
3d177f926b
Merge pull request #1373 from ByungChoi/fontconfig_link_fix
...
fixed cocos2dx linux TestCpp build break
2012-09-24 19:18:12 -07:00
walzer
06f639edab
update copyright to 2012, update cocos2d version to 2.0.3
...
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
Byung Choi
624bedad38
fixed cocos2dx linux makefile to link libfontconfig
2012-09-24 20:14:42 +09:00
Sergey Vikhirev
05eb4352e8
Remove retina specific methods and logic
2012-09-24 14:22:02 +04:00
minggo
88952396e4
Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int
2012-09-24 15:16:30 +08:00
minggo
2ed7b9febe
Merge pull request #1365 from dualface/luafix
...
luabinding bugfix
2012-09-23 20:17:23 -07:00
minggo
37f508b415
Merge pull request #1327 from Weeds/gles20
...
[linux] font rendering enhancements
2012-09-23 19:58:48 -07:00
dualface
863b0b89a3
Revert "[iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS"
...
This reverts commit 6eabead4e3
.
2012-09-24 10:58:43 +08:00
Donald Alan Morrison
dec9fff7a7
UITextAlignment deprecated for NSTextAlignment.
...
UITextAlignment on NSTextAlignment is injective, not surjective.
There is an equivalence relationship for a subset of NSTextAlignment.
http://en.wikipedia.org/wiki/One-to-one_function
2012-09-22 20:56:10 -07:00
Byung Choi
68f38914b1
fixes #1359 , MSVC's stdint absence
2012-09-22 17:36:36 +09:00
jzgenius
ad5b687848
[lib] New libcurl.a, armv7 & armv7s & simulator Supported.
2012-09-22 13:16:23 +08:00
Byung Choi
2ed9119d4f
fixed pointer to int casting warnings and errors, based on stdint
2012-09-22 03:02:29 +09:00
minggo
dca626eab0
Merge pull request #1357 from ByungChoi/linux_makefile
...
Linux makefile
2012-09-21 02:12:45 -07:00
minggo
0a1f0369e6
fixed #1481 : merge Nicolas's pull request and do some bug fixes
2012-09-21 17:01:19 +08:00
minggo
29fad4d570
Merge branch 'gles20-android-refactoring' of https://github.com/nicolasgramlich/cocos2d-x into merge_nicolas
2012-09-21 11:05:31 +08:00
Rohan Kuruvilla
423bdf3f5a
Adding createWithTotalParticles static function to CCParticleSystemQuad
2012-09-20 18:02:17 -07:00
dualface
10fa047965
Complete delete CCDirector after called CCDirector::purgeDirector()
2012-09-21 00:29:16 +08:00
dualface
e36c4abb65
[Lua] remove Lua script handler on CCNode destroy
2012-09-21 00:21:24 +08:00
dualface
6eabead4e3
[iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS
2012-09-20 23:32:26 +08:00
minggo
e84606aa47
Update cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-09-20 16:15:00 +08:00
minggo
31c6f46b6a
Merge pull request #1329 from dualface/gles20
...
update luabinding for overloaded functions, fix mac CCLuaLog crash ...
2012-09-20 01:11:36 -07:00
dualface
72e1bdc8cd
add ccDrawCircle overloaded function, for jsbinding
2012-09-20 11:55:12 +08:00
dualface
2e900da66d
add comment
2012-09-20 11:48:34 +08:00
dualface
1a162a09ad
restore CCLayer:onExit()
2012-09-20 11:32:02 +08:00
minggo
d662082ef1
Merge pull request #1334 from moadib/gles20
...
Fixed statement which works but incorrect from point of C++ standard
2012-09-19 20:10:15 -07:00
minggo
72356d1a84
Merge pull request #1341 from nichos1983/gles20
...
fix bug of not checking object before post notification
2012-09-19 19:04:14 -07:00
dualface
36908396d2
[Lua] disable CCLayer remove script touch handler on exit
2012-09-20 09:29:20 +08:00
dualface
93b669b936
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-20 09:27:45 +08:00
johnangel
778f663e76
Returning setViewName to be able to set game window title
2012-09-19 19:56:58 +02:00
johnangel
acac470f7b
Fixing GPF when old OpenGL version is detected
2012-09-19 19:36:09 +02:00
minggo
8cdf73640b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder
2012-09-19 18:08:17 +08:00
minggo
2f3cdc6538
issue #1470:modify linux makefile and re-create xcode template
2012-09-19 18:05:10 +08:00
nichos1983
16d3466f39
fix bug of not checking object before post notification
2012-09-19 15:28:36 +08:00
Ed Bartley
925c21cdde
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
2012-09-18 18:42:41 -04:00
Byung Choi
4a4ef87163
Fixes #1317 by http://gcc.gnu.org/wiki/Visibility
2012-09-19 04:59:33 +09:00
Byung Choi
ad5836a3ca
debug & release makefiles for cocos2dx, box2d, chipmunk, cocosdenshion
2012-09-19 04:42:57 +09:00
Nicolas Gramlich
cd4b22a503
Merge branch 'gles20-official' into patch-5
2012-09-18 10:50:15 -07:00
moadib
6df8233b03
Fixed statement which works but incorrect from point of C++ rules applied to ternary operator and can cause compilation error on compiler different from MSVC
2012-09-18 13:15:05 +04:00
dualface
cf5f3dedc7
[Win32] disable CCTextureAtlas use VAO, some windows display adapter driver cannot support VAO
2012-09-17 17:58:21 +08:00
dualface
ded6e3edcf
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-17 17:55:41 +08:00
dualface
44e5bdf7a8
restore CCDirector
2012-09-17 15:12:13 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
Andre Rudlaff
394b64d61f
[linux] fixed font rendering artifacts
...
This patch fixes the black pixels
around fonts when rendered using
CCLabelTTF.
see http://www.cocos2d-x.org/issues/706
This fix is for linux only, but may
be applied to other platforms as well
2012-09-17 02:33:23 +02:00
Andre Rudlaff
44ccc40269
[linux] use fontconfig to select system fonts
...
This patch removes the hardcoded font paths
from the linux project and uses fontconfig
to find the best match for a given font-family
The implementation also adds the possibility
to load a font file from the applications
resource directory
2012-09-18 00:57:29 +02:00
Walzer
f475bcf102
CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create
2012-09-16 16:21:42 +08:00
Walzer
b8fad67ef4
Fix English syntax in CCDrawingPrimitives.cpp
2012-09-16 10:18:06 +08:00
minggo
7e123f3aec
Merge pull request #1322 from NatWeiss/fixtmxparser2
...
Fixes a bug in the TMX parser which caused tileset images not to load.
2012-09-15 18:50:44 -07:00
minggo
eab52552be
Merge pull request #1320 from NatWeiss/fixccthread
...
Fixes CCThread.cpp so it is not included for Mac builds.
2012-09-15 18:47:42 -07:00
Nat Weiss
53e4da5d5c
Fixes a bug in the TMX parser which caused tileset images not to load on Android.
2012-09-15 15:59:15 -07:00
Donald Alan Morrison
6816fb94fc
A few more minor documentation changes. OK, enough for today! :-)
2012-09-15 15:12:28 -07:00
Donald Alan Morrison
216ebab0e1
Minor English Spelling Corrections, etc.
2012-09-15 14:19:14 -07:00
johnangel
fdec1ba4b9
Fixing include paths to be able to compile cocos2d-x using
...
external Visual Studio solution, without copying all files
2012-09-15 16:34:31 +02:00
Walzer
9a042b8056
fix a potential memory leak in CCTextureCache::addImage. Thanks to Alexander Markevich.
2012-09-15 21:11:50 +08:00
Nat Weiss
febafa6e82
Fixes CCThread.cpp so it is not included for Mac builds.
...
The Mac platform already has it's own CCThread.mm.
2012-09-15 00:37:12 -07:00
Donald Alan Morrison
b29f9a7f3b
Missed one spelling error.
2012-09-14 15:41:42 -07:00
Donald Alan Morrison
b8412f3b7e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-14 15:27:55 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
dualface
2866fa8f56
Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20
2012-09-14 18:00:30 +08:00
dualface
515ec3c482
ccDrawCircle() add scaleX and scaleY
2012-09-14 18:00:11 +08:00
dualface
62709d7c71
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-14 17:57:56 +08:00
dualface
2869aba7b4
avoid unused memory alloc
2012-09-14 17:54:53 +08:00
johnangel
a9f37d4e8b
OpenGL access violation fix
2012-09-13 19:22:03 +02:00
johnangel
6396089b16
Revert "OpenGL access violation fix"
...
This reverts commit 81fda22597
.
2012-09-13 19:18:43 +02:00
johnangel
81fda22597
OpenGL access violation fix
2012-09-13 19:13:38 +02:00
Nicolas Gramlich
f03c0caaf9
Added proper JNIEXPORT/JNICALL markers to android platform jni bindings.
2012-09-13 09:34:30 -07:00
Walzer
150ef1f320
Update cocos2dx/platform/win32/CCEGLView.cpp
2012-09-13 15:53:57 +08:00
Walzer
5718dc1397
fixed #1474 , check OpenGL version of win32
...
When OpenGL version is too old to run 2dx (<1.5), popup a warning dialog to warn users.
2012-09-13 15:52:46 +08:00
dualface
4aa74d8f5e
[Mac] fix CCLuaLog crash
2012-09-13 10:26:47 +08:00
dualface
9418afacf9
delete CCDirector after call CCDirector::purgeDirector()
2012-09-13 10:26:30 +08:00
Nicolas Gramlich
675d0adce5
Merge with gles20-official.
2012-09-12 16:51:01 -07:00
flamingo
bb82930789
Update cocos2dx/platform/win32/CCEGLView.cpp
...
extra endings in linux logging
2012-09-12 22:17:56 +04:00
YuLei
400af95093
restore CCDirector
2012-09-11 16:07:56 +08:00
YuLei
e1600b0977
delete CCDirector after call CCDirector::purgeDirector()
2012-09-11 15:49:10 +08:00
YuLei
fc3a55a065
[Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h
2012-09-11 15:44:33 +08:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03:33 +08:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
Ed Bartley
c67412618d
Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
...
Conflicts:
extensions/GUI/CCScrollView/CCScrollView.cpp
2012-09-10 10:50:30 -04:00
Ed Bartley
01103c4cb1
Remove optimization of the mac debug build
2012-09-10 10:48:34 -04:00
moadib
97a11c0e06
Handle window close event on Linux platform
2012-09-10 17:53:33 +04:00
James Chen
ae320b5f9c
stage sth.
2012-09-10 18:38:18 +08:00
James Chen
2f51246bbd
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
2012-09-10 17:01:00 +08:00
James Chen
6a1aae95aa
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
...
Conflicts:
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj
2012-09-10 17:00:22 +08:00
YuLei
8fa431fe0a
[Mac] remove CCEGLView::purgeSharedOpenGLView()
2012-09-10 16:50:45 +08:00
Walzer
b1572beb0b
fixed #1453 , fix a typo in platform/ios/CCGL.h
...
#include <OPenGLES/ES2/glext.h> is fixed to #include <OpenGLES/ES2/glext.h>
2012-09-10 15:05:56 +08:00
James Chen
1460f4e42f
issue #1458 : Updated project configuration for all platforms.
...
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
2012-09-10 13:39:12 +08:00
Nicolas Gramlich
4c7705171a
Android JAVA refactoring. Android JNI Cleanup.
2012-09-07 17:23:04 -07:00
ebartley
f027c4a9f7
Merge branch 'gles20' of https://github.com/FlowerpotGames/cocos2d-x into gles20
2012-09-07 15:01:52 -04:00
ebartley
5deeb3f8fa
Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors.
2012-09-07 15:00:21 -04:00
Ed Bartley
a392b17182
MAC project is missing the header search path to /include
2012-09-07 13:14:22 -04:00
YuLei
58ea948cc8
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-07 19:21:15 +08:00
minggo
23e5c69616
Merge pull request #1280 from Yodesoft/gles20
...
Supported display Unicode chars.
2012-09-07 01:12:05 -07:00
minggo
af32d42eb7
Merge pull request #1286 from moadib/gles20
...
Fixed crash with CCLabelBMFont
2012-09-06 22:51:00 -07:00
dualface
08f5617fde
[Win32] fix: CCLuaLog crash when dump large message (>16K)
2012-09-07 10:41:54 +08:00
dualface
a8aa299c2a
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-07 10:16:57 +08:00
dualface
4968ab126f
[Win32] fix CCLuaLog() crash
2012-09-07 10:15:17 +08:00
moadib
a574d17bed
Added comment as minggo requested
2012-09-06 10:09:29 +04:00
YuLei
3679f742cb
Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20
2012-09-06 09:50:52 +08:00
dualface
eae5f7368e
[Win32] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory
2012-09-06 09:49:38 +08:00
YuLei
7ba88dca4c
[Mac] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory
2012-09-06 09:44:40 +08:00
ivzave
cf67922ee0
remove delete this from init methods
2012-09-05 22:30:44 +04:00
YuLei
a5e34ee754
[Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename()
2012-09-05 16:15:09 +08:00
moadib
1b51b709ee
Fixed crash with CCLabelBMFont when center- or right-aligned text have line breaks each other
2012-09-05 11:36:34 +04:00
dualface
affcb70ecc
add CCApplication::setResourceRootPath()
...
add CCApplication::setStartupScriptFilename()
2012-09-05 14:38:39 +08:00
YuLei
6115769044
restore CCApplicationProtocol.h and CCFileUtils.h
2012-09-05 13:36:27 +08:00
dualface
1dc7c48cf6
[Win32] add CC_DISABLE_ASSERT check
2012-09-04 11:34:55 +08:00
dualface
3befb0ffdc
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-04 11:20:33 +08:00
YuLei
39b019b2cb
[Mac] fix CC_ASSERT error
...
[Mac] add CC_DISABLE_ASSERT check
[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
2012-09-04 11:16:59 +08:00
yodesoft
95f204cd17
Add font table to handler font info, eg. family_name, style_name, filename
2012-09-04 10:48:02 +08:00
dualface
9fa8d87bc0
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-04 02:41:46 +08:00
dualface
2160e56cb1
[Win32] fix CCFileUtils:fullPathFromRelativePath() check m_isWorkingDirectory
2012-09-04 02:41:16 +08:00
YuLei
539a524627
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-04 02:16:35 +08:00
YuLei
09b0d9c843
[Mac] fix memory leaks
2012-09-04 02:06:04 +08:00
YuLei
a25b1b3f2f
[Mac] fix memory leaks
2012-09-04 01:22:06 +08:00
YuLei
39f672e5bf
fix: cleanup scheduler after call CCDirector::end()
2012-09-04 01:21:32 +08:00
YuLei
03374fa83b
add CCApplicationProtocol:setStartupScriptFilename(), getStartupScriptFilename()
...
CCFileUtils:setResourceDirectory() add isWorkdingDir argument
2012-09-03 18:05:59 +08:00
minggo
56c329cf0e
reset texture parameter when coming to foreground on android
2012-09-03 16:47:18 +08:00
minggo
1a2dd6ae35
Merge branch 'gles20' of https://github.com/MartinSherburn/cocos2d-x into merge_texparams
2012-09-03 16:04:41 +08:00
yodesoft
b0d7ecec42
Supported display Unicode chars.
2012-09-03 12:38:29 +08:00
dualface
9809798280
[Win32] add menubar to window
...
[Win32] set custom window message proc
[Win32] resize window
2012-09-03 00:58:42 +08:00
YuLei Liao
c1beb9d3bf
[Win32] CCLog() print to STDOUT
2012-09-02 13:21:30 +08:00
YuLei Liao
d4c53d43b9
[Win32] add custom menu and custom windows message proc
2012-09-02 04:38:52 +08:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
0f213beae2
issue #1454 : Fixed a bug in CCMenuItem::activate.
2012-08-31 22:33:14 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
YuLei
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
Martin Sherburn
afd8391ca8
Fixed bug where texParams would get lost after reloading textures on android
2012-08-30 20:36:24 +01:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
James Chen
2ac2658612
Fixed a bug that 'CCEGLView::sharedEGLView()->isRetinaEnabled()' always returns false when retina mode is enabled on win32.
2012-08-30 10:43:54 +08:00
James Chen
21547fb96f
Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp,
...
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
2012-08-29 14:49:04 -07:00
James Chen
7c5b3c472e
Added CCParticleSystem::createWithTotalParticles.
2012-08-29 14:49:03 -07:00
James Chen
a2b5916301
Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.
...
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
2012-08-29 14:49:03 -07:00
James Chen
55423ed5b9
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
James Chen
06f240fa5e
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
James Chen
d6e1d6b4fa
Commented some codes.
2012-08-29 21:50:09 +08:00
YuLei
f14eccb6e5
[Mac] add miss CCLuaLog
2012-08-29 18:40:42 +08:00
YuLei
66b221dc79
[Lua] update luabinding
2012-08-29 17:32:47 +08:00
folecr
d4948939b6
Remove spidermonkey bindings from the CocosDenshion and cocos2dx module makefiles
...
* ... they should only be included by cocos+JavaScript applications
2012-08-28 17:43:57 -07:00
Rohan Kuruvilla
c62462d997
Including callback support for onEnterTransitionDidFinish and onExitTransitionDidStart
2012-08-28 17:43:35 -07:00
YuLei
f6a17f69f7
update tolua++ pkg files
...
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:53:52 +08:00
minggo
f7993b9954
Merge pull request #1250 from mustime/testlua
...
issue #1425 : remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
2012-08-27 23:35:55 -07:00
mustime
69679ff545
issue #1425 : remove endToLua interface in CCDirector.h, use renaming
...
feature in tolua++ instead.
2012-08-28 14:28:33 +08:00
YuLei
b411c00f38
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:23:31 +08:00
minggo
76410f4b5b
Merge pull request #1248 from mustime/testlua
...
Testlua
2012-08-27 23:18:22 -07:00
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
YuLei
02e77faf51
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 12:22:57 +08:00
YuLei
2c518e43b2
[Lua] fix CCLayer:registerScriptTouchHandler()
...
[Lua] make CCNotificationCenter script support
2012-08-28 12:08:15 +08:00
Rohan Kuruvilla
8d7516a0ef
Test project for cocos2d-x js.
2012-08-27 10:07:31 -07:00
folecr
9e226faa6c
Use #ifdef COCOS2D_JAVASCRIPT for JS specific code
2012-08-27 08:43:40 -07:00
Rolando Abarca
b7a7eec7b8
typo
2012-08-27 08:43:40 -07:00
Rolando Abarca
188cb8052d
fixes CCLabelBMFont create
...
also, a small bug in CCMenuItemToggle
2012-08-27 08:43:39 -07:00
Rolando Abarca
f210b666ee
removes a few warnings
2012-08-27 08:43:39 -07:00
folecr
876f7857e1
Fix CCMenuItemToggle::create()
2012-08-27 08:43:39 -07:00
Rolando Abarca
bee9099102
updates CCMenuItem and CCAnimation
2012-08-27 08:43:39 -07:00
Rolando Abarca
033ae81871
adds COCOS2D_JAVASCRIPT for some specifics parts
2012-08-27 08:43:39 -07:00
folecr
cd87364277
Includes for typeinfo and spidermonkey_specifics.h
2012-08-27 08:43:39 -07:00
Rolando Abarca
5f4bafda08
fixes CCMenuItemToggle::create()
...
Works with no arguments (items). You can add items later
2012-08-27 08:43:39 -07:00
Rolando Abarca
ce40351855
updates CCScheduler to work with the JS Bindings
2012-08-27 08:43:39 -07:00
Rolando Abarca
a97d0f5a95
fixes default values for functions
2012-08-27 08:43:39 -07:00
Rolando Abarca
4ce9cc9810
adds typeinfo and fixes overloaded funcs
2012-08-27 08:43:38 -07:00
Rolando Abarca
2598fc97d1
adds TypeInfo to some classes
2012-08-27 08:43:38 -07:00
Rolando Abarca
c6db10772c
fixes default arguments for the generator
2012-08-27 08:43:38 -07:00
rohankuruvilla
77f723789b
Adding support for cc.CallFunc.
2012-08-27 08:43:38 -07:00
folecr
0c9b7718a0
Cocos2D-X depends on spidermonkey scripting core now.
...
* Define COCOS2D_JAVASCRIPT
* Include the scripting core library
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0cf880d620
Fixing touch handling to remove the need to registerTouchHandler
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
c47d9d4e7c
Adding Touch callbacks and capability to pass this around
2012-08-27 08:43:38 -07:00
Rolando Abarca
a114502929
removes OBJECT_TYPE thing
2012-08-27 08:43:38 -07:00
Rolando Abarca
42ce395f05
uses proxy instead of Get/SetPrivate
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0e9ba1173a
Callbacks
2012-08-27 08:43:37 -07:00
Rolando Abarca
4e640ecb35
uses new ADD_OBJECT_TYPE macro
2012-08-27 08:43:37 -07:00
Rolando Abarca
701f5e9dfc
roots & unroots jsobject
2012-08-27 08:43:37 -07:00
Rolando Abarca
9d11298d8e
adds empty create for CCMenuItem
2012-08-27 08:43:37 -07:00
Rolando Abarca
a6a8103d2b
adds object type info to CCDirector
2012-08-27 08:43:37 -07:00
folecr
487b252a82
Remove macros
2012-08-27 08:43:34 -07:00
Rolando Abarca
e757d55a29
updates cocos2d-x API to support getObjectType()
2012-08-27 05:45:11 -07:00
minggo
d1f92b8da4
Merge pull request #1239 from mustime/testlua
...
Testlua
2012-08-27 02:45:29 -07:00
James Chen
ef906cd2ba
Merge pull request #1247 from dumganhar/gles20
...
Updated Makefiles for linux port.
2012-08-27 01:45:26 -07:00
James Chen
dd26a2fcd8
Updated Makefiles for linux port.
2012-08-27 16:43:02 +08:00
minggo
0e81fd0568
fixed #1442 : use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
2012-08-27 16:11:07 +08:00
James Chen
28150573c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-27 13:48:55 +08:00
James Chen
7ccb720104
Resource file searching implementation for blackberry.
...
Updated the package names of blackberry samples.
2012-08-27 13:48:17 +08:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
minggo
c7d365ca1c
Merge pull request #1231 from donaldalanmorrison/gles20
...
Gles20
2012-08-26 20:17:40 -07:00
James Chen
3d0b5bf455
fixed some warnings in java codes for android port.
2012-08-27 10:21:43 +08:00
YuLei
a38b8d4a00
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
...
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
2012-08-25 17:08:33 +08:00
YuLei
8b54355aa1
[Lua] update luabinding
...
[Lua] add LuaValue, LuaDict, LuaArray
2012-08-25 15:05:59 +08:00
Donald Alan Morrison
5075a83271
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/kazmath/src/ray2.c
2012-08-25 00:00:27 -07:00
Donald Alan Morrison
857608495c
Plugged CoreFoundation memory leaks identified by Static Analyzer.
2012-08-24 23:34:20 -07:00
Donald Alan Morrison
9f1899978e
Fixed potential memory leak identified by Static Analyzer.
2012-08-24 21:39:41 -07:00
James Chen
6c4bdc238f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-24 18:02:34 +08:00
James Chen
2eeca6f000
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-24 18:02:00 +08:00
James Chen
369eb3daa3
[WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath.
2012-08-24 18:01:16 +08:00
minggo
cb93713433
Merge pull request #1234 from minggo/gles20
...
use absolute path in CCFileUtils
2012-08-24 02:58:33 -07:00
minggo
bcd691ad9f
use absolute path in CCFileUtils
2012-08-24 17:55:29 +08:00
minggo
cf1d61f3de
Merge pull request #1232 from minggo/gles20
...
fix compiling error of linux
2012-08-24 01:09:37 -07:00
mingo
ba4d75a60e
issue #1445 : fix compiling error of linux
2012-08-24 15:53:26 +08:00
James Chen
e011be88d8
fixed a bug in CCFileUtils.cpp of blackberry port.
2012-08-24 14:35:51 +08:00
James Chen
5e5b71a396
fixed a bug in CCEGLView.cpp.
2012-08-24 14:35:24 +08:00
Donald Alan Morrison
3ee17b1a23
Merge with c9674e85e8
. The diff revealed
...
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
2012-08-23 22:32:33 -07:00
Donald Alan Morrison
82bb62f8e3
MSVC++2010 doesn't accept C99-style named-initialization like clang.
2012-08-23 20:58:25 -07:00
minggo
f8df93c59c
Merge pull request #1228 from mustime/testlua
...
Testlua
2012-08-23 19:15:50 -07:00
minggo
fa0dbb7c65
Merge pull request #1226 from Squallium/gles20
...
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 19:11:07 -07:00
mustime
c9674e85e8
fixed a compile error on WIN32
2012-08-24 10:10:14 +08:00
mustime
f67b513d08
issue #1425 : add android proj on TestLua
2012-08-24 10:07:15 +08:00
James Chen
998cb276ba
Merge pull request #1224 from dumganhar/android_editbox
...
issue #1429 : CCEditBox for android port
2012-08-23 18:53:24 -07:00
minggo
56ce6869d6
Merge pull request #1227 from donaldalanmorrison/gles20
...
Gles20
2012-08-23 18:32:39 -07:00
Squallium
bd09615a26
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 22:53:16 +02:00
Donald Alan Morrison
e3094d80d0
Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method.
2012-08-23 13:41:54 -07:00
James Chen
ee3e68014b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
2012-08-24 00:16:11 +08:00
James Chen
1685e5c497
issue #1429 : Used java code to implement keyboard layout.
2012-08-24 00:15:15 +08:00
James Chen
7f2c9f6fb4
issue #1429 : Removed some used codes.
2012-08-23 23:09:12 +08:00
minggo
83606d7691
Merge pull request #1212 from mustime/testlua
...
Testlua
2012-08-23 03:08:25 -07:00
minggo
37cb691600
fix some bugs while testing
2012-08-23 18:01:28 +08:00
mustime
b815504d69
issue #1425 : change the design of CCCallFunc::create(int nHandler)
2012-08-23 16:27:22 +08:00
James Chen
06038163ca
iss1429: Finished using Dialog to implement CCEditBox for android port.
...
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo
23bd0268cf
Merge pull request #1217 from zeaster/gles20
...
fixed #1298 : double firing CCCallFunc action in CCSequence
2012-08-23 00:34:06 -07:00
minggo
0c5cec0056
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
2012-08-23 14:26:39 +08:00
minggo
d83cdbda09
fixed #1441 : put hd and ipad resources into separate directory
2012-08-23 14:20:32 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
yichao.zhang
988a8d8a60
fixed #1298 : do not update last action when it is done in IntervalAction
2012-08-22 19:48:32 +08:00
minggo
99b81e3e38
Merge pull request #1216 from minggo/iss1439_synchronize
...
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 00:52:54 -07:00
minggo
3b442dfc0f
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 15:51:25 +08:00
minggo
3b1bfa5852
Merge pull request #1215 from minggo/iss1440_ccsprite_displayFrame
...
fixed #1440:convert offert point to pixel
2012-08-21 23:30:37 -07:00
minggo
2a9d29ba21
fixed #1440:convert offert point to pixel
2012-08-22 14:29:23 +08:00
mustime
1ffdbc1639
issue #1425 : add standard comment on CCCallFunc::create(int nHandler) and
...
CCCallFuncN::create(int nHandler)
2012-08-22 14:21:48 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
mustime
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
mustime
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
minggo
ce274cfb4f
Merge pull request #1209 from minggo/iss1437_return_pointer
...
make CCEGLView::sharedOpenGLView() and CCApplication::sharedApplication() return pointer
2012-08-21 02:47:47 -07:00
James Chen
4c2702fcef
issue #1437 : fixed some compile errors for blackberry port.
2012-08-21 17:42:56 +08:00
James Chen
fac3e9c8de
issue #1437 : fixed some compile errors.
2012-08-21 17:25:03 +08:00
minggo
e939285c93
change version
2012-08-21 17:03:01 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
19f4356c0b
Merge pull request #1207 from aninggo/patch-2
...
Update cocos2dx/include/ccConfig.h
2012-08-20 20:08:52 -07:00
ningxu
5baa19992d
Update cocos2dx/include/ccConfig.h
2012-08-21 10:56:12 +08:00
Donald Alan Morrison
81d8dd0eb2
Silenced a false-positive warning from the LLVM Static Analyzer with initialization.
...
The warning is caused because the code has a series of if statements not chained with else clauses -- code that works as-is, but scares the SA. Probably not worth the effort to refactor...the optimizing compiler probably removes a temporary variable.
2012-08-20 18:30:12 -07:00
Donald Alan Morrison
7d66f62881
Removed a Static Analyzer Warning about immutable NSNotification object ownership by changing a property from assign to copy.
2012-08-20 18:09:51 -07:00
Donald Alan Morrison
61a5b2a742
Plugged a memory leak identified by LLVM Static Analyzer.
2012-08-20 16:48:07 -07:00
Donald Alan Morrison
c482a246be
Plugged potential memory leak found by LLVM Static Analyzer.
2012-08-20 16:40:26 -07:00
Donald Alan Morrison
abe45e53b5
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 16:16:00 -07:00
Donald Alan Morrison
d6ec91807c
For Release Builds:
...
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "NS_BLOCK_ASSERTIONS=1",
+ "NDEBUG=1",
+ );
For All Builds:
+ WARNING_CFLAGS = "-fdiagnostics-show-option";
2012-08-20 16:11:11 -07:00
Donald Alan Morrison
75ae8d2201
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:54:12 -07:00
Donald Alan Morrison
c75f73aa41
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:33:34 -07:00
Donald Alan Morrison
70f383ec2f
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:30:37 -07:00
Donald Alan Morrison
4f80c54884
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:26:35 -07:00
Donald Alan Morrison
9a8d1ca8b8
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:18:12 -07:00
Donald Alan Morrison
cbeb2bb1b9
Silenced warning of function override by category implementation, by surrounding with a clang pragma.
2012-08-20 14:08:49 -07:00
Donald Alan Morrison
e6e0684ecb
Added explicit cast to silence warning of implicit cast.
2012-08-20 14:01:48 -07:00
ningxu
84a946f676
Update cocos2dx/platform/mac/CCGL.h
...
add VAO support
2012-08-20 23:07:43 +08:00
James Chen
fd1343b951
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
2012-08-20 17:08:29 +08:00
James Chen
0861877594
kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle.
2012-08-20 16:32:22 +08:00
James Chen
7eb5d85298
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb
2012-08-20 15:49:24 +08:00
James Chen
6c9b4d3357
fixed #1420 : Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
2012-08-20 15:49:02 +08:00
minggo
738f150ecd
fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android
2012-08-20 14:06:29 +08:00
James Chen
b63d4d7702
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_bb
2012-08-20 11:40:23 +08:00
James Chen
63888a7eb5
issue #1432 : MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen.
2012-08-20 10:38:21 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00
James Chen
d3338a70e5
issue #1429 : Updated EditBoxTest and fix a bug about callback function.
2012-08-17 14:29:07 +08:00
minggo
316c484936
Merge pull request #1173 from mustime/bug1284
...
issue #1284 : add detection for I9100 model
2012-08-16 18:39:28 -07:00
James Chen
797c15b9a2
Merge pull request #1188 from dumganhar/gles20
...
fixed #1419 : Updated eclipse project configurations for linux port.
2012-08-16 03:22:40 -07:00
James Chen
48fa8a4e88
fixed #1419 : Update eclipse project configurations for linux port.
2012-08-16 18:09:01 +08:00
minggo
756a7e3b0c
Merge pull request #1186 from minggo/gles20
...
remove some unneeded codes
2012-08-15 23:53:22 -07:00
minggo
714b9ef838
remove some unneeded codes
2012-08-16 14:51:58 +08:00
James Chen
3c33c43fd4
fixed a bug in CCActionInterval.cpp.
...
CCSequence::create(pAction2, CCDelayTime::create(d1 - d2)); ~> CCSequence::createWithTwoActions(pAction2, CCDelayTime::create(d1 - d2));
2012-08-16 14:29:27 +08:00
James Chen
605f63f2b7
Merge branch 'gles20' into minggo_iss1405
2012-08-16 12:04:44 +08:00
minggo
416ce6b91d
fixed #1430 : add some comment
2012-08-16 11:45:52 +08:00
minggo
6a9da80292
fixed #1430 : compute correct label's width or height when its value is 0
2012-08-16 11:43:44 +08:00
James Chen
de2c00b7ae
issue #1405 : fixed some compile error on win32 and linux.
2012-08-16 11:30:25 +08:00
minggo
bcf61cdf26
issue #1405:use enum to distinguish target
2012-08-16 10:21:15 +08:00
minggo
4a97f52cd4
issue 1405:implement CCFileUtils::getResourceDirectory() on iOS
2012-08-15 16:03:55 +08:00
James Chen
0fce637ec7
issue #1429 : First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
2012-08-15 14:33:56 +08:00
mustime
0933a032e9
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284
2012-08-14 09:41:18 +08:00
mustime
89f0508043
issue #1284 : add detection for I9100 model
2012-08-13 17:14:33 +08:00
Walzer
d99b7463b7
Merge pull request #1172 from walzer/gles20
...
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 08:34:58 -07:00
Walzer
9681c8d690
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 23:31:51 +08:00
Walzer
e964e861f2
Merge pull request #1162 from tongpengfei/gles20
...
fixed linux FontTest vertical alignment
2012-08-11 07:32:32 -07:00
Walzer
a77a4eac03
add more details in doxygen comments.
2012-08-10 13:58:34 +08:00
James Chen
ba78ac7d6d
issue #1405 : Remove unused method 'CCEGLView::getFrameSize' for ios port.
2012-08-09 18:28:49 +08:00
James Chen
03c2366821
Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-09 17:50:39 +08:00
James Chen
6e2cace72d
Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res
2012-08-09 17:19:20 +08:00