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
9a67fa6df1
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-10 17:16:15 +08:00
natural-law
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
yangws
3fc701f1d2
fixed #300 Cocos2d-win32 application wizard for vs ok.
2011-03-10 12:00:29 +08:00
minggo
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
natural-law
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
minggo
12981fac89
fixed #375
2011-03-09 16:19:20 +08:00
minggo
75e2ecc16d
issue #387 : move platform_support into cocos2dx/platform
2011-03-09 14:40:05 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
f1d13ca2e1
issue #375 : android compiled ok
2011-03-08 13:49:58 +08:00
minggo
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
aaf898cb72
merge master into dev
2011-03-07 09:52:45 +08:00
minggo
69edcb16af
fix a mergeing bug
2011-03-04 17:17:53 +08:00
minggo
661bae2797
merge natural-law-iss370
2011-03-04 16:32:54 +08:00
minggo
8e2f9c96b8
remove unneeded files
2011-03-04 16:22:53 +08:00
natural-law
aef83b2660
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
2011-03-02 17:45:04 +08:00
yangws
395a0b3d47
AtlasTest rename to LabelTEst on win32.
2011-03-02 17:34:26 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
minggo
f58d2f8b32
[andriod] fixed #247 : support multitouch on android
2011-03-02 10:40:02 +08:00
minggo
0a5ec4c12b
[android] move MultiTouchController.java to cocos2dx/lib/touch
2011-03-02 10:34:49 +08:00
minggo
f7b401163b
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
2011-03-02 09:38:23 +08:00
minggo
e00222104f
merge yangws-issue360 into dev
2011-03-02 09:31:47 +08:00
minggo
89b4d07ed8
[android] fixed #368 : move Application code to cocos2dx/platform/ccxApplication
2011-03-01 19:53:39 +08:00
yangws
b54de8a3ef
fixed #360 Modify CCXAppWiz for win32, add initInstance function in class AppDelegate
2011-03-01 14:28:39 +08:00
minggo
b65d84551b
resolve confict when merging branch yangws-issue366
2011-03-01 14:08:18 +08:00
yangws
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
minggo
1b6602f582
Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android
2011-02-28 10:00:55 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00
minggo
498e0072e1
[android] fixed #358 : autoscale HVGA resource to WVGA
2011-02-26 15:52:57 +08:00
minggo
1428480c7f
[android] fixed #338:refactor platform_support
2011-02-25 13:35:27 +08:00
natural-law
6c54eb0a86
Update the tests from 0.99.4 to 0.99.5.
2011-02-25 11:31:49 +08:00
yangws
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
natural-law
949c1000a8
update tests to 0.99.5.
2011-02-23 16:47:25 +08:00
Macarse
b52eed0782
blah
2011-02-22 22:32:24 -03:00
yangws
4d47babf9e
add ; after NS_CC_BEGIN
2011-02-19 18:16:45 +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
245155e66a
[uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device.
2011-02-18 10:44:49 +08:00
Macarse
c6f4eab602
typo
2011-02-17 23:44:14 -03:00
Macarse
43a437a978
fixed small error
2011-02-17 23:28:17 -03:00
Macarse
4267593bf9
Used an array approach
2011-02-17 23:23:36 -03:00
natural-law
0a2ceee2c5
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev
2011-02-12 17:24:41 +08:00
minggo
043d771f1a
Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev
2011-02-12 17:23:50 +08:00
natural-law
20409e7a58
delete the code for debug in cocos2d-android.
2011-02-12 17:20:13 +08:00
natural-law
8fcb9d017c
delete the code for debug in cocos2d-android.
2011-02-12 17:18:25 +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
Macarse
24c4a477e3
Fixed issue for tests
2011-02-11 00:48:46 -03:00
Macarse
e1dfb21dd4
Added logic for POINTER_UP and POINTER_DOWN
2011-02-06 19:02:03 -03:00