dumganhar
|
240aa4c077
|
add russian language support
|
2011-11-01 23:32:26 +08:00 |
dumganhar
|
cf3cecc108
|
revert to normal version
|
2011-11-01 23:02:26 +08:00 |
Eli Yukelzon
|
132a4cf7ef
|
Update AUTHORS
|
2011-11-01 13:43:52 +02:00 |
dumganhar
|
cff6437b76
|
revert to normal ccLanguageType
|
2011-11-01 17:12:39 +08:00 |
Leon
|
8ea6df0ee3
|
Merge remote-tracking branch 'upstream/master'
|
2011-10-31 23:58:24 -07:00 |
Leon
|
785b79d263
|
fix compile errors under ubuntu 11.10
|
2011-10-31 23:50:08 -07:00 |
minggo
|
209a25e549
|
Merge pull request #556 from leon-li/master
Fix compile error on 64 bit Linux. Fix some warnings.
|
2011-10-31 21:49:01 -07:00 |
dumganhar
|
6bdf46cb00
|
fixed a bug in sort.c
|
2011-11-01 11:32:46 +08:00 |
YuLei Liao
|
ce0b17adec
|
Merge remote-tracking branch 'upstream/master'
|
2011-10-31 23:16:28 +08:00 |
dumganhar
|
f43530c010
|
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
Conflicts:
CocosDenshion/proj.bada/sdk1.0/.cproject
CocosDenshion/proj.bada/sdk2.0/.cproject
cocos2dx/platform/bada/CCApplication_bada.cpp
|
2011-10-31 09:34:40 +08:00 |
dumganhar
|
853126036d
|
add ogg source for cocosDenshion project
|
2011-10-29 15:38:15 +08:00 |
dumganhar
|
fd90641c49
|
merge testf branch
|
2011-10-29 14:47:13 +08:00 |
dumganhar
|
8562bca706
|
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
|
2011-10-29 14:22:41 +08:00 |
Walzer
|
3227e64240
|
add CC_PROPERTY_READONLY_PASS_BY_REF & CC_PROPERTY_PASS_BY_REF marco into preprocessor of doxygen configs.
|
2011-10-28 23:25:17 +08:00 |
Leon
|
59939218f5
|
add 64 bit fmodex for Linux
|
2011-10-28 15:43:44 +08:00 |
Leon
|
b7f0385a2b
|
bundle 64 bit linux static libs
|
2011-10-28 12:19:26 +08:00 |
Leon
|
1b42b1d801
|
Merge remote branch 'upstream/master'
|
2011-10-28 11:37:02 +08:00 |
minggo
|
2c14402107
|
fixed #776: merge pull request and remove unneeded codes
|
2011-10-28 09:46:19 +08:00 |
dumganhar
|
d061e8323d
|
modify project configure
|
2011-10-27 19:22:14 +08:00 |
dumganhar
|
5db8a24389
|
fixed one issue in cocosdenshion
|
2011-10-26 18:38:27 +08:00 |
Leon
|
ff5c179ff9
|
Merge remote-tracking branch 'upstream/master'
|
2011-10-26 16:16:41 +08:00 |
dumganhar
|
8987591aad
|
Merge branch 'bada' into FishGameBada
|
2011-10-25 17:54:15 +08:00 |
dumganhar
|
a8f91669ce
|
modify CocosDenshion/proj.bada/sdk1.0/.badaprj
|
2011-10-25 17:53:39 +08:00 |
dumganhar
|
55d2e95845
|
modify project configure
|
2011-10-25 17:49:50 +08:00 |
dumganhar
|
dd73456576
|
Merge branch 'bada' into f
|
2011-10-25 17:40:20 +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
|
cd2b3a5131
|
if exist Classes, not copy files
|
2011-10-25 11:01:21 +08:00 |
dumganhar
|
cd9f76c024
|
modify bat file
|
2011-10-25 10:53:33 +08:00 |
dumganhar
|
2fc9861721
|
remove bat files
|
2011-10-24 18:38:04 +08:00 |
dumganhar
|
4318440463
|
add create-bada-project.bat
|
2011-10-24 18:36:32 +08:00 |
dumganhar
|
146d3e1536
|
modify project config
|
2011-10-24 14:22:09 +08:00 |
dumganhar
|
bf4cbbdd35
|
use shared lib for cocosdenshion
|
2011-10-24 14:21:46 +08:00 |
dumganhar
|
1c31a1cd24
|
rename HelloWorld.png to Mainmenu.png
|
2011-10-24 14:18:16 +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 |
laschweinski
|
e53649ccaa
|
add a member function to get key string of a texture.
|
2011-10-22 19:39:31 +08:00 |
laschweinski
|
5589335d3a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
|
2011-10-22 19:27:35 +08:00 |
laschweinski
|
04633242ba
|
fix a bug in audio player
|
2011-10-22 19:10:50 +08:00 |
dumganhar
|
c5b97d70e1
|
add __pAudioOut = null in construction function
|
2011-10-21 09:50:30 +08:00 |
dumganhar
|
eb901be664
|
project config change
|
2011-10-21 09:49:57 +08:00 |
Walzer
|
350d42c105
|
update authors, use the format of "real name (nickname)"
|
2011-10-21 09:34:02 +08:00 |
dumganhar
|
da794c1613
|
Merge branch 'master' into bada
|
2011-10-21 09:28:29 +08:00 |
dumganhar
|
2dde865c37
|
Merge branch 'master' into bada
|
2011-10-20 21:27:22 +08:00 |
Leon
|
5c4a3c3fda
|
Merge remote branch 'upstream/master'
|
2011-10-20 18:34:10 +08:00 |
dumganhar
|
fdbb989ce5
|
make sdk1.2 to sdk1.0
|
2011-10-20 18:31:10 +08:00 |
Walzer
|
8179d79061
|
update ChangeLog & Authors for v0.9.2
|
2011-10-20 17:49:43 +08:00 |
Walzer
|
c561737fb7
|
add CC_PROPERTY_READONLY & CC_PROPERTY marco into doxygen.cocos2d-x PREDEFINED field. Thanks to Ningyu Ran's contribution http://www.cocos2d-x.org/boards/6/topics/4620
|
2011-10-20 17:49:29 +08:00 |
Walzer
|
b0be69e26e
|
merge HelloLua modifications & updates into xcode4 template for lua.
|
2011-10-20 15:56:51 +08:00 |