dumganhar
|
5a984bcc29
|
Merge branch 'master_base' into box2d2.2.1
|
2011-11-28 18:32:38 +08:00 |
dumganhar
|
3442d17dbe
|
fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
|
2011-11-28 18:05:38 +08:00 |
dumganhar
|
cad4ff05f3
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
|
2011-11-28 15:43:13 +08:00 |
Walzer
|
ab7db20809
|
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
|
2011-11-26 17:20:12 +08:00 |
dumganhar
|
10f5082a83
|
update box2d to version2.2.1
|
2011-11-25 18:30:27 +08:00 |
minggo
|
bd595516b8
|
issue #781: add new functions for sound
|
2011-11-25 09:56:06 +08:00 |
dumganhar
|
e87b00db67
|
add pthread support for bada 1.0
|
2011-11-24 17:26:04 +08:00 |
dumganhar
|
07da67f253
|
Merge branch 'master' into master_base
Conflicts:
cocos2dx/menu_nodes/CCMenu.cpp
|
2011-11-24 11:52:16 +08:00 |
dumganhar
|
2bd49545fa
|
add bada1.0 pthread support
|
2011-11-24 00:07:50 +08:00 |
dumganhar
|
035d7326db
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-11-23 21:43:40 +08:00 |
minggo
|
6aedc258b4
|
fixed #838: tests and HelloLua support x86
|
2011-11-23 15:51:30 +08:00 |
minggo
|
8b20639d75
|
issue #838: HelloWorld support x86
|
2011-11-23 11:02:18 +08:00 |
minggo
|
bc60ed7856
|
issue #854: optimize CCTextureCache::addImageAsync()
|
2011-11-22 16:47:24 +08:00 |
minggo
|
efa9275d7f
|
save the codes for testing
|
2011-11-21 12:04:21 +08:00 |
minggo
|
d48da20b0f
|
synchrolize to master
|
2011-11-18 18:53:53 +08:00 |
U-zhangxm-PC\zhangxm
|
d84b6c25be
|
issue #223: merge bada branch and fix some error
|
2011-11-18 18:45:05 +08:00 |
minggo
|
775c7ff847
|
Merge pull request #573 from minggo/iss854_pthread
support pthread
|
2011-11-17 18:40:30 -08:00 |
minggo
|
0676714436
|
issue #854: add TextureCacheTest into makefile
|
2011-11-17 18:32:52 -08:00 |
minggo
|
522386a6b7
|
issue #854: pthread work ok on iOS
|
2011-11-18 09:55:47 +08:00 |
minggo
|
81b8fc0ce8
|
fixed #854: fix a bug of CCTextureCache
|
2011-11-17 14:34:41 +08:00 |
minggo
|
cb75465913
|
issue #854: add test case for CCTextureCache
|
2011-11-17 10:10:13 +08:00 |
minggo
|
dd8a2deeaf
|
fixed #758: fix the bug that TTF fonts cause low memory on android
|
2011-11-16 11:40:24 +08:00 |
dumganhar
|
0d6ea61b76
|
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
|
2011-11-07 18:18:10 +08:00 |
dumganhar
|
e9a2818d0d
|
use wvga setting, add SYSTEM_SERVICE
|
2011-11-02 01:11:06 +08:00 |
dumganhar
|
012052b089
|
modify project configure
|
2011-10-25 14:32:26 +08:00 |
dumganhar
|
4b653c89d1
|
modify project configure
|
2011-10-25 14:12:42 +08:00 |
dumganhar
|
146d3e1536
|
modify project config
|
2011-10-24 14:22:09 +08:00 |
dumganhar
|
2c87e5e17e
|
use default manifest.xml
|
2011-10-24 11:01:39 +08:00 |
dumganhar
|
3aef823bd5
|
rename sdk1.2 to sdk1.0
|
2011-10-24 11:00:11 +08:00 |
dumganhar
|
59a14973ef
|
change splash and icon to cocos2d
|
2011-10-24 10:54:08 +08:00 |
dumganhar
|
eb901be664
|
project config change
|
2011-10-21 09:49:57 +08:00 |
dumganhar
|
da794c1613
|
Merge branch 'master' into bada
|
2011-10-21 09:28:29 +08:00 |
dumganhar
|
fdbb989ce5
|
make sdk1.2 to sdk1.0
|
2011-10-20 18:31:10 +08:00 |
Walzer
|
67bbbb2800
|
1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name
2. fixed a tiny bug, FontTest can show font name on the top correctly
|
2011-10-20 14:56:39 +08:00 |
Walzer
|
707e22a2c8
|
fixed bug #754, particle test crashes on ios 4.3.3 & 5.0. Adding "fonts' into Resoures as "group" instead of "folder" cause this bug, but it can work on 4.3 and lower version.
|
2011-10-19 22:20:13 +08:00 |
Walzer
|
e3c39fe835
|
fixed #753, visual orientation is wrong on ios5 simulator
|
2011-10-19 21:43:25 +08:00 |
minggo
|
8aa014d3cd
|
Merge pull request #558 from minggo/iss755
fixed #743
|
2011-10-19 05:05:23 -07:00 |
minggo
|
2490388f28
|
remove unneeded packages
|
2011-10-19 20:03:18 +08:00 |
minggo
|
68d03de677
|
fixed #743: let nativeInit() get correct screensize when running on device with software android buttons
|
2011-10-19 19:55:23 +08:00 |
minggo
|
7e8e7c7e87
|
Merge pull request #557 from minggo/iss755
fixed #755
|
2011-10-19 02:03:19 -07:00 |
minggo
|
2d3bfd4a1a
|
fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices
|
2011-10-19 17:01:35 +08:00 |
minggo
|
e9c133351d
|
Merge pull request #554 from minggo/master
make script more strongable
|
2011-10-18 23:27:56 -07:00 |
minggo
|
cc1c29c0ca
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x
|
2011-10-18 23:21:53 -07:00 |
minggo
|
3a17163897
|
make script more strongable
|
2011-10-18 23:21:39 -07:00 |
Walzer
|
ae411f9503
|
fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h
|
2011-10-18 17:41:19 +08:00 |
dumganhar
|
3c4c4e515a
|
modify project settings
|
2011-10-18 11:11:09 +08:00 |
minggo
|
43d64360cf
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x
|
2011-10-17 14:22:53 +08:00 |
minggo
|
1ccfcc1e94
|
change effect file
|
2011-10-17 14:22:10 +08:00 |
minggo
|
9a834585bb
|
modify the path to relative path in project setting
|
2011-10-16 20:53:48 -07:00 |
minggo
|
80cd3266df
|
make HelloWorld and tests work ok on linux with eclipse
|
2011-10-16 02:21:17 -07:00 |