ed68855e19
fixed #1009 : fix a typo error
2012-03-06 09:35:36 +08:00
fd9dd6c7fe
add stringWithContentsOfFile static method in CCString class.
2012-03-05 11:13:45 +08:00
cb1f94df47
revert CCFileUtils::getFileData method.
2012-03-05 09:55:50 +08:00
347a8294ac
fixed #1007 : Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
2012-03-03 12:24:02 +08:00
796ba89e9d
Merge pull request #742 from minggo/iss762_label_position
...
compute correct text rect and display it on center
2012-03-01 22:24:04 -08:00
2360a9a04e
fixed #762 : let zfont display on center
2012-03-02 14:22:01 +08:00
5485eb19d9
fixed #762 : compute correct text rect and display it on center
2012-03-02 14:17:22 +08:00
79495fd743
Merge pull request #741 from minggo/master
...
remove libiconv.a
2012-03-01 19:28:35 -08:00
c196f2dff2
issue #983 : remove libiconv.a
2012-03-02 11:25:35 +08:00
528a769cf6
fixed #762 : make label display on center on iOS
2012-03-02 11:15:44 +08:00
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
6c01009a18
fixed #986 : Add init() member funciton of CCMenu class.
2012-02-29 10:07:18 +08:00
05bf647ec3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib
2012-02-28 15:00:18 +08:00
7daeb5cd86
fixed #984 : Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.
2012-02-28 14:59:46 +08:00
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +08:00
2bc48219f8
remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.
2012-02-27 18:18:40 +08:00
be66bec269
Merge pull request #727 from minggo/iss946_retina
...
fixed #946 : HD image for both retina and normal
2012-02-27 00:10:17 -08:00
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
fd9445f6df
add commet for CCArray
2012-02-23 10:06:36 +08:00
7fcdb3b114
Added CCEGLView::EventHandler class for qnx-platform
2012-02-22 12:27:13 +04:00
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +08:00
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
abbda72b2f
modify bada 2.0 project setting
2012-02-14 23:31:37 +08:00
dac63dd2c2
rename include file name from uppercase to lowercase for linux platform
2012-02-14 22:41:33 +08:00
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
4f523bf986
remove .settings folder
2012-02-14 18:06:29 +08:00
f8ff388e8d
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
...
test ok on win32 and android
2012-02-14 18:04:56 +08:00
e3e016331c
issue #972 : move extensions folder to cocos2dx
2012-02-14 16:08:12 +08:00
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
0adca5774c
move CCNotificationCenter to extensions folder
2012-02-14 11:45:59 +08:00
65b1b20c8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
...
Conflicts:
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
tests/test.win32/test.win32.vcxproj.filters
2012-02-14 11:43:04 +08:00
c98dd0cf2d
fixed #948 : remove getIndexOfObject()
2012-02-14 10:49:53 +08:00
538adcec3e
merge code from duleface
2012-02-10 13:56:20 +08:00
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
1d6d966717
fix CCScriptEngineManager::purgeSharedManager()
2012-02-09 20:07:55 +08:00
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
e74b842a58
update HelloLua
2012-02-09 17:48:15 +08:00
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
ca94a11190
fixed #951 : removed definition of NSMutableSet.
2012-02-07 15:35:10 +08:00
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
1e807d00c3
fixed #967 : fixed PVR Textures can not be reloaded after GL context lost on android.
2012-02-07 11:18:39 +08:00
8770976884
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
2012-02-07 10:48:07 +08:00
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
ffc4457991
On Win32 platform, there's now support for simulating the Accelerometer
...
using the up/down/left/right/comma/period keys.
2012-02-06 11:29:28 +00:00
babbd64f0d
Merge pull request #691 from winbinar/master
...
fixed #626 : Fix bug #626
2012-02-05 23:00:31 -08:00
4fe0c10e10
merge upstream/master
2012-02-06 10:54:51 +08:00
f5b8aa79c5
Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 16:49:47 +04:00
69a7e2a2e3
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
2012-02-04 11:34:17 +08:00
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
3eeb0c8687
fix library name - the makefiles expect the full name of the library including the lib prefix
2012-02-02 23:01:50 -08:00
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
516c56a793
Add EXPORT_C_INCLUDES and correct the paths to third party modules
2012-02-02 20:04:29 -08:00
f6d6d0dd49
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 17:46:45 +08:00
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
c78bf39601
Member variable added to keep the current window active status
2012-01-31 22:55:44 -08:00
acdd00f03b
Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application
2012-01-31 21:38:44 -08:00
e8f9c5f675
merging the original update
2012-01-31 20:06:39 -08:00
64c892de79
Merge pull request #697 from dducharme/dalebranch
...
fixed #962 : Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-31 18:44:09 -08:00
edaf2cf269
fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon
2012-01-31 09:57:58 +00:00
38cd599bdc
Functionality to detect when the application goes to the background and return from it
2012-01-31 00:25:09 -08:00
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00
32e4cc1af2
Updating the following:
...
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
a909be3264
remove selector_protocol.h for vs2010 project
2012-01-30 18:27:03 +08:00
c6ec949950
remove some functions in CCObject
2012-01-30 16:07:01 +08:00
6eb65442d4
remove some logs
2012-01-30 15:46:56 +08:00
f44b38eaf8
fixed #958 : move the implement of SelectorProtocol to CCObject
2012-01-30 15:31:59 +08:00
231446a8a5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:49 +02:00
910ded54c5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:19 +02:00
b0b5790e06
Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7.
...
* Uses NDK modules as the basis of the build system for Android NDK
* Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
* The dependencies of this module are also Android NDK modules
* ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
* Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
2012-01-29 09:52:38 -08:00
e6fddbc047
Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs.
2012-01-29 09:33:17 -08:00
fe79a2c5d2
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-28 10:54:31 +01:00
49b57569c9
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-28 14:38:44 +08:00
a9d7500ae7
Fix whitespace line ending in one single line.
2012-01-25 18:14:29 -08:00
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
f8dafe6712
* add CCNode::getChildrenCount()
2012-01-21 01:29:41 +08:00
b79828a697
* merge lua fix
2012-01-21 00:47:51 +08:00
9660bcd165
* merge upstream/master to master
2012-01-20 19:08:21 +08:00
57eee38f4e
Merge branch 'master' into moveSel2CCObject
2012-01-19 15:46:31 +08:00
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
543d96a73f
issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:02:39 +08:00
b400570265
Workaround for issue #635 . Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator
2012-01-17 10:57:31 +01:00
cea250a962
restore original CCCopying as the parent class of CCObject
2012-01-17 10:54:21 +08:00
aa4fae3980
restore original CCCopying as the parent class of CCObject
2012-01-17 10:00:22 +08:00
ea0fb47f98
Merge branch 'master' into moveSel2CCObject
2012-01-17 09:37:31 +08:00
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
d3642be42d
Merge pull request #677 from dumganhar/modify_linux_port
...
modify eclipse project setting for linux port
2012-01-12 04:00:02 -08:00
bd5ff14e45
Merge branch 'test' of https://github.com/minggo/cocos2d-x into test
2012-01-12 19:30:46 +08:00
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
cfe02e39ef
Broken include guard in CCActionEase.h
2012-01-12 17:06:46 +08:00
75216ac9ca
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 16:54:14 +08:00
57801eb0a0
modify version
2012-01-11 15:17:16 +08:00
ffeed3827a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into moveSel2CCObject
...
Conflicts:
cocos2dx/platform/CCPlatformMacros.h
2012-01-09 23:23:45 +08:00
d61f87ba92
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
2012-01-09 23:21:31 +08:00
0ee582e887
fixed #917 : add header files to resolve compiling errors
2012-01-09 17:36:57 +08:00
b1aee8f9eb
Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils
2012-01-09 17:12:46 +08:00
4cc1658d45
fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash.
2012-01-09 14:15:49 +08:00
259aaf42a6
Fixed: get extension function from eglGetProcAddress on bada platform
2012-01-09 14:15:18 +08:00
30a02030b0
make the property function to virtual
2012-01-09 11:07:45 +08:00
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +08:00
2f1c313d12
Merge pull request #658 from gzito/master
...
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
2012-01-04 22:09:22 -08:00
65ddb88000
Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version)
2012-01-04 23:34:48 +01:00
4bffaaf9cb
fixed #936 : check whether selector is valid
2012-01-04 10:58:20 +08:00
c6da8d2fbd
call correct java method
2012-01-04 10:14:46 +08:00
2acea5f7af
libxml2.mkf for both Windows and Mac Marmalade versions
2012-01-03 00:39:31 +01:00
083d0015a3
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-02 22:32:29 +01:00
4010733c20
fixed #927 : To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value.
2011-12-31 17:44:45 +08:00
f776ecc7e0
Merge pull request #650 from dumganhar/issue#934_add_isEqual
...
Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-30 18:18:39 -08:00
8c65786dce
fixed #934 : Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-31 10:10:41 +08:00
53fae04ba8
fixed #752 : make add/remove touch delegate in menu callback function correctly
2011-12-30 15:43:36 +08:00
20b6257198
fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();'
2011-12-29 16:00:36 +08:00
025258d21d
fixed #928 : save pixelformat for each texture, restore the pixelformat after entering foreground
2011-12-29 15:05:38 +08:00
fcb2294e20
fixed #926 : subclass should retain/release when dynamic_cast fail.
2011-12-28 14:47:54 +08:00
37915cfed6
remove unneeded function, and make protocol an abstract class
2011-12-28 14:46:49 +08:00
28562c3fb9
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2011-12-27 16:14:19 +01:00
bbad5a4392
* merge upstream/master to master
2011-12-25 11:48:03 +08:00
a09bebb32b
fixed #903 : 1.pass 'id' parameter to setTouchInfo function;
...
2.when double press happens, deal with it as single press.
2011-12-23 20:33:42 +08:00
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
12237cf288
fixed #911 : add some comment
2011-12-22 16:29:25 +08:00
7422a424da
fixed #911 : make CCTextureCache::addUIImage() work ok when key is null
2011-12-22 16:26:56 +08:00
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
a0fe048f11
fixed #923 : cache texture with correct image type
2011-12-22 10:48:54 +08:00
21f05c2d6f
issue #903 : fix a compiling error
2011-12-22 09:56:09 +08:00
bb4b1d02bb
Merge pull request #608 from GMTDev/patch-2
...
issue #903 : Update CCTouch to include the ID/PID of the touch
2011-12-20 21:48:30 -08:00
36f8e43dd8
Update cocos2dx/include/CCTouch.h
2011-12-20 20:40:48 -08:00
a39be9506f
Defines documentation to avoid warning in Marmalade
2011-12-20 22:34:23 +01:00
d37417f7da
Re-added libXml2
2011-12-20 22:10:01 +01:00
298f12e7a3
Removed libxml2 (precompiled version)
2011-12-20 22:05:01 +01:00
01cf5793ad
fixed #922 : rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
2011-12-20 14:59:15 +08:00
28d0737bf3
fixed #917 : implement CCFileUtils::getFileDataFromZip() on iOS
2011-12-20 14:18:53 +08:00
a8d5b6544a
Merge pull request #629 from gzito/master
...
Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.
2011-12-19 18:46:07 -08:00
faa8b59b6d
fixed #920 : export functions in CCAffineTransform
2011-12-20 10:39:10 +08:00
59bccb6bf8
Added last loaded font caching & minor fixes
2011-12-19 23:08:35 +01:00
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
e389ae5469
Optimized CCImage and fixed alpha value
2011-12-19 22:56:44 +01:00
318a4c5ba8
merge upstream/master to master
2011-12-17 12:02:24 +08:00
2f63d6a158
Merge pull request #624 from dumganhar/issue#918
...
fixed #918 : modify filter of airplay to marmalade.
2011-12-15 19:11:49 -08:00
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
ffe8890498
Merge pull request #621 from minggo/iss892_RTTI
...
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 18:52:46 -08:00
8298e0b6ff
Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611
...
Conflicts:
tests/test.marmalade/test.mkb
2011-12-15 13:03:07 +08:00
f3b7b519fc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619
2011-12-15 11:38:15 +08:00
265558d9c7
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
2011-12-15 11:36:42 +08:00
15fca8b4b4
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 10:26:31 +08:00
8813d94257
Merge pull request #617 from minggo/issue906
...
remove unneeded code in CCImage_android.cpp
2011-12-14 18:08:24 -08:00
00e504356a
Fixing Warning on CLang 3.0 on XCode 4.2
2011-12-15 01:46:55 +08:00
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
7f7ef29b21
Fixes on QNX project accidentally including marmalade
2011-12-14 16:50:26 +08:00
625d299717
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
2011-12-13 10:01:29 +08:00
d4ea6d4ef5
Rollback changes about CCDirector::sharedInstance as pointer
...
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
2011-12-12 14:50:35 +01:00
4b9cbb85ff
#issue 908: Merge marmalade to latest cocos2d-x source
...
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
ba462e99a6
fixed #906 : remove unneeded code in CCImage_android.cpp
2011-12-12 17:02:21 +08:00
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dea2713f51
fixed #907 : add blackberry port
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-12 11:49:49 +08:00
95b43ac563
Merge pull request #614 from minggo/issue892_RTTI
...
Use RTTI to simplify codes
2011-12-11 19:40:34 -08:00
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
b1cdb6543d
Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language
...
Added tests for Marmalade and enabled language and font testing
2011-12-11 17:18:01 -08:00
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
f3b662a5a8
marmalade updates
2011-12-10 22:29:39 -08:00
dc6476ebe0
marmalade updates
2011-12-10 21:54:07 -08:00
9fc2061c6b
mamarlade updates
2011-12-10 21:20:15 -08:00
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
2be5240a5d
Fixed CCFileUtils::getWriteblePath on Marmalade
2011-12-10 16:34:54 +01:00
f27f9180ff
Merge remote-tracking branch 'remotes/styck/master'
2011-12-10 11:10:59 +01:00
287f480c97
Added initWithString (TTF) and jpeg support
2011-12-09 22:05:12 +01:00
af29be2d26
Shared instance is now a pointer instead of a static instance. Also the CCEGLView::release notifies application about quit
2011-12-09 22:04:35 +01:00
362a82f41c
mainloop modified to handle correctly quit requests
2011-12-09 22:03:38 +01:00
c17d7de0a1
For CC_PLATFORM_MARMALADE used pointers instead of static instances for singletons
2011-12-09 22:02:19 +01:00
5584039f47
libFreeType and libJpeg for Marmalade
2011-12-09 21:58:32 +01:00
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
6d2a298035
Merge branch 'bbf' into blackberry
2011-12-09 15:58:16 +08:00
5dea9b8205
fix a crash bug in SimpleAudioEngine.cpp
...
update helloworld and tests main.cpp and AppDelegate.cpp files
2011-12-09 15:54:35 +08:00
34759f4411
Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.
2011-12-08 20:47:42 -08:00
7350fa9bb5
Updated based on G.Zito feedback
2011-12-08 19:51:19 -08:00
190fbb60a7
Merge branch 'Forf_2' into bbf
2011-12-09 10:39:27 +08:00
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
0a7a000c2d
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:21:48 +01:00
0c1b058629
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:16:32 +01:00
b11bcacea8
modify Device-Debug project setting, finished running on device!
2011-12-08 18:22:06 +08:00
1eb8ba656e
Added marmalade folder
2011-12-08 11:15:20 +01:00
7b0cb1bc8b
Accelerometer stuff
2011-12-08 10:48:03 +01:00
e077107575
Used CONSTANT definitions for touch
2011-12-08 09:30:18 +01:00
b3ecaedfeb
Merge branch 'refs/heads/luafix-0.10.0'
2011-12-08 15:47:28 +08:00
d49456cbd1
* merge upstream/master to master
2011-12-08 15:47:20 +08:00
7e170c7517
* add LUA_ENGINE_DEBUG & LUALOG macro
2011-12-08 15:44:13 +08:00
8b4b802839
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-08 08:41:16 +01:00
3d86583818
Update cocos2dx/platform/android/jni/TouchesJni.cpp
2011-12-07 20:25:51 -08:00
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
b60eac2505
integrating libXml2
2011-12-07 23:49:52 +01:00
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
2c94bcc075
add some files for qnx
2011-12-07 16:22:40 +08:00
3bf11dba7e
issue #892 : modify pkg for lua
2011-12-07 15:24:03 +08:00
cdc842051f
issue #892 : use RTTI to simplify codes, work ok on win32
2011-12-07 14:28:22 +08:00
6ab60118af
Update cocos2dx/include/CCTouch.h
2011-12-06 20:31:40 -08:00
190891bab7
Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751
...
Files Modified: Eagleview.mm, CCTouch.h
2011-12-06 20:06:38 -08:00
96d400d918
Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2
...
Refactored Accelerometer to match other platforms
Updated SimpleAudioEngine.cpp with new functions. (NOT tested).
Updated app.icf for latest Marmalade
Update deprecated function calls.
Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
2011-12-06 18:32:36 -08:00
97967ffcb3
Specific classes for Marmalade platform
2011-12-07 00:08:04 +01:00
6d7baa9684
add platform files for qnx
2011-12-06 17:19:36 +08:00
bfdb908d01
add Cocos2dx project
...
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +08:00
70d5a088f1
fixed #887 , define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7
2011-12-04 20:18:17 +08:00
442e06e62e
* add CCNode:getPositionLua(), return CCPoint
2011-12-04 11:35:55 +08:00
cf12806558
merge luafix-0.9.2
2011-12-01 22:02:16 +08:00
f860edc744
Merge remote-tracking branch 'refs/remotes/upstream/master'
2011-12-01 22:00:21 +08:00
f0e80b32f4
fixed #854 : cache texture on android
2011-12-01 17:04:56 +08:00
2d9e8f065b
* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()
2011-12-01 14:58:39 +08:00
f3e654056c
* fix merge error 2
2011-11-30 21:50:00 +08:00
25f1cf16fd
* fix merge error 1
2011-11-30 21:47:23 +08:00
45fe3b3090
* merge luafix-0.9.2
2011-11-30 21:42:18 +08:00
216ad9b9cb
* merge upstream/master to master
2011-11-30 21:38:20 +08:00
a680ba4a8a
* CCTouch:locationInView() & CCTouch:previousLocationInView() return const reference
2011-11-30 21:29:57 +08:00
31285fea17
* add Touch & MultiTouches lua support
2011-11-30 21:27:50 +08:00
a5f389894a
Merge pull request #593 from minggo/box2d
...
change version and support android 4.0
2011-11-29 23:34:33 -08:00
4607ba8029
support for android 4.0
2011-11-30 15:30:11 +08:00
445982a252
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-30 09:35:15 +08:00
68297f0121
fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param.
2011-11-30 09:32:07 +08:00
3f97e7db44
fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp
2011-11-30 09:26:45 +08:00
4bf68e79fd
* merge upstream/master to master
2011-11-29 19:56:20 +08:00
ebd381af26
* merge luafix-0.9.2 to master
2011-11-29 19:20:49 +08:00
9070248d17
* [fix] MenuItem::activate() not call script function with tag value
2011-11-29 17:40:18 +08:00
adfec68577
fixed #850 : update Box2d for linux
2011-11-29 17:12:21 +08:00
90ae1aabc7
* add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler()
2011-11-29 17:10:58 +08:00
6117e15354
* [fix] CCFileUtils::getDoubleResolutionImage() not display HD file path.
2011-11-29 15:52:13 +08:00
0739c1f262
* rename LuaEngine to CCLuaEngine
...
* add #if LUA_ENGINE
* format source files
2011-11-29 15:42:12 +08:00
31b47c3fc6
* remove needless code
2011-11-29 12:38:28 +08:00
0fff92236f
add f project
2011-11-29 12:38:20 +08:00
f1351610d8
* merge CCLuaSupport to CCLuaEngine
2011-11-29 12:35:48 +08:00
266f0ee7ab
Merge pull request #586 from leon-li/master
...
Fix some minor bugs.
2011-11-28 18:27:38 -08:00
f108952595
Merge remote branch 'upstream/master'
...
Conflicts:
cocos2dx/support/CCPointExtension.cpp
2011-11-29 10:15:15 +08:00
d108f4f456
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-28 23:13:02 +08:00
3442d17dbe
fixed #880 : implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
2011-11-28 18:05:38 +08:00
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
112ec42670
fixed #854 : support bada pthread and semaphore
2011-11-28 16:07:17 +08:00
cad4ff05f3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2011-11-28 15:43:13 +08:00
31ea76c16a
remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project
2011-11-28 14:33:29 +08:00
20455bf164
fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly.
2011-11-28 14:27:48 +08:00
8fd6a7298f
issue #854 : fix warning
2011-11-28 10:12:31 +08:00
6f99f7efde
1. fix multi touch index.
...
2. swap.
3. create gl view.
2011-11-26 22:37:36 +08:00
ab7db20809
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
2011-11-26 17:20:12 +08:00
8edbbd56a9
Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself.
2011-11-26 17:07:36 +08:00
842c64486e
issue #854 : remove unneeded code
2011-11-25 16:16:37 +08:00
77b830b36b
issue #854 : use semaphore instead of condition because the condition may lose message
2011-11-25 16:14:06 +08:00
331dac34de
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/include/CCDirector.h
2011-11-25 11:06:20 +08:00
d94effbcfa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-25 10:56:44 +08:00
7e61ce7d67
issue #781 : add audio functions on linux
2011-11-25 10:48:05 +08:00
837e5048d2
Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion
2011-11-25 10:19:29 +08:00
c034f84b2d
fixed #760 : implement functions in .cpp
2011-11-25 10:17:32 +08:00
101f076a44
fixed #760 : implement functions in .cpp
2011-11-25 10:13:59 +08:00
f5bbad5833
issue #854 : implement CCImage::initWithImageFileThreadSafe for iOS
2011-11-25 10:09:29 +08:00
79e204abad
add semaphore support on bada
2011-11-25 10:06:26 +08:00
c138d7e258
update CCAccelerometer on bada platform
2011-11-24 18:04:25 +08:00
e87b00db67
add pthread support for bada 1.0
2011-11-24 17:26:04 +08:00
aeb56495a6
add user truetype font support, fix a bug in CCTextureCache.cpp
2011-11-24 15:15:23 +08:00
07da67f253
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/menu_nodes/CCMenu.cpp
2011-11-24 11:52:16 +08:00
4612e6e1d6
update pthread.cpp
2011-11-24 11:37:59 +08:00
42775d4ec5
update pthread implement
2011-11-24 10:58:09 +08:00
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
cfa42fa8a1
Merge branch 'newest' into master_base
2011-11-23 21:47:21 +08:00
035d7326db
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-23 21:43:40 +08:00
15e3a6b1cf
update CCFileUtils_bada.cpp and CCImage_bada.cpp
2011-11-23 18:40:36 +08:00
c3a034a19b
fixed #760 : add functions to get/add m_pNotificationNode
2011-11-23 17:18:53 +08:00
6aedc258b4
fixed #838 : tests and HelloLua support x86
2011-11-23 15:51:30 +08:00
a8240abbe2
* revert CCFileUtils_ios.mm to 0.9.2
2011-11-23 13:48:15 +08:00
4ff2bf96d1
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
2011-11-23 13:41:48 +08:00
01c8f5f47e
* CCFileUtils_ios dump error message to console
2011-11-23 13:36:32 +08:00
8b20639d75
issue #838 : HelloWorld support x86
2011-11-23 11:02:18 +08:00
151b373239
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
2011-11-23 00:58:31 +08:00
bc60ed7856
issue #854 : optimize CCTextureCache::addImageAsync()
2011-11-22 16:47:24 +08:00
43226d190f
* CCFileUtils_ios dump error message to console
2011-11-21 18:50:45 +08:00
a1f8433a47
* fix merge error 4
2011-11-21 18:50:19 +08:00
611e09fe2f
* fix merge error 3
2011-11-21 17:09:23 +08:00
27ce997e36
* fix merge error 2
2011-11-21 17:07:16 +08:00
012ce7a04f
* fix merge error 1
2011-11-21 17:00:56 +08:00
7a6253d9aa
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
2011-11-21 16:38:00 +08:00
efa9275d7f
save the codes for testing
2011-11-21 12:04:21 +08:00
b34859108e
* remove needless files
2011-11-21 11:58:55 +08:00
51eb56075b
Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread
2011-11-21 09:36:55 +08:00
4226fcf355
issue #854 : add CCThread_ios.mm
2011-11-21 09:34:49 +08:00
4944d5ced8
* remove needless warning
2011-11-20 21:12:24 +08:00
57bf9453b7
* add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class
...
* move CCTimer from CCScheduler.cpp/.h to CCTimer.cpp/.h
2011-11-20 16:38:27 +08:00
09d12be875
* format cocos2d-x source files
2011-11-18 21:23:54 +08:00
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
50a2e2d5e9
Merge pull request #574 from minggo/iss854_pthread
...
remove unneeded files
2011-11-17 18:59:03 -08:00
5d8043ce7e
issue854: remove unneeded files
2011-11-18 10:54:36 +08:00
a7d6c90adb
Merge pull request #571 from jbyu/master
...
fix memory-leak for lua engine
2011-11-17 18:53:14 -08:00
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
81b8fc0ce8
fixed #854 : fix a bug of CCTextureCache
2011-11-17 14:34:41 +08:00
cb75465913
issue #854 : add test case for CCTextureCache
2011-11-17 10:10:13 +08:00
dccf577ad3
getLastValidIterator() may return a invalid iterator m_array.end().
...
don't know where this code came from.
2011-11-16 11:08:26 +08:00
cc79e533a3
issue #854 : add pthread for win32 and implement CCTextureCache::addImageAsync()
2011-11-16 11:04:29 +08:00
786feb6a8d
Merge remote-tracking branch 'remotes/upstream/master'
...
Conflicts:
HelloLua/Classes/AppDelegate.cpp
HelloLua/Resource/hello.lua
HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
HelloLua/win32/HelloLua.win32.vcproj
HelloLua/win32/HelloLua.win32.vcxproj.filters
cocos2dx/include/ccMacros.h
cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
lua/cocos2dx_support/LuaCocos2d.cpp
lua/cocos2dx_support/LuaEngineImpl.cpp
template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
tests/test.win32/test.win32.vcxproj.filters
2011-11-15 14:43:55 +08:00
441f8e6da9
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
...
Conflicts:
cocos2dx/CCScheduler.cpp
lua/cocos2dx_support/LuaEngine.cpp
lua/cocos2dx_support/LuaEngine.h
2011-11-15 14:00:52 +08:00
5273819e83
offer a thread safe function to read contents of xml file, and the engine use it internal
2011-11-15 10:41:18 +08:00
0fa48e2cfb
Update cocos2dx/platform/CCPlatformMacros.h
2011-11-14 11:35:04 +08:00
7cb27a76ae
modify accelerometer and Platform Functions
2011-11-13 22:45:41 +08:00
d346fa8650
close debug draw
2011-11-13 01:22:05 +08:00
d8de253542
add messagebox support
2011-11-13 01:13:25 +08:00
5704fdc146
Merge branch 'testMP_static_lib' into newest
2011-11-13 01:05:22 +08:00
25ab866557
when CCTextureAtlas::resizeCapacity, should
...
glDeleteBuffers(2, m_pBuffersVBO);
// initial binding
glGenBuffers(2, &m_pBuffersVBO[0]);
otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.
2011-11-13 00:57:05 +08:00
ea3b57ea2c
modify multi touch support
2011-11-13 00:54:44 +08:00
8fd2917888
fixed a bug that Accelerometer value error if use HVGA resource in WVGA device
2011-11-13 00:54:05 +08:00
2abe0c0d32
CCAssert will show system messagebox, this easy for debuging code.
2011-11-10 16:49:05 +08:00
4e924986a2
add static lib project
2011-11-10 16:47:17 +08:00
ca3b91855a
debug issue #852
2011-11-10 16:44:58 +08:00
dcb4f14a5b
According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177 , we must prevent yOffset to become a negative value. I use the laziest approach.
2011-11-09 22:11:36 +08:00
33db1c7951
use unix text format
2011-11-08 18:11:43 +08:00
a81b078286
fixed a bug in calloc(0) return NULL.
2011-11-08 15:59:51 +08:00
920b41271d
add TextInput support
2011-11-08 15:59:04 +08:00
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
7d2a26ec10
comment some applog
2011-11-07 00:28:09 +08:00
16fba505b6
add multitouch support
2011-11-05 11:36:27 +08:00
2998726364
revert language
2011-11-02 01:23:07 +08:00
240aa4c077
add russian language support
2011-11-01 23:32:26 +08:00
cf3cecc108
revert to normal version
2011-11-01 23:02:26 +08:00
cff6437b76
revert to normal ccLanguageType
2011-11-01 17:12:39 +08:00
785b79d263
fix compile errors under ubuntu 11.10
2011-10-31 23:50:08 -07:00
f43530c010
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
...
Conflicts:
CocosDenshion/proj.bada/sdk1.0/.cproject
CocosDenshion/proj.bada/sdk2.0/.cproject
cocos2dx/platform/bada/CCApplication_bada.cpp
2011-10-31 09:34:40 +08:00
853126036d
add ogg source for cocosDenshion project
2011-10-29 15:38:15 +08:00
fd90641c49
merge testf branch
2011-10-29 14:47:13 +08:00
b7f0385a2b
bundle 64 bit linux static libs
2011-10-28 12:19:26 +08:00
1b42b1d801
Merge remote branch 'upstream/master'
2011-10-28 11:37:02 +08:00
2c14402107
fixed #776 : merge pull request and remove unneeded codes
2011-10-28 09:46:19 +08:00
d061e8323d
modify project configure
2011-10-27 19:22:14 +08:00
5db8a24389
fixed one issue in cocosdenshion
2011-10-26 18:38:27 +08:00
dd73456576
Merge branch 'bada' into f
2011-10-25 17:40:20 +08:00
146d3e1536
modify project config
2011-10-24 14:22:09 +08:00
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
e53649ccaa
add a member function to get key string of a texture.
2011-10-22 19:39:31 +08:00
5589335d3a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
2011-10-22 19:27:35 +08:00
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
eb901be664
project config change
2011-10-21 09:49:57 +08:00
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
5c4a3c3fda
Merge remote branch 'upstream/master'
2011-10-20 18:34:10 +08:00
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
67bbbb2800
1. relative to bug #754 , FontTest should use "fonts/abc.ttf" as external ttf name
...
2. fixed a tiny bug, FontTest can show font name on the top correctly
2011-10-20 14:56:39 +08:00
6451d8b6bf
use ceil to compute viewport
2011-10-20 13:44:21 +08:00
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
77b3a32e16
fix compile error on 64 bit Linux
2011-10-19 15:12:38 +08:00
ae411f9503
fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h
2011-10-18 17:41:19 +08:00
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
6af6257fa9
Merge branch 'testf1016' of github.com:dumganhar/cocos2d-x into FishGameBada
...
Conflicts:
CocosDenshion/bada/CCAudioOut.cpp
CocosDenshion/bada/CCAudioOut.h
2011-10-17 13:45:16 +08:00
064014aeae
make some special configure
2011-10-16 22:44:29 +08:00
ee53c29e5c
switch to 2.0 WVGA
2011-10-16 13:23:48 +08:00
1ffd3a4350
add language support
2011-10-14 15:54:18 +08:00
8dfa18efb9
commit some file for private use
2011-10-14 15:38:58 +08:00
47c9020b85
fixed #738 : caculate label height if not set
2011-10-14 14:33:08 +08:00
3f89f3088b
remove mouse test log
2011-10-14 09:21:03 +08:00
fd3f496b76
use system orientation
2011-10-13 11:55:48 +08:00
2b2405e2dc
fixed #750 : add comment
2011-10-13 10:56:02 +08:00
aaa16b4a4f
fixed #750 : change the key to full path, because retrieve it use full path
2011-10-13 10:54:22 +08:00
5feee662e7
More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration .
...
Added support for detect russian language.
2011-10-12 09:32:59 +04:00
0283a4b254
Added dll-export macro to CCSaxParser declaration
2011-10-11 22:44:18 +04:00
64388023f6
Merge branch 'master' into bada
2011-10-10 13:47:16 +08:00
f162a5fcaa
add m_pAccelDelegate != NULL to avoid crash
2011-10-10 10:24:52 +08:00
eb9cb31ca4
use shared lib for cocos2dx project
2011-10-09 18:15:31 +08:00
9695b6df86
fixed #745 : export CCTime to dll
2011-10-09 10:19:12 +08:00
2f00b8ff1c
update to sdk2.0.2
2011-10-09 01:11:33 +08:00
fdea17b4f9
don't use DeviceOrientation, save orientation before running DirectorTest
2011-10-08 18:17:01 +08:00
f97de356e7
add release version
2011-10-08 11:47:32 +08:00
ba2f2fbc8b
Merge https://github.com/reflog/cocos2d-x into reflog
2011-10-08 11:28:16 +08:00
d23b044782
fill for polygon drawing
2011-10-05 10:50:00 +02:00
beaa489406
add scale support
2011-09-30 17:19:16 +08:00
1830b4e2e9
add default file path = /Res
2011-09-30 10:02:37 +08:00
1b5365282a
add accelerometer support
2011-09-29 18:12:08 +08:00
9ff00c7c83
use utf-8 for displaying chinese
...
remove Gbk_Unicode.c Gbk_Unicode.h
2011-09-29 17:29:38 +08:00
d6049846bb
Merge branch 'master' into bada
2011-09-29 16:18:47 +08:00
33c7caf555
Merge pull request #535 from minggo/master
...
fixed a assert error
2011-09-29 01:13:49 -07:00
a56034f177
fixed a assert error
2011-09-29 16:07:18 +08:00
db4d51496e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
...
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
2011-09-29 16:03:37 +08:00
bd2266fe4c
use timer as gameloop, can change FPS by using setAnimationInterval
...
modify some project setting
2011-09-29 15:52:16 +08:00
333e08330b
make create-linux-android-project.sh works ok
2011-09-29 00:49:49 -07:00
cda492593c
modify gameloop method
...
modify some project setting
2011-09-29 02:32:01 +08:00
de545096de
modify bada project setting
2011-09-28 18:21:17 +08:00
4ad422defd
make tests run ok on linux android
2011-09-27 20:36:21 -07:00
56eb3060ee
uiimage to uiImage
2011-09-28 09:49:57 +08:00
800940dd82
fixed some bug in bada port
2011-09-28 09:49:18 +08:00
1a8c6b06c7
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:15:50 +08:00
a54ab3c293
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:09:14 +08:00
cd18394b09
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:06:11 +08:00
d4283b1f11
Merge branch 'linux_port'
2011-09-27 17:01:51 +08:00
294c796e55
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:00:13 +08:00
4f7e349c0a
set HelloWorld dependence and make it run ok on android emulator
2011-09-26 22:38:59 -07:00
6cf5592499
modify Gbk_Unicode.c
2011-09-26 17:50:31 +08:00
c78a4cb485
modify cocos2dx project setting for bada
2011-09-26 17:50:05 +08:00
13b091fb15
modify CCImage, make text being showed correctly
2011-09-26 15:40:56 +08:00
0f7a15b1b3
recommit
...
modify eclipse project config
delete libs and use the folder eclipse generated instead.
2011-09-23 09:56:30 +08:00
267cce29a9
Added testing ability for case when application enters background and returns in foreground on windows platform.
...
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().
Also break; forgotten in WM_KEYDOWN.
2011-09-22 13:11:51 +04:00
0ad5ec3557
fixed typo for win32 keypad testing ability
2011-09-22 10:27:10 +04:00
5537ba7e9e
Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing
2011-09-21 16:21:11 +04:00
1cac9520cc
make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion
2011-09-21 02:27:42 -07:00
eeb0956fb8
add linux makefiles
2011-09-20 14:38:12 +08:00
762e342b4d
fixed #727 : invoke DeleteLocalRef() to resolve memory leak
2011-09-20 14:25:16 +08:00
c93be8b828
modify <cstdio> to <stdio.h>
...
delete old project files
2011-09-20 12:39:44 +08:00
eb32cf9fe2
modify some files of bada project
2011-09-20 02:19:26 +08:00
81243eecdf
modify libpng version to 1.4.5
...
modify libjpeg txt mode to windows \r\n style
2011-09-20 02:17:44 +08:00
8ad2125139
add source code of libjpeg ,libpng ,zlib for bada
2011-09-20 02:16:20 +08:00
ca2027fbad
modify bada project
2011-09-19 23:35:46 +08:00
edb2cbbad6
modify bada project files
2011-09-19 18:17:19 +08:00
0e7fc78e4e
commit some files of bada project
2011-09-19 18:05:40 +08:00
c94adc58b9
changed bada projects directory, add bada macro
2011-09-19 17:53:45 +08:00
3c795073e0
Merge branch 'master' into bada
...
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
2011-09-19 13:42:08 +08:00
eadaba8930
modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp
...
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
2011-09-19 10:51:05 +08:00
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
d016f05f92
use relative path instead of the workspace_loc
2011-09-15 18:24:41 +08:00
61f2ab3cf2
fixed #718 : fixed a typo error
2011-09-15 13:49:04 +08:00
dcc5726665
Merge pull request #504 from minggo/iss715
...
fixed #715 : make sure selected image is valid
2011-09-12 23:34:27 -07:00
bdb7cfdd71
fixed #715 : make sure selected image is valid
2011-09-13 14:29:15 +08:00
d763cc3884
Merge pull request #503 from minggo/master
...
fixed #709 : write doxygen comment in CCSet.h
2011-09-12 23:23:21 -07:00
e2315d92b5
fixed #709 : write doxygen comment in CCSet.h
2011-09-13 09:31:54 +08:00
8082b91c0e
fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730
2011-09-10 08:48:15 +08:00
8f5c327937
add all eclipse project files to the corresponding directory
2011-09-07 12:44:03 +08:00
310e79a491
delete the project configurations in base folder
2011-09-07 12:41:39 +08:00
ae056a07b1
Merge pull request #502 from minggo/iss686
...
fixed #686 : set z tag of appended tile
2011-09-05 23:52:00 -07:00
e2bb1d49e5
fixed #686 : set z tag of appended tile
2011-09-06 14:01:08 +08:00
8ccc3321a3
Merge pull request #500 from flyingpacer/renderendcrash
...
Renderendcrash
2011-09-05 20:52:50 -07:00
53227073a7
fixed #696 to modify some end() usilization
2011-09-06 11:43:09 +08:00
fea3da3156
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
2011-09-06 11:33:48 +08:00
e69d16e7d6
change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable
2011-09-06 10:52:37 +08:00
624e27497a
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
2011-09-06 09:51:35 +08:00
91f8ed7eb4
CCParticleSystemPoint now derive from CCParticleSystemQuade in linux
2011-09-05 11:57:10 +08:00
717698bf65
fix some compiling mistake
2011-09-05 10:12:14 +08:00
1fc09448a4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
...
Conflicts:
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
018036eb28
Merge pull request #498 from minggo/iss703
...
fixed #703 : refactor Accelerometer
2011-08-31 18:30:22 -07:00
f61fde764b
fixed #703 : refactor Accelerometer
2011-08-31 17:14:29 +08:00
1402350870
fixed #676 , add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet.
2011-08-31 14:20:33 +08:00
dd90e8ce86
issue #702 add invalid point judgement
2011-08-30 16:40:57 +08:00
c8619240c4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702
2011-08-30 16:39:13 +08:00
ab2a6cb2bb
fixed #702 tests crashs at the start on wophone device
2011-08-30 15:59:06 +08:00
554e3fda52
fixed #701 , CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone
2011-08-30 15:26:17 +08:00
9f1e26f8a0
fixed #700 , a stupid typo in CC_SWAP32 marco
2011-08-30 15:20:41 +08:00
0cfbf4344a
fix a compiling error on wophone
2011-08-30 10:54:32 +08:00
414791a684
issue #675 : initialize acceleration_
2011-08-30 10:34:29 +08:00
92f741aa73
issue #675 : remove unneeded header file
2011-08-30 09:49:55 +08:00
c7fd375539
issue #675 : make wophone support only one accelerometer delegate
2011-08-30 09:45:11 +08:00
b38105a70b
issue 675: dispatch accelerometer data to one delegate
2011-08-29 18:18:39 +08:00
a411f4877c
fixed #698:Not invoke init() in the construction of CCSprite
2011-08-29 11:00:31 +08:00
a362d3131c
update debug and release makefiles again
2011-08-28 16:58:10 +08:00
c977f3e07c
commit debug and release makefile
2011-08-28 16:44:20 +08:00
e64bfd6c68
commit subdir.mk
...
delete all obsolete *.d and *.o files
2011-08-28 15:43:50 +08:00
1ac3fdebca
deleted: Box2D/Box2DConfig.cmake
...
deleted: Box2D/CMakeLists.txt
new file: CocosDenshion/.cproject
new file: CocosDenshion/.project
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidDebug/makefile
deleted: HelloCocos2dx/AndroidDebug/objects.mk
deleted: HelloCocos2dx/AndroidDebug/sources.mk
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidRelease/makefile
deleted: HelloCocos2dx/AndroidRelease/objects.mk
deleted: HelloCocos2dx/AndroidRelease/sources.mk
deleted: HelloCocos2dx/Classes/AppDelegate.cpp
deleted: HelloCocos2dx/Classes/AppDelegate.h
deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp
deleted: HelloCocos2dx/Classes/HelloWorldScene.h
deleted: HelloCocos2dx/Linux/main.cpp
deleted: HelloCocos2dx/Linux/main.h
deleted: HelloCocos2dx/Resource/CloseNormal.png
deleted: HelloCocos2dx/Resource/CloseSelected.png
deleted: HelloCocos2dx/Resource/HelloWorld.png
deleted: HelloCocos2dx/Resource/Icon.png
deleted: HelloCocos2dx/Resource/app.config.txt
deleted: HelloCocos2dx/android/AndroidManifest.xml
deleted: HelloCocos2dx/android/build.properties
deleted: HelloCocos2dx/android/build.xml
deleted: HelloCocos2dx/android/build_native.sh
deleted: HelloCocos2dx/android/default.properties
deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java
deleted: HelloCocos2dx/android/jni/helloworld/main.cpp
deleted: HelloCocos2dx/android/local.properties
deleted: HelloCocos2dx/android/proguard.cfg
deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png
deleted: HelloCocos2dx/android/res/layout/game_demo.xml
deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml
deleted: HelloCocos2dx/android/res/values/strings.xml
deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java
modified: HelloWorld/Classes/AppDelegate.cpp
deleted: HelloWorld/Linux/CloseNormal.png
deleted: HelloWorld/Linux/CloseSelected.png
deleted: HelloWorld/Linux/HelloWorld.png
deleted: HelloWorld/Linux/Icon.png
deleted: HelloWorld/Linux/Materhorn.ttf
deleted: HelloWorld/Linux/app.config.txt
deleted: HelloWorld/Linux/cocos2dx-hello
deleted: HelloWorld/Linux/libcocos2dx.so
modified: cocos2dx/.cproject
modified: lib/linux/Debug/libcocos2d.so
modified: lib/linux/Release/libcocos2d.so
modified: template/android/mycopy_files.sh
new file: tests/test.linux/.cproject
new file: tests/test.linux/.project
modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
2011-08-28 14:33:04 +08:00
e0fa5fdd78
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftconfig.h
...
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftheader.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftmodule.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftoption.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftstdlib.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/freetype.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftadvanc.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbbox.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbdf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbitmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbzip2.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcache.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftchapters.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrdef.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrors.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgasp.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftglyph.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgxval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgzip.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftimage.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftincrem.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlcdfil.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlist.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlzw.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmac.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmodapi.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmoderr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftotval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftoutln.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftpfr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftrender.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsizes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsnames.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftstroke.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsynth.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsystem.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttrigon.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttypes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftwinfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftxf86.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/autohint.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftcalc.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdebug.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdriver.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftgloadr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftmemory.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftobjs.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftpic.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftrfork.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftserv.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftstream.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/fttrace.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftvalid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/internal.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/psaux.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/pshints.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svbdf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svcid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgldict.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgxval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svkern.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svmm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svotval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpfr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpostnm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpscmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpsinfo.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svsfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttcmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svtteng.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttglyf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svwinfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svxf86nm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/sfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/t1types.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/tttypes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/t1tables.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttnameid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttables.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttags.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttunpat.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/ft2build.h
new file: cocos2dx/platform/third_party/linux/libjpeg/cderror.h
new file: cocos2dx/platform/third_party/linux/libjpeg/cdjpeg.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jconfig.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jdct.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jerror.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jinclude.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jmemsys.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jmorecfg.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jpegint.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jpeglib.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jversion.h
new file: cocos2dx/platform/third_party/linux/libjpeg/transupp.h
new file: cocos2dx/platform/third_party/linux/libpng/PngFile.h
new file: cocos2dx/platform/third_party/linux/libpng/cexcept.h
new file: cocos2dx/platform/third_party/linux/libpng/config.h
new file: cocos2dx/platform/third_party/linux/libpng/png.h
new file: cocos2dx/platform/third_party/linux/libpng/pngconf.h
new file: cocos2dx/platform/third_party/linux/libpng/pngpriv.h
new file: cocos2dx/platform/third_party/linux/libpng/readpng.h
new file: cocos2dx/platform/third_party/linux/libpng/readpng2.h
new file: cocos2dx/platform/third_party/linux/libpng/resource.h
new file: cocos2dx/platform/third_party/linux/libpng/writepng.h
new file: cocos2dx/platform/third_party/linux/libraries/libfreetype.a
new file: cocos2dx/platform/third_party/linux/libraries/libjpeg.a
new file: cocos2dx/platform/third_party/linux/libraries/libpng.a
new file: cocos2dx/platform/third_party/linux/libraries/libpng15.a
new file: cocos2dx/platform/third_party/linux/libraries/libxml2.a
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/DOCBparser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLparser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLtree.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.am
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.in
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX2.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/c14n.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/catalog.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/chvalid.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/debugXML.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/dict.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/encoding.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/entities.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/globals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/hash.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/list.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanoftp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanohttp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parserInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/pattern.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/relaxng.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schemasInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schematron.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/threads.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/tree.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/uri.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/valid.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xinclude.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xlink.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlIO.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlautomata.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlerror.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlexports.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmemory.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmodule.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlreader.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlregexp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlsave.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemas.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemastypes.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlstring.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlunicode.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h.in
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlwriter.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpath.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpathInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpointer.h
HelloWorld/Classes/
HelloWorld/android/assets
HelloWorld/postCompiled.sh
installLinuxLib.sh
2011-08-25 19:08:55 +08:00
606c8803bc
modified: CocosDenshion/Linux/FmodAudioPlayer.cpp
...
modified: CocosDenshion/Linux/FmodAudioPlayer.h
deleted: HelloWorld/AppDelegate.cpp
deleted: HelloWorld/AppDelegate.h
deleted: HelloWorld/HelloWorldScene.cpp
deleted: HelloWorld/HelloWorldScene.h
modified: cocos2dx/.cproject
modified: cocos2dx/actions/CCActionInstant.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: lib/android/Debug/libcocos2d.so
modified: lib/android/Release/libcocos2d.so
modified: lib/linux/Debug/libcocos2d.so
modified: lib/linux/Debug/libcocosdenshion.so
modified: lib/linux/Release/libcocos2d.so
modified: lib/linux/Release/libcocosdenshion.so
HelloWorld/AndroidDebug/
HelloWorld/AndroidRelease/
HelloWorld/Classes/
HelloWorld/android/assets
HelloWorld/postCompiled.sh
cocos2dx/platform/third_party/linux/
installLinuxLib.sh
tests/Res/gui_close.WAV
2011-08-25 19:04:29 +08:00
e26eaae5e1
[android] fixed #688 : support reading file other than apk
2011-08-25 11:24:31 +08:00
55dd2545d7
Merge pull request #488 from minggo/iss672
...
fixed #672 : implement copywithzone for CCShow & CCHide
2011-08-24 01:51:30 -07:00
ff34ada115
assign correct value to CCSkewY::m_fStartSkewY
2011-08-24 15:02:40 +08:00
952a01f43e
fixed #672 : implement copywithzone for CCShow & CCHide
2011-08-24 14:21:23 +08:00
75339b7630
Merge pull request #486 from minggo/master
...
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
2011-08-23 02:10:22 -07:00
a7e8c36eee
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
2011-08-23 17:04:38 +08:00
66b453edc9
[iOS] fixed #693 : CCLabelTTF support line break with \n
2011-08-23 16:19:31 +08:00
11679d9723
Merge branch 'master' into LinuxPort
2011-08-23 11:49:46 +08:00
d57d9ca6f6
modified: cocos2dx/.cproject
...
modified: cocos2dx/CCConfiguration.cpp
modified: cocos2dx/CCConfiguration.h
modified: cocos2dx/actions/CCActionGrid3D.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.h
modified: cocos2dx/platform/Linux/CCImage_Linux.cpp
modified: mycreate-android-project.sh
new file: post.sh
modified: template/android/mycopy_files.sh
modified: tests/AppDelegate.cpp
new file: tests/test.linux/Res
deleted: tests/test.linux/Res/Hello.png
deleted: tests/test.linux/Res/Images/BoilingFoam.plist
deleted: tests/test.linux/Res/Images/BurstPipe.plist
deleted: tests/test.linux/Res/Images/Comet.plist
deleted: tests/test.linux/Res/Images/Comet.png
deleted: tests/test.linux/Res/Images/ExplodingRing.plist
deleted: tests/test.linux/Res/Images/Flower.plist
deleted: tests/test.linux/Res/Images/Fog.png
deleted: tests/test.linux/Res/Images/Galaxy.plist
deleted: tests/test.linux/Res/Images/HelloWorld.png
deleted: tests/test.linux/Res/Images/Icon.png
deleted: tests/test.linux/Res/Images/LavaFlow.plist
deleted: tests/test.linux/Res/Images/Pea.png
deleted: tests/test.linux/Res/Images/Phoenix.plist
deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png
deleted: tests/test.linux/Res/Images/SendScoreButton.png
deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png
deleted: tests/test.linux/Res/Images/SpinningPeas.plist
deleted: tests/test.linux/Res/Images/SpinningPeas.png
deleted: tests/test.linux/Res/Images/Spiral.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.png
deleted: tests/test.linux/Res/Images/Upsidedown.plist
deleted: tests/test.linux/Res/Images/atlastest.png
deleted: tests/test.linux/Res/Images/b1-hd.png
deleted: tests/test.linux/Res/Images/b1.png
deleted: tests/test.linux/Res/Images/b2-hd.png
deleted: tests/test.linux/Res/Images/b2.png
deleted: tests/test.linux/Res/Images/background.png
deleted: tests/test.linux/Res/Images/background1-hd.png
deleted: tests/test.linux/Res/Images/background1.png
deleted: tests/test.linux/Res/Images/background2-hd.png
deleted: tests/test.linux/Res/Images/background2.png
deleted: tests/test.linux/Res/Images/background3-hd.png
deleted: tests/test.linux/Res/Images/background3.png
deleted: tests/test.linux/Res/Images/ball-hd.png
deleted: tests/test.linux/Res/Images/ball.png
deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/Images/bitmapFontTest3.png
deleted: tests/test.linux/Res/Images/blocks-hd.png
deleted: tests/test.linux/Res/Images/blocks.png
deleted: tests/test.linux/Res/Images/btn-about-normal.png
deleted: tests/test.linux/Res/Images/btn-about-selected.png
deleted: tests/test.linux/Res/Images/btn-highscores-normal.png
deleted: tests/test.linux/Res/Images/btn-highscores-selected.png
deleted: tests/test.linux/Res/Images/btn-play-normal.png
deleted: tests/test.linux/Res/Images/btn-play-selected.png
deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.png
deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist
deleted: tests/test.linux/Res/Images/bugs/circle-hd.png
deleted: tests/test.linux/Res/Images/bugs/circle.plist
deleted: tests/test.linux/Res/Images/bugs/circle.png
deleted: tests/test.linux/Res/Images/bugs/corner.png
deleted: tests/test.linux/Res/Images/bugs/edge.png
deleted: tests/test.linux/Res/Images/bugs/fill.png
deleted: tests/test.linux/Res/Images/bugs/picture-hd.png
deleted: tests/test.linux/Res/Images/bugs/picture.png
deleted: tests/test.linux/Res/Images/close-hd.png
deleted: tests/test.linux/Res/Images/close.png
deleted: tests/test.linux/Res/Images/debian.plist
deleted: tests/test.linux/Res/Images/f1-hd.png
deleted: tests/test.linux/Res/Images/f1.png
deleted: tests/test.linux/Res/Images/f2-hd.png
deleted: tests/test.linux/Res/Images/f2.png
deleted: tests/test.linux/Res/Images/fire-grayscale.png
deleted: tests/test.linux/Res/Images/fire.png
deleted: tests/test.linux/Res/Images/fps_images.png
deleted: tests/test.linux/Res/Images/grossini-hd.png
deleted: tests/test.linux/Res/Images/grossini.png
deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr
deleted: tests/test.linux/Res/Images/grossini_dance_01.png
deleted: tests/test.linux/Res/Images/grossini_dance_02.png
deleted: tests/test.linux/Res/Images/grossini_dance_03.png
deleted: tests/test.linux/Res/Images/grossini_dance_04.png
deleted: tests/test.linux/Res/Images/grossini_dance_05.png
deleted: tests/test.linux/Res/Images/grossini_dance_06.png
deleted: tests/test.linux/Res/Images/grossini_dance_07.png
deleted: tests/test.linux/Res/Images/grossini_dance_08.png
deleted: tests/test.linux/Res/Images/grossini_dance_09.png
deleted: tests/test.linux/Res/Images/grossini_dance_10.png
deleted: tests/test.linux/Res/Images/grossini_dance_11.png
deleted: tests/test.linux/Res/Images/grossini_dance_12.png
deleted: tests/test.linux/Res/Images/grossini_dance_13.png
deleted: tests/test.linux/Res/Images/grossini_dance_14.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr
deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng
deleted: tests/test.linux/Res/Images/grossinis_sister1.png
deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister2.png
deleted: tests/test.linux/Res/Images/landscape-1024x1024.png
deleted: tests/test.linux/Res/Images/logo-mipmap.pvr
deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr
deleted: tests/test.linux/Res/Images/menuitemsprite.png
deleted: tests/test.linux/Res/Images/paddle-hd.png
deleted: tests/test.linux/Res/Images/paddle.png
deleted: tests/test.linux/Res/Images/particles-hd.png
deleted: tests/test.linux/Res/Images/particles.png
deleted: tests/test.linux/Res/Images/pattern1.png
deleted: tests/test.linux/Res/Images/piece.png
deleted: tests/test.linux/Res/Images/powered.png
deleted: tests/test.linux/Res/Images/r1-hd.png
deleted: tests/test.linux/Res/Images/r1.png
deleted: tests/test.linux/Res/Images/r2-hd.png
deleted: tests/test.linux/Res/Images/r2.png
deleted: tests/test.linux/Res/Images/snow.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png
deleted: tests/test.linux/Res/Images/spritesheet1.png
deleted: tests/test.linux/Res/Images/stars-grayscale.png
deleted: tests/test.linux/Res/Images/stars.png
deleted: tests/test.linux/Res/Images/stars2-grayscale.png
deleted: tests/test.linux/Res/Images/stars2.png
deleted: tests/test.linux/Res/Images/streak.png
deleted: tests/test.linux/Res/Images/test-rgba1.png
deleted: tests/test.linux/Res/Images/test_blend.png
deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr
deleted: tests/test.linux/Res/Images/test_image.jpeg
deleted: tests/test.linux/Res/Images/test_image.png
deleted: tests/test.linux/Res/Images/test_image.pvr
deleted: tests/test.linux/Res/Images/test_image.pvrraw
deleted: tests/test.linux/Res/Images/test_image_a8.pvr
deleted: tests/test.linux/Res/Images/test_image_ai88.pvr
deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr
deleted: tests/test.linux/Res/Images/test_image_i8.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz
deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr
deleted: tests/test.linux/Res/Images/texture1024x1024.png
deleted: tests/test.linux/Res/Images/texture2048x2048.png
deleted: tests/test.linux/Res/Images/texture512x512.png
deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx
deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png
deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test.png
deleted: tests/test.linux/Res/TileMaps/iso-test.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2.png
deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx
deleted: tests/test.linux/Res/TileMaps/iso.png
deleted: tests/test.linux/Res/TileMaps/levelmap.tga
deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx
deleted: tests/test.linux/Res/TileMaps/ortho-test1.png
deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png
deleted: tests/test.linux/Res/TileMaps/ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx
deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx
deleted: tests/test.linux/Res/TileMaps/tiles-hd.png
deleted: tests/test.linux/Res/TileMaps/tiles.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png
deleted: tests/test.linux/Res/animations/dragon_animation-hd.png
deleted: tests/test.linux/Res/animations/dragon_animation.png
deleted: tests/test.linux/Res/animations/ghosts.plist
deleted: tests/test.linux/Res/animations/ghosts.png
deleted: tests/test.linux/Res/animations/grossini-aliases.plist
deleted: tests/test.linux/Res/animations/grossini-aliases.png
deleted: tests/test.linux/Res/animations/grossini.plist
deleted: tests/test.linux/Res/animations/grossini.plist.xml
deleted: tests/test.linux/Res/animations/grossini.png
deleted: tests/test.linux/Res/animations/grossini.ztp
deleted: tests/test.linux/Res/animations/grossini_blue.plist
deleted: tests/test.linux/Res/animations/grossini_blue.png
deleted: tests/test.linux/Res/animations/grossini_family.plist
deleted: tests/test.linux/Res/animations/grossini_family.png
deleted: tests/test.linux/Res/animations/grossini_gray.plist
deleted: tests/test.linux/Res/animations/grossini_gray.png
deleted: tests/test.linux/Res/app.config.txt
deleted: tests/test.linux/Res/background.mp3
deleted: tests/test.linux/Res/effect1.wav
deleted: tests/test.linux/Res/effect2.ogg
deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf
deleted: tests/test.linux/Res/fonts/Abberancy.ttf
deleted: tests/test.linux/Res/fonts/Abduction.ttf
deleted: tests/test.linux/Res/fonts/Paint Boy.ttf
deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf
deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf
deleted: tests/test.linux/Res/fonts/arial16.fnt
deleted: tests/test.linux/Res/fonts/arial16.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png
deleted: tests/test.linux/Res/fonts/fps_images-hd.png
deleted: tests/test.linux/Res/fonts/fps_images.png
deleted: tests/test.linux/Res/fonts/futura-48.fnt
deleted: tests/test.linux/Res/fonts/futura-48.png
deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt
deleted: tests/test.linux/Res/fonts/konqa32-hd.png
deleted: tests/test.linux/Res/fonts/konqa32.fnt
deleted: tests/test.linux/Res/fonts/konqa32.png
deleted: tests/test.linux/Res/fonts/larabie-16-hd.png
deleted: tests/test.linux/Res/fonts/larabie-16.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png
deleted: tests/test.linux/Res/music.mid
deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist
deleted: tests/test.linux/Res/zwoptex/grossini-generic.png
deleted: tests/test.linux/Res/zwoptex/grossini.plist
deleted: tests/test.linux/Res/zwoptex/grossini.png
CocosDenshion/AndroidDebug/
CocosDenshion/AndroidRelease/
HelloCocos2dx/AndroidDebug/2
HelloCocos2dx/android/assets
HelloCocos2dx/postCompiled.sh
installLinuxLib.sh
2011-08-23 11:28:04 +08:00
d5457526d4
fixed #689 : the width & height of CCRect should big or equal to 0
2011-08-23 10:46:00 +08:00
19244406d6
fixed #689 : assert the width and height of rect is big than 0
2011-08-22 14:55:51 +08:00
cd4a08aa6a
Merge pull request #479 from minggo/iss678
...
fixed #679 : add constructor for CCArray
2011-08-21 20:14:06 -07:00
8f4d47900b
new file: cocos2dx/.cproject
...
new file: cocos2dx/.project
2011-08-21 19:03:46 +08:00
807ae36d6a
CCMutableArray optimization
2011-08-20 01:30:33 +04:00
1f9f1f59d4
fixed #679 : add constructor for CCArray
2011-08-19 16:15:06 +08:00
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
871abb4a32
Merge branch 'master' into LinuxPort
2011-08-19 13:20:23 +08:00
ad305648c0
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
...
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
CocosDenshion/Linux/
CocosDenshion/third_party/
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-19 13:07:50 +08:00
5087f6ddb2
[android] fixed #683 : remove unneeded includes
2011-08-18 16:19:36 +08:00
b4ab3f6b75
[android] fixed #683 : remove unneeded includes
2011-08-18 16:18:26 +08:00
1640e48d5a
[android] fixed #683 : let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer
2011-08-18 16:09:49 +08:00
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
a8d87a9976
Non-trivial arguments passed by reference now.
...
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
4244fdb62b
fixed #643 , swap accelerometer input x/y according to the orientation (on ios devices)
2011-08-17 20:11:33 +08:00
e39d551294
fixed #680 : fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed
2011-08-17 15:00:32 +08:00
5d20ebe24b
modified: HelloWorld/AppDelegate.cpp
...
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 11:36:54 +08:00
3afe6ebfb2
fixed #638 , add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.
2011-08-16 11:56:17 +08:00
0881668cc2
fixed #661 . Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well
2011-08-15 12:10:11 +08:00
2eafb827cf
avoid memory leaking from lua script module
2011-08-14 17:26:51 +08:00
f47df23363
Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661
...
Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h
2011-08-11 20:47:54 -07:00
4aa33b0942
Merge pull request #463 from minggo/master
...
fixed #668
2011-08-10 19:32:44 -07:00
6d3941ebc1
Merge pull request #464 from leon-li/master
...
fix some warnings under xcode 4.0 llvm clang
2011-08-10 19:32:16 -07:00
771e2349c5
fix some warnings under xcode 4.0 llvm compiler
2011-08-10 22:39:02 +08:00
9a884ffda6
[iOS] fixed #668 : CCLabelBMFont looks ok in retina mode
2011-08-10 15:07:34 +08:00
6eba0b658f
fixed #651 , add CCFileUtils to doxygen api document
2011-08-08 23:05:47 +08:00
2b5635898a
fixed #665 : add test of RenderTextureSave
2011-08-08 14:06:03 +08:00
7a0e8b4a0a
Merge pull request #457 from minggo/iss642
...
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-07 20:08:16 -07:00
41ea2e98a1
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-08 11:01:47 +08:00
70e19d7245
fixed #347 fixed 'AddFontResource' path error!
2011-08-08 10:32:21 +08:00
976d886263
Merge pull request #455 from giom/master
...
Lua AddSearchPath issue #647
2011-08-05 18:43:44 -07:00
2d5a04b9ca
Merge pull request #454 from flyingpacer/608
...
fixed #608 rendertexture disappears after going to background
2011-08-04 23:55:26 -07:00
dd43f16c8e
fixed #622 : add comment of CCUserDefault
2011-08-05 11:02:42 +08:00
5f08bb24fe
Merge branch 'master' into 608
2011-08-05 10:59:40 +08:00
016c463659
Merge pull request #449 from flyingpacer/savecrash
...
fixed #657 Latest git version was broken
2011-08-04 02:39:33 -07:00
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
4745b85af9
fixed #657 Latest git version was broken
2011-08-04 16:37:43 +08:00
bbc4bbeb6c
issue #347 lost [] in 'delete array'
2011-08-04 13:47:21 +08:00
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
78ffea3049
Merge pull request #443 from natural-law/master
...
fixed #513
2011-08-02 23:35:35 -07:00
6892787afa
fixed #653 : add CCScheduler::unscheduleScriptFunc()
2011-08-03 14:15:35 +08:00
3a80e51d25
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-03 11:39:03 +08:00
94f2d8a5e2
fixed #513 , CCProgressTimer support sprite generated from CCSpriteFrame.
2011-08-03 11:38:38 +08:00
78642a39ac
[android] fixed #652 : refactor JniHelper::jstringtochar()
2011-08-03 10:44:39 +08:00
b9374663cd
Merge pull request #440 from flyingpacer/savecrash
...
fixed #649 the user could save any domain of the render texture
2011-08-02 03:16:20 -07:00
90f403d8a2
Merge pull request #441 from liswei/issue347
...
issue #347 add ttf support in wophone
2011-08-02 03:16:06 -07:00
188b168d30
issue #347 add ttf support in wophone
2011-08-02 18:02:27 +08:00
4a8e3f468e
fixed #649 the user could save any domain of the render texture
2011-08-02 17:22:57 +08:00
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
3a3a52c59a
fixed #649 the user could save any domain of the render texture
2011-08-02 14:25:58 +08:00
730ff63c9f
rename scene to node
2011-08-02 14:09:23 +08:00
c4d1dedba8
Merge https://github.com/reflog/cocos2d-x into reflog
2011-08-02 14:03:34 +08:00
9fe868b881
Merge pull request #438 from natural-law/master
...
Use the setter to set the value of m_tAnchorPoint.
2011-08-01 21:39:43 -07:00
9a86582cd2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-02 11:06:47 +08:00
d6221cfa36
Use the setter to set the value of m_tAnchorPoint.
2011-08-02 11:02:02 +08:00
d575d40ab3
fixed #648 savebuffer may crash on some machines like Motorola Defy
2011-08-02 10:27:52 +08:00
335d2d30b4
fixed #648 savebuffer may crash on some machines like Motorola Defy
2011-08-02 10:05:15 +08:00
f86da27a38
Merge branch '0.9.0'
2011-08-02 03:49:36 +08:00
b789927ca3
added possibility to add a path to the lua search path (package.path/LUA_PATH)
2011-08-02 03:47:39 +08:00
63839de12a
Merge https://github.com/cocos2d/cocos2d-x into iss347
2011-08-01 18:23:14 +08:00
895d4992e4
issue #347 : FontTest runs ok on iOS
2011-08-01 18:22:47 +08:00
5b0f25466a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-01 10:45:40 +08:00
bf44d13bc9
fixed #644 , m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked.
2011-08-01 10:44:18 +08:00
52df611822
Merge pull request #434 from flyingpacer/641
...
fixed #641 the user could save buffer to any path
2011-07-31 18:20:28 -07:00
41bdb281dc
corrected bug and leak in getBool
2011-07-31 15:31:39 +03:00
af61a7c650
added support for optional default values in CCUserDefault getters
2011-07-31 15:08:25 +03:00
9c5fa51e6b
usuful macros for defining scene() and node() methods with params
2011-07-30 11:55:38 +03:00
b2dce6ab80
Merge remote-tracking branch 'upstream/master'
2011-07-30 09:32:44 +03:00
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
a54fda812b
fixed #641 the user could save buffer to any path
2011-07-29 11:36:04 +08:00
cfb3765035
issue #347 : iOS support font defined by ttf file
2011-07-29 10:15:10 +08:00
d37a694529
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/platform/CCImage.cpp
2011-07-29 09:51:43 +08:00
5ad318fa71
Resolve the cocos2d compile error on wophone.
2011-07-29 09:50:06 +08:00
87f0b6c63f
Merge pull request #431 from flyingpacer/640
...
fixed #640 the image read from render texture is upseted
2011-07-28 18:42:14 -07:00
41ec0ba945
modification to support radio menu
2011-07-28 22:18:45 +03:00
ae945f4880
changes to support CCScrollLayer
2011-07-28 17:09:06 +03:00
50038b7cc2
Merge https://github.com/cocos2d/cocos2d-x into iss347
2011-07-28 18:06:20 +08:00
c7aa948817
fixed #640 the image read from render texture is upseted
2011-07-28 18:02:25 +08:00
c1fdf9afb5
issue #608 rendertexture disappears after going to background
2011-07-28 17:32:09 +08:00
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
a7404dc2bf
fixed #639 , Initialize the m_tPosition of CCParticleSystem with the setter.
2011-07-28 16:16:51 +08:00
d4db9eb566
fixed #636 , Modify the implementation of method CCTextureCache::textureForKey().
2011-07-28 15:08:07 +08:00
a8e4d5ea89
rename CCMenu::menu() -> CCMenu::node()
2011-07-28 14:24:24 +08:00
4c06cb853b
Merge remote branch 'upstream/master'
2011-07-28 12:27:07 +08:00
0f94423b9b
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:52:09 +08:00
4510101e96
add CCMenu::init() and CCMenu::menu() to create empty menus
2011-07-28 10:45:32 +08:00
aec1ddc4b4
Merge branch 'master' into 630
2011-07-28 10:10:47 +08:00
eda6228374
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:09:56 +08:00
a253909030
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-27 16:55:04 +08:00
8afa3a9be1
fixed #619 CCFadeTo may crashed on android
2011-07-27 16:21:00 +08:00
33e85bdc53
Merge pull request #421 from leon-li/master
...
add CCMenuItem::setTarget
2011-07-26 18:48:24 -07:00
c5f7036f7b
add CCMenuItem::setTarget
2011-07-26 18:41:58 +08:00
1e8e036da7
issue #633 add playeffect loop in wophone
2011-07-26 17:04:39 +08:00
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
20bba80c73
Merge remote branch 'origin/master'
2011-07-25 15:02:41 +08:00
059e5ebc0b
add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak
2011-07-25 15:00:00 +08:00
ab4ef0f180
Merge https://github.com/cocos2d/cocos2d-x into iss623
2011-07-25 14:13:20 +08:00
b105b6005e
[android] fixed #623 : refactor Cocos2dJni.cpp
2011-07-25 14:12:30 +08:00
9ce402655d
Merge remote branch 'upstream/master'
2011-07-24 12:24:16 +08:00
864878d15a
fix warning on android
2011-07-24 12:16:40 +08:00
b43d233c08
issue #629 , pass eImgFmt param to initWithImageData. But still haven't add test case for this.
2011-07-24 09:04:08 +08:00
45e8915963
fixed #628 , CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)
2011-07-24 08:30:49 +08:00
62ea6a2d46
issue #623 : create JniHelper and use it somewhere
2011-07-22 18:14:29 +08:00
0dac01b3d8
Merge pull request #409 from natural-law/master
...
fixed #621
2011-07-20 00:43:02 -07:00
36a1f574b3
Merge pull request #408 from minggo/iss620
...
[win32] fixed #620 : change the output of lua to a lib
2011-07-20 00:40:53 -07:00
32e7ee6e2f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-20 15:35:52 +08:00
6a8b563feb
fixed #621 , Add Texture2dTest in tests project.
2011-07-20 15:35:20 +08:00
3e080476f3
[win32] fixed #620 : change the output of lua to a lib
2011-07-20 15:21:51 +08:00
6996ccee95
Merge pull request #407 from leon-li/master
...
fix: passing std::string object to CCLOG
2011-07-19 20:42:29 -07:00
6426e96f82
Merge remote branch 'upstream/master'
2011-07-20 11:42:00 +08:00
5f1f63dabf
fix: passing std::string object to CCLOG
2011-07-20 08:52:29 +08:00
0c495628ea
Merge pull request #405 from minggo/iss618
...
invoke java code(System.exit()) to finish programe
2011-07-19 02:20:36 -07:00
d2d02e0c52
fix compile error with android-ndk-r6
2011-07-19 16:54:42 +08:00
d2b44a203f
issue #536 , build success on win32
2011-07-19 16:03:42 +08:00
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
768bfa9a9b
issue #536 , add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet.
2011-07-19 15:22:13 +08:00
bc44855091
issue #536 , integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.
2011-07-19 15:14:59 +08:00
7a12bb9cdc
fixed #613 : Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate()
2011-07-18 10:31:41 +08:00
a3e9679578
fixed #611 : add some functions for lua
2011-07-18 10:18:36 +08:00
29efe9bd39
Merge pull request #402 from minggo/iss615
...
fixed #615 : CCLog may crash when invoke lua function
2011-07-17 18:40:23 -07:00
9bbab7897a
fixed #615 : CCLog may crash when invoke lua function
2011-07-14 17:52:56 +08:00
0817d59edf
Merge pull request #401 from minggo/master
...
[android] fixed #609 : retain & release obj in CCSet
2011-07-14 02:27:56 -07:00
4694926edb
[android] fixed #609 : retain & release obj in CCSet
2011-07-14 15:32:11 +08:00
dd42936bb3
[android] fixed #610 : remove the support of ndk-r4
2011-07-14 10:37:40 +08:00
fe3aadf800
update to 1.0.0 07-12
2011-07-13 10:20:24 +08:00
faa1c8ee16
Merge pull request #393 from minggo/master
...
[win32] modify for vs2010
2011-07-12 03:09:44 -07:00
760ec3201e
[win32] modify for vs2010
2011-07-12 18:05:44 +08:00
48420dca0c
fixed #605 , add CC_DLL to pure C methods in CCNS.h
2011-07-12 17:10:10 +08:00
935051a363
set gl perspctive project
2011-07-12 16:04:13 +08:00
8b5282a0cf
fixed #603 , The test case TMXGIDObjectsTest in TileMapTest not crash any more.
2011-07-12 14:21:29 +08:00
51b751aade
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-12 11:26:28 +08:00
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
d3960a13df
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-12 10:36:30 +08:00
3d24fc5be4
fixed #606 , Resolve the wrong effect of the test case PageTransitionForward in TransitionsTest.
2011-07-12 10:36:07 +08:00
eb675073ee
remove inline to comiple ok on android
2011-07-11 16:36:19 +08:00
ae3dd1f497
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
2011-07-11 15:33:53 +08:00
c8f5f703a5
to commit LuaCocos2d.cpp
2011-07-11 15:33:27 +08:00
76d15b8767
Merge pull request #379 from minggo/master
...
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
2011-07-11 00:30:54 -07:00
60bf07b859
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
2011-07-11 15:25:02 +08:00
fcbe0443be
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
2011-07-11 15:16:29 +08:00
a64783d4d2
fix the usage of sort()
2011-07-11 10:12:29 +08:00
1bdce00740
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/ccConfig.h
2011-07-08 17:08:57 +08:00
a1531cd478
Merge pull request #369 from flyingpacer/master
...
fix #592
2011-07-08 01:59:36 -07:00
6c37f42414
Merge pull request #368 from minggo/master
...
fixed #586
2011-07-08 01:46:54 -07:00
cba538d5d0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-08 15:58:14 +08:00
de7150214c
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
2011-07-08 15:40:27 +08:00
7b74372cac
fix #592
2011-07-08 15:38:32 +08:00
39a3b715cd
fixed #589
2011-07-08 15:28:13 +08:00
810cf3f8c3
fixed #591
2011-07-08 15:02:46 +08:00
f0ea58651b
fixed #586
2011-07-08 15:01:51 +08:00
5c8b04bc25
fixed #585
2011-07-08 14:48:25 +08:00
134a3a0fcf
fixed #590
2011-07-08 14:32:09 +08:00
db6a5fce23
fixed #588 .
2011-07-08 14:16:10 +08:00
5db1719302
fixed #587
2011-07-08 14:15:51 +08:00
90564fac49
[airplay] fix : incorrect calculation of the bit depth
2011-07-07 08:40:29 -07:00
b0416adaf2
Merge pull request #364 from minggo/master
...
upgrade to rc3
2011-07-07 01:06:27 -07:00
96289b20c4
upgrade to rc3
2011-07-07 16:03:03 +08:00
ae466898b0
Merge pull request #363 from minggo/master
...
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
2011-07-07 00:49:31 -07:00
b08788d810
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
2011-07-07 15:41:42 +08:00
94ac50bad0
fixed #582 , use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.
2011-07-07 14:45:59 +08:00
8e370eeb10
fix some compiling warnings
2011-07-07 11:27:45 +08:00
2bc8427b3c
Resolve the bug of some particle test cases can't be shown.
2011-07-07 11:02:47 +08:00
348a05a329
fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference
2011-07-07 08:23:31 +08:00
72dfb3f919
fixed #576 , replace std::string to _KeyT in CCMutableDictionary class template
2011-07-07 08:19:29 +08:00
3dc1967f6c
fixed #579 : change zorder to int
2011-07-06 20:48:56 +08:00
e56547b9f5
fixed #580 : use int or it will loop for ever
2011-07-06 19:54:25 +08:00
6cb945a8ca
fix bug of particle_node when upgrade to rc3
2011-07-06 18:16:19 +08:00
f894e00f27
fix a bug of CCProgressTimer when upgrade to rc3
2011-07-06 16:29:56 +08:00
980ce79ead
[android] fixed #577 : init member variable to default value
2011-07-06 15:22:25 +08:00
59ed71df03
Merge pull request #353 from minggo/master
...
upgrade to 1.0.0-rc3
2011-07-06 00:02:45 -07:00
ff50997eb0
issue #574
2011-07-06 14:56:05 +08:00
ac700583cc
fixed #573 , init m_tColor & m_tBlendFunc in CCLayerColor constructor
2011-07-05 15:39:50 +08:00
7603665165
fix merging confict of CCDirector.cpp
2011-07-05 14:54:41 +08:00
7adb140439
fixed #568
2011-07-05 14:51:17 +08:00
2b963060ab
Merge pull request #352 from natural-law/master
...
fixed #563
2011-07-04 22:56:40 -07:00
12aa33e0ee
fix an unsafe call in CCDirector::isOpenGLAttached(). Thanks to Ben Smith http://www.cocos2d-x.org/boards/6/topics/2092
2011-07-05 12:13:07 +08:00
6c95a3190f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-05 12:05:43 +08:00
7107c6612b
fixed #563 , Upgrade folder support to rc3.
2011-07-05 12:05:19 +08:00
ad3bad964f
fixed #567
2011-07-05 11:36:46 +08:00
0d80326392
fixed #564 : upgrade textures to 1.0.0-rc3
2011-07-05 10:47:25 +08:00
0e6bf40e7c
fixed #561 : upgrade particle_nodes to 1.0.0-rc3
2011-07-04 19:20:16 +08:00
6b97a381e9
fixed #560 : upgrade misc_nodes to 1.0.0-rc3
2011-07-04 16:01:57 +08:00
8478288e88
fixed #iss559
2011-07-04 14:47:32 +08:00
210840a22a
fixed #555 : upgrade effects to 1.0.0-rc3
2011-07-04 14:21:03 +08:00
70ce4f877f
fixed #565 : upgrade tileMap_parallax_nodes to 1.0.0-rc3
2011-07-04 14:11:43 +08:00
6482f5662b
fixed #557 : upgrade label_nodes to 1.0.1-rc3
2011-07-04 10:59:35 +08:00
0378a6a36d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/CCNode.h
2011-07-01 16:24:23 +08:00
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
16f79cb0be
fixed #554 : upgrade base_nodes to 1.0.0-rc3
2011-07-01 15:48:05 +08:00
de705986f8
Merge pull request #341 from minggo/iss553
...
fixed #533 : upgrade actions to 1.0.0-r3
2011-07-01 00:18:32 -07:00
7bdf2cb84e
fixed #533 : upgrade actions to 1.0.0-r3
2011-07-01 15:08:23 +08:00
4d5dab4a40
fixed #558 , Upgrade folder layers_scenes_transitions_nodes to rc3.
2011-07-01 11:26:26 +08:00
dab077d2a1
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-01 10:27:39 +08:00
d892872d2f
fixed #552 , Treat the parameter of method CCTextureCache::removeTextureForKey() as relative path.
2011-07-01 09:32:15 +08:00
989c8027d0
Merge pull request #338 from natural-law/master
...
fixed #522
2011-06-30 18:24:09 -07:00
b684cbdc6c
fixed #522 , CCSpriteFrameCache::addSpriteFramesWithFile(const char *pszPlist) will not crash any more if the parameter don't have '/'.
2011-06-30 17:50:28 +08:00
2a39fe0aa4
Merge pull request #335 from minggo/iss547
...
[Android] fixed #547 : line wrap OK on Android
2011-06-29 19:46:25 -07:00
6c47f53b13
[Android] fixed #547 : line wrap OK on Android
2011-06-29 15:45:30 +08:00
bb90fbfb1e
[iOS] fixed #546 : CCLabelTTF:initWithString() will crash when the height is 0
2011-06-28 15:24:58 +08:00
9d4c4b5cb6
delete some unused codes.
2011-06-28 14:37:06 +08:00
0dec97a303
fixed #544 The bug reaised by CCGrid render texture in another FBO.
2011-06-28 14:32:59 +08:00
3b6265aa58
Compile ok on vs2010
2011-06-27 17:02:58 +08:00
59f37ddb5d
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
2011-06-27 10:55:45 +08:00
00568c229a
[android] back to shared library link
2011-06-25 11:21:16 +08:00
e8fda66ccc
Merge https://github.com/cocos2d/cocos2d-x
2011-06-24 13:55:52 +08:00
8440d6a267
[android] fixed #364 : show string correct & line break ok
2011-06-24 13:55:00 +08:00
0c5f28fc11
fixed #539 call unzOpen, then may not call unzClose(WVGA)
2011-06-24 09:29:55 +08:00
4793713daa
fixed #539 call unzOpen, then may not call unzClose(WVGA)
2011-06-23 18:24:32 +08:00
156dfa8859
Merge remote branch 'origin/master'
2011-06-23 16:31:52 +08:00
9e74b1f50d
fixed #534 , use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios.
2011-06-23 16:31:04 +08:00
481010a417
Merge pull request #316 from minggo/iss364
...
[Android] line break ok on Android
2011-06-23 01:04:22 -07:00
39d62d69a7
add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest.
2011-06-23 16:02:16 +08:00
fea9f3b943
add script_support to cocos2d-wophone.vcproj
2011-06-23 15:59:28 +08:00
53eafa77ff
Merge https://github.com/cocos2d/cocos2d-x into iss364
2011-06-23 14:45:25 +08:00
10cdd7f798
[android] fixed #364 : line break ok on Android
2011-06-23 14:44:20 +08:00
d4bd6e63d2
synchrolize java code to HelloLua
2011-06-23 12:47:02 +08:00
d4e9e5a9d9
Merge pull request #314 from yangws/master
...
PVRFrame lib update to version 2.8 r1 (2.08.28.0634)
2011-06-22 20:10:09 -07:00
a98a3b9ca7
[airplay] add script_support
2011-06-23 09:31:18 +08:00
2c22cf0621
fixed #537 update to version 2.8 r1 (2.08.28.0634)
2011-06-22 17:55:03 +08:00
45933b177f
Merge pull request #313 from minggo/iss535
...
[Android] Use Android widget Bitmap to drawing string
2011-06-22 02:17:07 -07:00
67ac46647f
issue #531 , Merge liswei/issue531 manually.
2011-06-22 17:13:01 +08:00
1122a7c7d0
[android] use Android widget Bitmap other than skia to drawstring
2011-06-22 16:58:50 +08:00
fd86f1ef8c
Merge pull request #309 from minggo/master
...
fix a compile bug
2011-06-21 02:39:45 -07:00
53a5ec412e
fixed #528 : fix a compile bug
2011-06-21 17:36:38 +08:00
6cb6359168
Merge pull request #308 from minggo/master
...
fixed #528
2011-06-21 02:06:11 -07:00
f3375f0dbb
issue #528 , improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object.
2011-06-21 17:02:08 +08:00
00cc1d277d
fixed #528 : safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx()
2011-06-21 16:59:17 +08:00
ddbdf67f97
Merge http://github.com/minggo/cocos2d-x into lua
2011-06-21 16:03:34 +08:00
968779912a
fixed #528 : add copyright & modify pop menu position
2011-06-21 15:50:47 +08:00
175e9394bc
Merge https://github.com/minggo/cocos2d-x into lua
2011-06-21 15:22:00 +08:00
f80948d2eb
Merge pull request #303 from natural-law/master
...
fixed #323
2011-06-20 23:03:08 -07:00
d72d8a52f4
Merge https://github.com/cocos2d/cocos2d-x
2011-06-21 13:53:04 +08:00
8066312098
fixed #528 : refactor lua ok
2011-06-21 13:51:36 +08:00
14c43f4246
changed postfix increment of iterators to prefix increment
2011-06-21 09:30:03 +04:00
49a4481473
fixed #323 , Remove the #include <map> in CCApplication_win32.cpp.
2011-06-21 12:01:59 +08:00
ba4c3b8928
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-06-21 11:58:52 +08:00
960ef65f53
fixed #323 , Modify the implement of getCurrentLanguage method on win32.
2011-06-21 11:58:10 +08:00
80e618f6ed
issue #528 : fix some bug & complete hello.lua
2011-06-21 11:47:57 +08:00
3559258d94
Merge pull request #305 from moadib/cclabelbmfont_ref_instead_copy
...
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
2011-06-20 20:38:05 -07:00
4d161e7948
fix #529 , add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer
2011-06-21 10:53:20 +08:00
2f97a43439
issue #528 : refactor lua ok on Android
2011-06-21 10:18:43 +08:00
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
0b3586126b
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
2011-06-20 10:40:27 +04:00
fae0498b3c
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-06-17 10:49:25 +08:00
cfee246959
fixed #323 , Add an interface to get the current language.
2011-06-17 10:49:02 +08:00
7be492d1b5
Parameters should be passed by const reference instead copy
2011-06-16 09:27:51 +04:00
19eaefab72
CCImage_win32 hasn't release font resource in Destructor.
2011-06-16 10:55:57 +08:00
33008fc8de
Merge pull request #300 from minggo/lua
...
Lua support
2011-06-15 02:24:17 -07:00
738f0b3426
Merge https://github.com/cocos2d/cocos2d-x into lua
2011-06-15 15:32:09 +08:00
3e54282e04
fixed #502 modify CCConfiguration to singleton mode
2011-06-15 11:48:00 +08:00
c6cd929dac
fixed #516 ccactionmanager.cpp L289: 'if (UINT_MAX == i)' modify to 'if (UINT_MAX != i)'
2011-06-15 09:56:33 +08:00
585792f3da
Merge branch 'work1'
2011-06-14 16:29:41 +08:00
7c669cfcb4
fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly
2011-06-14 16:27:47 +08:00
5d70774b4f
fixed #524 , Parse the special format of plist files on ios & airplay.
2011-06-14 16:15:20 +08:00
49f1518893
fix a bug when compile in android
2011-06-14 15:43:45 +08:00
214e86a5b6
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
2011-06-14 15:05:52 +08:00
489fb7824b
fixed #524 , Parse the special format of plist files.
2011-06-14 14:53:00 +08:00
a7a22e528b
remove the usage of NDController
2011-06-14 14:46:39 +08:00
9c49e27bf1
add extensions & tools directory
2011-06-14 14:31:25 +08:00
0f19c30921
remove redifine functions
2011-06-14 11:32:01 +08:00
4d8b2c284c
support lua
2011-06-14 11:08:39 +08:00
8003de7468
update to latest code and merge
2011-06-14 11:01:38 +08:00
91326028ec
fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)
2011-06-13 16:58:55 +08:00
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
f600846d4b
Merge http://github.com/flyingpacer/cocos2d-x , resolve conflicts in cocos2dx/CCScheduler.cpp
2011-06-08 11:08:29 +08:00
67eb87abfe
To fix the crash when the gles version is too low
2011-06-08 10:02:07 +08:00
a13e8ae859
1.修正gles版本过低时会崩溃的问题
...
2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题
2011-06-03 15:22:50 +08:00
97afafd856
Merge remote branch 'origin/master'
2011-06-02 22:26:53 +08:00
3cba64679c
add std::string CCString::toStdString() method
2011-06-02 22:26:38 +08:00
4f20deff30
fixed #518 : fix a bug that use tHashSelectorEntry in wrong way
2011-06-02 10:07:17 +08:00
83e1e0ebd1
tests run ok when it don't enable lua
2011-06-01 20:29:05 +08:00
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +08:00
dedbd638d3
lua runs ok on Android
2011-06-01 14:35:28 +08:00
fe8fcb0b00
invode lua registerred tick
2011-05-31 14:49:47 +08:00
697368cf20
support lua
2011-05-31 14:04:14 +08:00
de977bc6c2
use 0 replace NULL
2011-05-30 16:49:08 +08:00
7e2d1d5c48
fixed #490 Text input on android use a different way, TextInputTest OK now.
2011-05-30 16:36:12 +08:00
c790fba340
avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution!
2011-05-27 16:26:59 +08:00
03b1bb6c52
fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp
2011-05-26 10:08:05 +08:00
ec23d7ed55
fixed #508 Dynamic switch retina display support.
2011-05-23 16:21:31 +08:00
4c0008cd73
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
2011-05-20 10:02:16 +08:00
97142d4a59
Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010
2011-05-19 21:11:29 +08:00
b940676cab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
2011-05-19 20:55:39 +08:00
02774dd963
fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite.
2011-05-19 17:00:13 +08:00
ff1017d86f
Merge pull request #276 from minggo/iss496
...
[android] fixed #496 fixed #497
2011-05-18 23:18:37 -07:00
073260e0a9
[android] fixed #496 fixed #497 : tests and HelloWorld work ok on Android3.0
2011-05-19 11:26:57 +08:00
2dd11490ad
Merge pull request #274 from yangws/master
...
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
2011-05-18 18:51:38 -07:00
822016e375
[android] fixed #495 : fix a memory leak
2011-05-18 13:56:35 +08:00
minggo