minggo
|
194f47bc54
|
fixed #718: get button value from string.xml & add copyright for java codes
|
2011-09-15 14:17:07 +08:00 |
minggo
|
ea0455a0ba
|
Merge pull request #507 from minggo/iss718
fixed #718: fixed a typo error
|
2011-09-14 23:11:14 -07:00 |
minggo
|
61f2ab3cf2
|
fixed #718: fixed a typo error
|
2011-09-15 13:49:04 +08:00 |
minggo
|
aa6bfa3fdc
|
Merge pull request #506 from Macarse/linearLayoutIssue
Replaced LinearLayout with FrameLayout
|
2011-09-14 19:41:32 -07:00 |
Macarse
|
208bce312e
|
Replaced LinearLayout with FrameLayout
|
2011-09-13 20:25:07 -03:00 |
minggo
|
e7690b1eee
|
Merge pull request #505 from Macarse/externalStorage
External storage
|
2011-09-13 02:00:16 -07:00 |
Macarse
|
afd1a7a6d9
|
External storage
|
2011-09-13 05:42:34 -03:00 |
minggo
|
dcc5726665
|
Merge pull request #504 from minggo/iss715
fixed #715: make sure selected image is valid
|
2011-09-12 23:34:27 -07:00 |
minggo
|
bdb7cfdd71
|
fixed #715: make sure selected image is valid
|
2011-09-13 14:29:15 +08:00 |
minggo
|
d763cc3884
|
Merge pull request #503 from minggo/master
fixed #709: write doxygen comment in CCSet.h
|
2011-09-12 23:23:21 -07:00 |
minggo
|
8fbe6dcb3f
|
fixed #716: don't convert effect volume to int
|
2011-09-13 14:10:32 +08:00 |
minggo
|
e2315d92b5
|
fixed #709: write doxygen comment in CCSet.h
|
2011-09-13 09:31:54 +08:00 |
Walzer
|
05ee98f26e
|
in doxygen.cocos2d-x, set EXTRACT_ALL = YES, SKIP_FUNCTION_MARCOS = NO to export more functions & members, especially the properties in our property marcos
|
2011-09-13 08:55:38 +08:00 |
Walzer
|
8082b91c0e
|
fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730
|
2011-09-10 08:48:15 +08:00 |
laschweinski
|
8f5c327937
|
add all eclipse project files to the corresponding directory
|
2011-09-07 12:44:03 +08:00 |
laschweinski
|
310e79a491
|
delete the project configurations in base folder
|
2011-09-07 12:41:39 +08:00 |
minggo
|
ae056a07b1
|
Merge pull request #502 from minggo/iss686
fixed #686: set z tag of appended tile
|
2011-09-05 23:52:00 -07:00 |
minggo
|
e2bb1d49e5
|
fixed #686: set z tag of appended tile
|
2011-09-06 14:01:08 +08:00 |
minggo
|
8ccc3321a3
|
Merge pull request #500 from flyingpacer/renderendcrash
Renderendcrash
|
2011-09-05 20:52:50 -07:00 |
RongHong
|
53227073a7
|
fixed #696 to modify some end() usilization
|
2011-09-06 11:43:09 +08:00 |
RongHong
|
fea3da3156
|
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
|
2011-09-06 11:33:48 +08:00 |
minggo
|
6c6793c3cd
|
Merge pull request #501 from minggo/master
change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable
|
2011-09-05 19:58:25 -07:00 |
minggo
|
e69d16e7d6
|
change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable
|
2011-09-06 10:52:37 +08:00 |
RongHong
|
63bded4082
|
Merge branch 'master' into renderendcrash
|
2011-09-06 09:53:07 +08:00 |
RongHong
|
624e27497a
|
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
|
2011-09-06 09:51:35 +08:00 |
minggo
|
6bc5aab41b
|
Merge pull request #499 from minggo/iss707
make require works ok on android
|
2011-09-05 18:42:04 -07:00 |
minggo
|
a739dcbd6c
|
fixed #707: add Cocos2dxLuaLoader.cpp & Cocos2dxLuaLoader.h into vs2010 project
|
2011-09-05 18:11:10 +08:00 |
minggo
|
13017359c3
|
fixed #707: add search path for lua template
|
2011-09-05 17:58:30 +08:00 |
minggo
|
edb86b1154
|
issue #707: require works ok on iOS
|
2011-09-05 17:42:08 +08:00 |
minggo
|
d6cc12ffe4
|
issue #707: require works ok on android
|
2011-09-05 17:13:52 +08:00 |
minggo
|
86536c3683
|
issue #707: add lua loader on android
|
2011-09-05 16:14:51 +08:00 |
minggo
|
d86ce612c0
|
issue #707: add lua loader on android
|
2011-09-05 16:11:48 +08:00 |
laschweinski
|
91f8ed7eb4
|
CCParticleSystemPoint now derive from CCParticleSystemQuade in linux
|
2011-09-05 11:57:10 +08:00 |
laschweinski
|
717698bf65
|
fix some compiling mistake
|
2011-09-05 10:12:14 +08:00 |
laschweinski
|
1fc09448a4
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
Conflicts:
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/include/CCActionInstant.h
|
2011-09-04 14:38:53 +08:00 |
minggo
|
018036eb28
|
Merge pull request #498 from minggo/iss703
fixed #703: refactor Accelerometer
|
2011-08-31 18:30:22 -07:00 |
minggo
|
f61fde764b
|
fixed #703: refactor Accelerometer
|
2011-08-31 17:14:29 +08:00 |
Walzer
|
6347f878c2
|
fixed #662, SimpleAudioEngine::playEffect() assertion bug on marmalade
|
2011-08-31 16:35:40 +08:00 |
Walzer
|
a68fb803a0
|
Merge pull request #497 from walzer/master
add more languages to CCApplication::getCurrentLanguage() method
|
2011-08-30 23:21:38 -07:00 |
Walzer
|
1402350870
|
fixed #676, add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet.
|
2011-08-31 14:20:33 +08:00 |
minggo
|
ec7040f4b0
|
Merge pull request #496 from minggo/iss704
fixed #704
|
2011-08-30 20:56:49 -07:00 |
minggo
|
d42336df56
|
remove functions of AccelerometerKeep & AccelerometerDestroy declation
|
2011-08-31 11:34:45 +08:00 |
Walzer
|
cdd5911a36
|
Merge commit '8790401042a21da46aefa13a4461104673ba7d96'
|
2011-08-31 11:25:56 +08:00 |
minggo
|
e92bce5590
|
print error message & pop error code
|
2011-08-31 11:25:49 +08:00 |
minggo
|
8790401042
|
Merge pull request #491 from Menki/master
Feature #687 - add preloadBackgroundMusic and unloadBackgroundMusic to Android
|
2011-08-30 19:01:41 -07:00 |
Augusto Souza
|
28b1f317f4
|
Revert "First version of unloadBackgroundMusic for android - Feature #687"
This reverts commit a157b775f8 .
|
2011-08-30 09:30:12 -03:00 |
minggo
|
444a31b17b
|
Merge pull request #495 from liswei/issue702
fixed #702 tests crashs at the start on wophone device
|
2011-08-30 01:51:08 -07:00 |
liswei
|
dd90e8ce86
|
issue #702 add invalid point judgement
|
2011-08-30 16:40:57 +08:00 |
liswei
|
c8619240c4
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702
|
2011-08-30 16:39:13 +08:00 |
liswei
|
ab2a6cb2bb
|
fixed #702 tests crashs at the start on wophone device
|
2011-08-30 15:59:06 +08:00 |