Walzer
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
James Chen
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
James Chen
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
James Chen
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
James Chen
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
James Chen
8fd3518160
issue #1177 : fixed a bug about retina in CCDirector.
2012-04-23 15:38:02 +08:00
James Chen
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
James Chen
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
James Chen
d1d0fd619a
issue #1177 : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.
2012-04-20 15:23:00 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
James Chen
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
3c0653ffa7
fixed #1164 : 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad.
...
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
2012-04-13 17:24:50 +08:00
James Chen
b4d74700e4
Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
...
Conflicts:
tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
minggo
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
minggo
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
minggo
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
minggo
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
James Chen
df58a09255
Update:
...
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
2012-04-05 18:53:53 +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
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
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +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
James Chen
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
minggo
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +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
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
minggo
50a2e2d5e9
Merge pull request #574 from minggo/iss854_pthread
...
remove unneeded files
2011-11-17 18:59:03 -08:00
minggo
5d8043ce7e
issue854: remove unneeded files
2011-11-18 10:54:36 +08:00
minggo
a7d6c90adb
Merge pull request #571 from jbyu/master
...
fix memory-leak for lua engine
2011-11-17 18:53:14 -08:00
minggo
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
Phenix Yu
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
moadib
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
moadib
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
moadib
0ad5ec3557
fixed typo for win32 keypad testing ability
2011-09-22 10:27:10 +04:00
moadib
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
minggo
f61fde764b
fixed #703 : refactor Accelerometer
2011-08-31 17:14:29 +08:00
Phenix Yu
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
liswei
70e19d7245
fixed #347 fixed 'AddFontResource' path error!
2011-08-08 10:32:21 +08:00
minggo
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
liswei
bbc4bbeb6c
issue #347 lost [] in 'delete array'
2011-08-04 13:47:21 +08:00
liswei
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
yangws
59f37ddb5d
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
2011-06-27 10:55:45 +08:00
natural-law
49a4481473
fixed #323 , Remove the #include <map> in CCApplication_win32.cpp.
2011-06-21 12:01:59 +08:00
natural-law
960ef65f53
fixed #323 , Modify the implement of getCurrentLanguage method on win32.
2011-06-21 11:58:10 +08:00
natural-law
fae0498b3c
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-06-17 10:49:25 +08:00
natural-law
cfee246959
fixed #323 , Add an interface to get the current language.
2011-06-17 10:49:02 +08:00
yangws
19eaefab72
CCImage_win32 hasn't release font resource in Destructor.
2011-06-16 10:55:57 +08:00
liswei
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
unknown
97142d4a59
Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010
2011-05-19 21:11:29 +08:00
unknown
b940676cab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
2011-05-19 20:55:39 +08:00
natural-law
0466166935
[win32] fixed #492 , Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile().
2011-05-16 17:13:15 +08:00
yangws
aba77f4cae
issue #489 modified for vs2008.
2011-05-13 14:13:30 +08:00
minggo
e14040730b
fixed #455 : release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly
2011-05-06 17:46:19 +08:00
minggo
2c0bd49513
issue #455 : CCUserDefault ok on win32 & Android
2011-05-06 15:31:51 +08:00
yangws
f8dc140840
change CCLabelTTF accept string from gb2312 to utf8.
2011-04-27 18:19:47 +08:00
yangws
e895d9d073
TextInputTest compile ok on android and merge last master code.
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
2011-04-26 18:04:07 +08:00
Walzer
b3f76a81a4
[win32] issue #471 , CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice
2011-04-26 14:53:57 +08:00
natural-law
7337119501
issue #466 , Modify the interface to fit the refactor of CCFileUtils.
2011-04-25 09:40:10 +08:00
yangws
252f3efe1a
CCIMEDispatcher works on android.
2011-04-22 16:33:41 +08:00
yangws
d11bd85d00
CCTextFieldTTF works on win32.
2011-04-19 09:32:33 +08:00
yangws
b1ab937ec3
fix MouseEvent bug
2011-04-07 11:05:44 +08:00
yangws
7e81c56231
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
...
Conflicts:
cocos2dx/platform/ios/CCFileUtils_ios.mm
2011-03-30 11:05:23 +08:00
yangws
6c5cf577b7
issue #439 wophone and android modified.
2011-03-29 15:05:53 +08:00
yangws
041953151a
issue #439 CCFileData and imageWithImageFile modified on win32.
2011-03-29 11:41:44 +08:00
natural-law
1991a65b0b
Merge branch 'master' into iss391
...
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
2011-03-29 10:20:57 +08:00
walzer
6cc09aa4dc
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
2011-03-28 21:08:56 +08:00
natural-law
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
2011-03-28 17:06:32 +08:00
yangws
dceff2d179
issue #396 android modified.
2011-03-28 11:09:49 +08:00
yangws
4b86cec4be
issue #396 win32 modifyed.
2011-03-28 10:44:14 +08:00
natural-law
28a940ab57
issue #434,refactor class CCFileUtils on win32 and wophone.
2011-03-26 13:52:33 +08:00
yangws
2015e468ca
fixed #417 When mouse pressed, capture it in EGLView.
2011-03-26 11:34:18 +08:00
natural-law
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
yangws
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
minggo
15368e6169
Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373
2011-03-09 14:53:51 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
7aaf4be85f
move platform_support into cocos2dx/platform
2011-03-09 11:38:36 +08:00
yangws
151a0096fa
fixed #373 Hide PVRFrame window on win32.
...
Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.
2011-03-09 10:39:08 +08:00
minggo
1aafd4fc56
issue #375 : fix some compile error
2011-03-09 10:21:29 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
yangws
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
yangws
85b9c9ae21
Retina display support and scale with keep w/h rate ok on win32.
2011-02-18 18:30:22 +08:00
yangws
bc9bfdc30c
Move win32/CCXApplication to platform_support
2011-01-22 16:24:54 +08:00
yangws
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +08:00
walzer
9347fadc71
[win32] fixed #322 , FPS control on win32
2011-01-19 18:23:42 +08:00
yangws
d627608ff4
win32 platform fps limitation support.
2011-01-19 17:59:20 +08:00
yangws
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +08:00
yangws
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
natural-law
d1c6c466d3
fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32.
2011-01-12 15:48:36 +08:00
minggo
7e30615d02
issue #304 Remove codes for controlling frame rate.
2011-01-10 15:13:30 +08:00
minggo
a391c8ef99
fixed some errors for iphone platform
2011-01-07 10:25:32 +08:00
natural-law
e0570d43ad
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
2011-01-06 14:04:03 +08:00
minggo
b2b8591b26
fixed #279
2010-12-28 10:23:14 +08:00
yangws
6d71a5b0f2
if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk.
2010-12-18 15:00:26 +08:00
yangws
53bc90f634
fix UImage Constructor error
2010-12-17 18:16:31 +08:00
unknown
31951603a4
Fixed a memory leak in the Win32 version of the PNG reading code.
...
The png_info struct wasn't being properly free'd (leaving behind row data).
(looks like it might also apply to the 'uphone' version but I have no way of testing)
2010-12-16 12:23:27 +00:00
natural-law
b8b5c2e8cd
fixed #258 Modify the files which include FileUtils.h.
2010-12-14 14:05:35 +08:00
natural-law
4d98faabc5
fixed #226 add support read resource file from zip file in cocos2d-uphone
2010-11-29 10:49:43 +08:00
yangws
852c57d2c6
add CCLOG support on win32 and uphone
2010-11-23 18:20:46 +08:00
yangws
de97900b6c
CCLOG support for cocos2d-win32
2010-11-23 11:23:29 +08:00
natural-law
fc745a6a70
debug
2010-11-19 01:21:47 +00:00
Walzer
820c2f0714
issue #211 cocos2d-x back to cocos2dx
2010-11-18 15:01:42 +00:00
Walzer
b4328354af
issue #211 cocos2dx -> cocos2d-x
2010-11-18 14:07:17 +00:00
yangws
0618af9711
change win32 project name
2010-11-17 02:16:21 +00:00
Walzer
fb25984f12
rename getShared methods to shared
2010-11-16 07:12:09 +00:00
yangws
2e6f7c0623
issue #205 vs2008 run tests win32 OK.
2010-11-15 02:57:15 +00:00
yangws
278fc00906
issue #205 update third_party's libraries to the latest release version.
2010-11-13 10:19:08 +00:00
natural-law
a0930a2991
debug
2010-11-13 09:01:35 +00:00
Ming
416a319344
fixed #203
2010-11-13 03:34:49 +00:00
Walzer
916b620259
fixed #201 when load image fails, it will jump a MessageBox now, and return a transparent sprite
2010-11-12 07:55:28 +00:00
Walzer
d842a47e10
fix win32 version to sync with uphone-0.9.0-stable
2010-11-11 07:26:16 +00:00
natural-law
000bdeeb42
issue #189
...
add support of Accelerometer sensor
2010-11-10 08:29:52 +00:00
yangws
c792daec63
update PowerVR OGLES lib to version 2.0.27.0484
2010-11-04 03:59:29 +00:00
yangws
d630996bd0
fixed #187 The reason is call preMailLoop too many times in short time in message loop, use sleep(0) to resolve this problem.
2010-11-04 03:51:57 +00:00
Walzer
f80ea71066
fix #188 , for win32 version, make glDeleteTextrues before eglDestroyContext
2010-11-03 08:00:39 +00:00
Ming
b06f84d332
2010-11-03 06:13:40 +00:00
Ming
6853385c8d
resolve compile error for android
2010-11-03 02:59:07 +00:00
yangws
2ba7ba409b
fixed #184 support deviceOrientation on win32 now.
2010-10-15 08:06:05 +00:00
yangws
fb0987ae6c
fixed #183 add zlib1.dll for win32
2010-10-14 07:05:44 +00:00
yangws
c1225b9396
fixed #183 run test ok.
2010-10-13 06:46:06 +00:00
yangws
83ac66091d
2010-10-13 06:18:39 +00:00
yangws
3317280984
2010-10-13 06:15:11 +00:00
yangws
ebb4ae2aa7
issue #183 add iconv libjpeg libpng libxml2 zlib to win32/third_party
2010-10-13 06:12:23 +00:00
yangws
23808af094
win32 window close button enable.
2010-10-13 05:16:17 +00:00
yangws
c4e53c54e4
fixed #176 test_win32 OK.
2010-10-13 05:09:39 +00:00
yangws
e7502ad66f
Add PowerVR Lib to platform/win32/third_party.
2010-10-10 13:03:11 +00:00
yangws
8900e0644c
helloworld-win32 vertical screen ok.
2010-10-09 09:41:42 +00:00
yangws
cf0a2c5665
add cocos2dx-win32 framework, can't work yet.
2010-10-08 09:53:04 +00:00