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
0f1ab7ab37
issue #1056 : Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.
2012-03-27 10:55:13 +08:00
James Chen
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
James Chen
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
James Chen
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
James Chen
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
James Chen
900de7328a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 18:29:26 +08:00
James Chen
c5d0b1ca6f
issue #1056 : Updated ParticleTest.
2012-03-22 18:29:07 +08:00
minggo
a8eaf85cfb
Merge pull request #804 from minggo/RenderTextureTest
...
Rendertexturetest
2012-03-22 01:37:58 -07:00
minggo
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
James Chen
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
James Chen
fc2fd4d353
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 09:46:23 +08:00
James Chen
59393c2fef
issue #1056 : Update CCLabelBMFont.
2012-03-22 09:46:07 +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
6f4a01f454
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 17:35:39 +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
minggo
6242656049
issue #1506 : fix a confict
2012-03-21 17:23:33 +08:00
minggo
92c30a328e
issue #1506 : implement ShaderTest
2012-03-21 17:02:52 +08:00
James Chen
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
James Chen
8ef5e4ae3b
issue #1056 : Update the configuration of ios project.Sort the the project folder.
2012-03-21 11:07:31 +08:00
James Chen
00a81f5bd0
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-21 10:43:54 +08:00
James Chen
02ae04c1d6
issue #1056 : Modified the configuration of ios project.
2012-03-21 10:41:21 +08:00
James Chen
bb4d7c2f88
issue #1056 : Updated some files for ios platform. Added some 'TODO'.
2012-03-21 10:36:20 +08:00
James Chen
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
James Chen
7c0af610ff
issue #1056 : Added CCArray::copyWithZone implementation. CCDictElement bound check.
2012-03-20 23:30:18 +08:00
James Chen
15e03f8b14
issue #1056 : Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
...
Update CCDICT_FOREACH implementation.
2012-03-20 21:08:52 +08:00
James Chen
b5fca2f5f3
issue #1056 : Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks.
2012-03-20 21:04:29 +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
minggo
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +08:00
James Chen
9203b60fb0
add CCDictionary based on UTHASH, improve the performance.
2012-03-19 14:53:44 +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
303818ef6d
issue #1056 : Update CCGLProgram.
2012-03-15 10:54:07 +08:00
James Chen
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +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
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08: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
cc7542a86b
Merge pull request #766 from assoulter/master
...
Fix m_nEntryID typo
2012-03-11 20:06:24 -07:00
minggo
7fc0ffbf26
fixed #737 : remove view id
2012-03-12 11:00:12 +08:00
Anton Rusanov
8e53d9db9f
fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG
2012-03-12 00:59:03 +04: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
7dfe4224e1
Merge pull request #756 from dualface/fix-lua-engine-bugs
...
fixed #1030 : Improve Lua engine
2012-03-07 21:42:35 -08:00
minggo
e9c1e43e27
Merge pull request #755 from dumganhar/iss1022_string_with_file
...
fixed #1022 : Added a static method named CCString::stringWithContentsOfFile.
2012-03-07 21:39:59 -08:00
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
Liao YuLei
c6c7fb1be6
Improve Lua engine
...
rename executeFunctionByRefId() to executeFunctionByHandler()
add executeFunctionWithCCObject()
add pushIntegerToLuaStack()
add pushFloatToLuaStack()
add pushBooleanToLuaStack()
add pushCCObjectToLuaStack()
2012-03-07 20:27:26 +08:00
James Chen
c91fd243dc
Update cocos2dx/include/CCString.h
2012-03-07 16:15:26 +08:00
James Chen
2564f39eb8
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file
2012-03-07 16:13:16 +08:00
James Chen
00745ae172
fixed #1022 : add the comment for CCString::stringWithContentsOfFile.
2012-03-07 16:12:46 +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
minggo
ed68855e19
fixed #1009 : fix a typo error
2012-03-06 09:35:36 +08:00
James Chen
fd9dd6c7fe
add stringWithContentsOfFile static method in CCString class.
2012-03-05 11:13:45 +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
6c01009a18
fixed #986 : Add init() member funciton of CCMenu class.
2012-02-29 10:07:18 +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
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
minggo
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +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
minggo
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
moadib
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
minggo
fd9445f6df
add commet for CCArray
2012-02-23 10:06:36 +08: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
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +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
James Chen
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
James Chen
4f523bf986
remove .settings folder
2012-02-14 18:06:29 +08:00
James Chen
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
James Chen
e3e016331c
issue #972 : move extensions folder to cocos2dx
2012-02-14 16:08:12 +08:00
James Chen
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
James Chen
0adca5774c
move CCNotificationCenter to extensions folder
2012-02-14 11:45:59 +08:00
James Chen
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
minggo
c98dd0cf2d
fixed #948 : remove getIndexOfObject()
2012-02-14 10:49:53 +08:00
minggo
538adcec3e
merge code from duleface
2012-02-10 13:56:20 +08:00
James Chen
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
minggo
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
James Chen
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
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
YuLei Liao
1d6d966717
fix CCScriptEngineManager::purgeSharedManager()
2012-02-09 20:07:55 +08:00
minggo
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
YuLei Liao
e74b842a58
update HelloLua
2012-02-09 17:48:15 +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
YuLei Liao
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
dumganhar
ca94a11190
fixed #951 : removed definition of NSMutableSet.
2012-02-07 15:35:10 +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
YuLei Liao
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
dumganhar
1e807d00c3
fixed #967 : fixed PVR Textures can not be reloaded after GL context lost on android.
2012-02-07 11:18:39 +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
minggo
babbd64f0d
Merge pull request #691 from winbinar/master
...
fixed #626 : Fix bug #626
2012-02-05 23:00:31 -08: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
YuLei Liao
69a7e2a2e3
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
2012-02-04 11:34:17 +08:00
dumganhar
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
folecr
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
folecr
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
folecr
516c56a793
Add EXPORT_C_INCLUDES and correct the paths to third party modules
2012-02-02 20:04:29 -08:00
dumganhar
f6d6d0dd49
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 17:46:45 +08:00
minggo
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
minggo
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +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
dumganhar
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
Nicholas Kostelnik
edaf2cf269
fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon
2012-01-31 09:57:58 +00: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
minggo
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +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
dumganhar
a909be3264
remove selector_protocol.h for vs2010 project
2012-01-30 18:27:03 +08:00
dumganhar
c6ec949950
remove some functions in CCObject
2012-01-30 16:07:01 +08:00
dumganhar
6eb65442d4
remove some logs
2012-01-30 15:46:56 +08:00
dumganhar
f44b38eaf8
fixed #958 : move the implement of SelectorProtocol to CCObject
2012-01-30 15:31:59 +08:00
winbinar
231446a8a5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:49 +02:00
winbinar
910ded54c5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:19 +02: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
fe79a2c5d2
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-28 10:54:31 +01:00
dumganhar
49b57569c9
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-28 14:38:44 +08:00
folecr
a9d7500ae7
Fix whitespace line ending in one single line.
2012-01-25 18:14:29 -08:00
gzito
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
YuLei Liao
f8dafe6712
* add CCNode::getChildrenCount()
2012-01-21 01:29:41 +08:00
YuLei Liao
b79828a697
* merge lua fix
2012-01-21 00:47:51 +08:00
YuLei Liao
9660bcd165
* merge upstream/master to master
2012-01-20 19:08:21 +08:00
dumganhar
57eee38f4e
Merge branch 'master' into moveSel2CCObject
2012-01-19 15:46:31 +08:00
dumganhar
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
dumganhar
543d96a73f
issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:02:39 +08: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
dumganhar
cea250a962
restore original CCCopying as the parent class of CCObject
2012-01-17 10:54:21 +08:00
dumganhar
aa4fae3980
restore original CCCopying as the parent class of CCObject
2012-01-17 10:00:22 +08:00
dumganhar
ea0fb47f98
Merge branch 'master' into moveSel2CCObject
2012-01-17 09:37:31 +08:00
gzito
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
dumganhar
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
minggo
bd5ff14e45
Merge branch 'test' of https://github.com/minggo/cocos2d-x into test
2012-01-12 19:30:46 +08: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
cfe02e39ef
Broken include guard in CCActionEase.h
2012-01-12 17:06:46 +08:00
minggo
75216ac9ca
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 16:54:14 +08:00
minggo
57801eb0a0
modify version
2012-01-11 15:17:16 +08:00
dumganhar
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
dumganhar
d61f87ba92
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
2012-01-09 23:21:31 +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
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +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
4bffaaf9cb
fixed #936 : check whether selector is valid
2012-01-04 10:58:20 +08: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
dumganhar
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
minggo
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
dumganhar
8c65786dce
fixed #934 : Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-31 10:10:41 +08:00
minggo
53fae04ba8
fixed #752 : make add/remove touch delegate in menu callback function correctly
2011-12-30 15:43:36 +08:00
dumganhar
20b6257198
fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();'
2011-12-29 16:00:36 +08:00
dumganhar
025258d21d
fixed #928 : save pixelformat for each texture, restore the pixelformat after entering foreground
2011-12-29 15:05:38 +08:00
minggo
fcb2294e20
fixed #926 : subclass should retain/release when dynamic_cast fail.
2011-12-28 14:47:54 +08: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
YuLei Liao
bbad5a4392
* merge upstream/master to master
2011-12-25 11:48:03 +08: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
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
minggo
12237cf288
fixed #911 : add some comment
2011-12-22 16:29:25 +08:00
minggo
7422a424da
fixed #911 : make CCTextureCache::addUIImage() work ok when key is null
2011-12-22 16:26:56 +08:00
minggo
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
minggo
a0fe048f11
fixed #923 : cache texture with correct image type
2011-12-22 10:48:54 +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
GavT
36f8e43dd8
Update cocos2dx/include/CCTouch.h
2011-12-20 20:40:48 -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
01cf5793ad
fixed #922 : rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
2011-12-20 14:59:15 +08:00
minggo
28d0737bf3
fixed #917 : implement CCFileUtils::getFileDataFromZip() on iOS
2011-12-20 14:18:53 +08:00
dumganhar
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
minggo
faa8b59b6d
fixed #920 : export functions in CCAffineTransform
2011-12-20 10:39:10 +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
YuLei Liao
318a4c5ba8
merge upstream/master to master
2011-12-17 12:02:24 +08:00
dumganhar
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
dumganhar
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
minggo
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
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
dumganhar
f3b7b519fc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619
2011-12-15 11:38:15 +08:00
dumganhar
265558d9c7
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
2011-12-15 11:36:42 +08:00
minggo
15fca8b4b4
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 10:26:31 +08:00
minggo
8813d94257
Merge pull request #617 from minggo/issue906
...
remove unneeded code in CCImage_android.cpp
2011-12-14 18:08:24 -08:00
Didiet Noor
00e504356a
Fixing Warning on CLang 3.0 on XCode 4.2
2011-12-15 01:46:55 +08:00
Didiet Noor
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
Didiet Noor
7f7ef29b21
Fixes on QNX project accidentally including marmalade
2011-12-14 16:50:26 +08:00
dumganhar
625d299717
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
2011-12-13 10:01:29 +08:00
gzito
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
dumganhar
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
minggo
ba462e99a6
fixed #906 : remove unneeded code in CCImage_android.cpp
2011-12-12 17:02:21 +08:00
dumganhar
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dumganhar
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
minggo
95b43ac563
Merge pull request #614 from minggo/issue892_RTTI
...
Use RTTI to simplify codes
2011-12-11 19:40:34 -08:00
minggo
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
styck
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
gzito
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
styck
f3b662a5a8
marmalade updates
2011-12-10 22:29:39 -08:00
styck
dc6476ebe0
marmalade updates
2011-12-10 21:54:07 -08:00
styck
9fc2061c6b
mamarlade updates
2011-12-10 21:20:15 -08:00
styck
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
gzito
2be5240a5d
Fixed CCFileUtils::getWriteblePath on Marmalade
2011-12-10 16:34:54 +01:00
gzito
f27f9180ff
Merge remote-tracking branch 'remotes/styck/master'
2011-12-10 11:10:59 +01:00
Giovanni Zito
287f480c97
Added initWithString (TTF) and jpeg support
2011-12-09 22:05:12 +01:00
Giovanni Zito
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
Giovanni Zito
362a82f41c
mainloop modified to handle correctly quit requests
2011-12-09 22:03:38 +01:00
Giovanni Zito
c17d7de0a1
For CC_PLATFORM_MARMALADE used pointers instead of static instances for singletons
2011-12-09 22:02:19 +01:00
Giovanni Zito
5584039f47
libFreeType and libJpeg for Marmalade
2011-12-09 21:58:32 +01:00
dumganhar
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
dumganhar
6d2a298035
Merge branch 'bbf' into blackberry
2011-12-09 15:58:16 +08:00
dumganhar
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
styck
34759f4411
Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.
2011-12-08 20:47:42 -08:00
styck
7350fa9bb5
Updated based on G.Zito feedback
2011-12-08 19:51:19 -08:00
dumganhar
190fbb60a7
Merge branch 'Forf_2' into bbf
2011-12-09 10:39:27 +08:00
dumganhar
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00