yangws
|
7bc7d32001
|
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
|
2011-03-01 12:41:57 +08:00 |
natural-law
|
4362a5f381
|
[uphone]issue #316,Resolution auto adjustment.
|
2011-02-19 17:44:43 +08:00 |
natural-law
|
60e9ae873c
|
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
|
2011-02-19 10:19:14 +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 |
natural-law
|
8035fc366c
|
[uphone]Support read image file from zip file.
|
2011-02-17 16:16:50 +08:00 |
natural-law
|
e4063fd190
|
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
|
2011-02-17 14:31:52 +08:00 |
yangws
|
8458476597
|
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
.gitignore
|
2011-02-12 16:42:47 +08:00 |
minggo
|
81848f19e6
|
Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345
|
2011-02-12 11:29:27 +08:00 |
walzer
|
7e039fbaa1
|
[win32] add CCX_DLL to CCLayerGradient & CCTimer
|
2011-02-11 17:30:11 +08:00 |
minggo
|
eef0bd4578
|
[iphone] fixed bug #345: remove init invoking
|
2011-02-11 16:06:09 +08:00 |
yangws
|
36d68eeb41
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
|
2011-02-11 09:34:12 +08:00 |
Macarse
|
66038230eb
|
Added logic to disable sensors from the c++ code
|
2011-02-05 20:17:24 -03:00 |
Macarse
|
284c330569
|
Added code from walzer's comment
|
2011-02-01 00:11:42 -03:00 |
Macarse
|
fce540989d
|
First approach
|
2011-01-30 20:05:30 -03:00 |
natural-law
|
d0b27c4222
|
fix bug,MenuTest crash.
|
2011-01-28 16:05:21 +08:00 |
yangws
|
34a6ca5208
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
|
2011-01-28 14:33:47 +08:00 |
yangws
|
76ea63da7f
|
Change prefix CCX to ccx.
|
2011-01-27 17:07:36 +08:00 |
walzer
|
3260eddd75
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-01-26 17:11:39 +08:00 |
walzer
|
ead71525e2
|
[uphone] don't block when zip resources loading failed
|
2011-01-26 17:08:19 +08:00 |
minggo
|
a0ecaed1ef
|
[android] define s_bPopupNotify
|
2011-01-26 16:45:27 +08:00 |
minggo
|
54dc660f6b
|
[android] change the declaration of s_bPopupNotify from public to private
|
2011-01-26 16:44:58 +08:00 |
minggo
|
39165142b8
|
[iphone] change the declaration of s_bPopupNotify from public to private and define it
|
2011-01-26 16:44:12 +08:00 |
minggo
|
31d287a77d
|
[uphone]change the declaration of s_bPopupNotify from public to private
|
2011-01-26 16:42:48 +08:00 |
minggo
|
072ed1651e
|
[win32] change the declaration of s_bPopupNotify from public to private
|
2011-01-26 16:41:59 +08:00 |
walzer
|
a732665b85
|
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
|
2011-01-26 15:48:02 +08:00 |
natural-law
|
3746af1d63
|
fixed #328.Modify the function and parameter name.
|
2011-01-26 15:43:12 +08:00 |
natural-law
|
7015e85918
|
fixed #328.By default,pop up a err dialog when loading textures failed.
|
2011-01-26 11:50:13 +08:00 |
walzer
|
950a284b94
|
[iphone] fixed #289, clear a warning.
|
2011-01-26 11:31:01 +08:00 |
minggo
|
9e2587c26c
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-01-25 17:09:11 +08:00 |
natural-law
|
6a1b8d64aa
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-01-25 15:09:34 +08:00 |
natural-law
|
d56575dd5a
|
[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.
|
2011-01-25 14:26:26 +08:00 |
walzer
|
04aab22145
|
Merge branch 'natural-law-master'
|
2011-01-25 11:43:57 +08:00 |
walzer
|
462ac4823f
|
bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422
|
2011-01-25 11:33:03 +08:00 |
natural-law
|
800033d98b
|
fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.
|
2011-01-24 15:53:52 +08:00 |
minggo
|
9eff0da20a
|
fix warning when building on android
|
2011-01-24 10:51:30 +08:00 |
yangws
|
1a17f3ea55
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
|
2011-01-22 17:52:06 +08:00 |
minggo
|
e23c1eb2f6
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-01-22 16:45:26 +08:00 |
yangws
|
bc9bfdc30c
|
Move win32/CCXApplication to platform_support
|
2011-01-22 16:24:54 +08:00 |
minggo
|
4a4c0d3485
|
[android] fixed #321: Frame control of android. It is not so accuracy.
|
2011-01-22 15:10:18 +08:00 |
minggo
|
9d8f0f4b17
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-01-21 18:18:13 +08:00 |
minggo
|
882b473291
|
[iphone]: font support
|
2011-01-21 18:15:12 +08:00 |
natural-law
|
48d1791341
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
|
2011-01-21 17:33:43 +08:00 |
minggo
|
cb7a0e553a
|
[iphone]: frame control
|
2011-01-21 17:33:15 +08:00 |
natural-law
|
6bde512cbe
|
[android]issue #268,support more fonts on cocos2d-android.
|
2011-01-21 17:32:11 +08:00 |
walzer
|
8c47a5b254
|
fix bug in CGRect::CGRectIntersectsRect(..) method, CGGeometry.cpp, according to this solution http://www.cocos2d-x.org/boards/6/topics/387
|
2011-01-21 08:54:45 +08:00 |
natural-law
|
31fc6c0039
|
[uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground().
|
2011-01-20 13:55:45 +08:00 |
natural-law
|
f7107fb015
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
Conflicts:
cocos2dx/platform/uphone/CCXApplication_uphone.h
|
2011-01-20 13:47:01 +08:00 |
natural-law
|
3d225465c0
|
[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.
|
2011-01-20 13:41:58 +08:00 |
walzer
|
dc11bdf16a
|
Merge remote branch 'origin/master'
|
2011-01-20 11:41:41 +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 |