James Chen
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
James Chen
394bb24cf5
issue #1056 : Reverted opengles emulator version to 2.09, because there are some issues in v2.10.
2012-03-27 14:11:28 +08:00
James Chen
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
James Chen
cef41dfbc5
issue #1056 : Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1.
2012-03-27 13:42:35 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
minggo
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
James Chen
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
James Chen
35d93328b9
issue #1056 : 1.Fixed a bug of double delete TouchDispatcher.
...
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
2012-03-21 21:53:03 +08:00
James Chen
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
James Chen
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
minggo
382e4e7eb8
issue #1056 : modify code according new code after pull
2012-03-20 17:27:06 +08:00
minggo
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
minggo
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
James Chen
ae2b3307fa
Merge pull request #779 from dumganhar/iss1056_CCDict
...
issue #1056 : Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 00:07:58 -07:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
James Chen
f67ac20639
Merge pull request #775 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 02:59:21 -07:00
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
86a1acc0d8
Merge pull request #774 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-15 22:45:20 -07:00
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
673a1ca238
Merge pull request #771 from dumganhar/gles20-dev
...
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 03:15:38 -07:00
James Chen
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +08:00
James Chen
d0f93d38f4
Merge pull request #769 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 00:00:57 -07:00
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
Paolo Giangrandi
4f2f403827
Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp
2012-03-12 14:22:48 +01:00
Paolo Giangrandi
7820be7841
Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}
2012-03-12 14:22:39 +01:00
James Chen
bd59979495
add gles2.0 libraries for win32.
...
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
2012-03-12 15:22:03 +08:00
minggo
7fc0ffbf26
fixed #737 : remove view id
2012-03-12 11:00:12 +08:00
Wartortle
7321d33aaf
Added support files for Accelerometer Simulation for iPhone Simulator and
...
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
2012-03-08 11:23:47 +00:00
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
minggo
a0f0971782
fixed #1017 : improve win32 timing accuracy
2012-03-06 14:12:57 +08:00
James Chen
74b4b14ee3
Merge pull request #730 from moadib/qnx_eventhandler
...
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
2012-03-05 18:07:20 -08:00
James Chen
cb1f94df47
revert CCFileUtils::getFileData method.
2012-03-05 09:55:50 +08:00
James Chen
347a8294ac
fixed #1007 : Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
2012-03-03 12:24:02 +08:00
minggo
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
minggo
2360a9a04e
fixed #762 : let zfont display on center
2012-03-02 14:22:01 +08:00
minggo
5485eb19d9
fixed #762 : compute correct text rect and display it on center
2012-03-02 14:17:22 +08:00
minggo
79495fd743
Merge pull request #741 from minggo/master
...
remove libiconv.a
2012-03-01 19:28:35 -08:00
minggo
c196f2dff2
issue #983 : remove libiconv.a
2012-03-02 11:25:35 +08:00
minggo
528a769cf6
fixed #762 : make label display on center on iOS
2012-03-02 11:15:44 +08:00
James Chen
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
James Chen
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
James Chen
2bc48219f8
remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.
2012-02-27 18:18:40 +08:00
moadib
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
moadib
7fcdb3b114
Added CCEGLView::EventHandler class for qnx-platform
2012-02-22 12:27:13 +04:00
minggo
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +08:00
James Chen
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
James Chen
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
James Chen
abbda72b2f
modify bada 2.0 project setting
2012-02-14 23:31:37 +08:00
James Chen
dac63dd2c2
rename include file name from uppercase to lowercase for linux platform
2012-02-14 22:41:33 +08:00
James Chen
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
minggo
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
minggo
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
minggo
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
minggo
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
minggo
8770976884
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
2012-02-07 10:48:07 +08:00
Wartortle
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
Wartortle
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
YuLei Liao
4fe0c10e10
merge upstream/master
2012-02-06 10:54:51 +08:00
moadib
f5b8aa79c5
Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 16:49:47 +04:00
folecr
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
YuLei Liao
47d88bfbba
* add macro defines for Lua engine
2012-02-02 10:37:21 +08:00
martinezgerman
c78bf39601
Member variable added to keep the current window active status
2012-01-31 22:55:44 -08:00
martinezgerman
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
martinezgerman
e8f9c5f675
merging the original update
2012-01-31 20:06:39 -08:00
martinezgerman
38cd599bdc
Functionality to detect when the application goes to the background and return from it
2012-01-31 00:25:09 -08:00
Dale Ducharme
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
folecr
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
folecr
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
gzito
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
gzito
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
gzito
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
dumganhar
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
dumganhar
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
minggo
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
minggo
0ee582e887
fixed #917 : add header files to resolve compiling errors
2012-01-09 17:36:57 +08:00
minggo
b1aee8f9eb
Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils
2012-01-09 17:12:46 +08:00
dumganhar
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
dumganhar
259aaf42a6
Fixed: get extension function from eglGetProcAddress on bada platform
2012-01-09 14:15:18 +08:00
dumganhar
30a02030b0
make the property function to virtual
2012-01-09 11:07:45 +08:00
dumganhar
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
gzito
65ddb88000
Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version)
2012-01-04 23:34:48 +01:00
minggo
c6da8d2fbd
call correct java method
2012-01-04 10:14:46 +08:00
gzito
2acea5f7af
libxml2.mkf for both Windows and Mac Marmalade versions
2012-01-03 00:39:31 +01:00
gzito
083d0015a3
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-02 22:32:29 +01:00
minggo
37915cfed6
remove unneeded function, and make protocol an abstract class
2011-12-28 14:46:49 +08:00
gzito
28562c3fb9
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2011-12-27 16:14:19 +01:00
dumganhar
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
minggo
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
minggo
21f05c2d6f
issue #903 : fix a compiling error
2011-12-22 09:56:09 +08:00
minggo
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
gzito
a39be9506f
Defines documentation to avoid warning in Marmalade
2011-12-20 22:34:23 +01:00
gzito
d37417f7da
Re-added libXml2
2011-12-20 22:10:01 +01:00
gzito
298f12e7a3
Removed libxml2 (precompiled version)
2011-12-20 22:05:01 +01:00
minggo
28d0737bf3
fixed #917 : implement CCFileUtils::getFileDataFromZip() on iOS
2011-12-20 14:18:53 +08:00
gzito
59bccb6bf8
Added last loaded font caching & minor fixes
2011-12-19 23:08:35 +01:00
gzito
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
gzito
e389ae5469
Optimized CCImage and fixed alpha value
2011-12-19 22:56:44 +01:00
dumganhar
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
dumganhar
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