dumganhar
|
6d7baa9684
|
add platform files for qnx
|
2011-12-06 17:19:36 +08:00 |
dumganhar
|
520e3365c1
|
modify some project settings
|
2011-12-06 16:17:49 +08:00 |
dumganhar
|
dfbf2c0cdb
|
add tests project for blackberry
|
2011-12-06 15:03:14 +08:00 |
dumganhar
|
bfdb908d01
|
add Cocos2dx project
add HelloWorld project and rename proj.blackberry fold to proj.qnx
|
2011-12-06 14:56:37 +08:00 |
minggo
|
d97e1b705f
|
Merge pull request #607 from dualface/fix-xcode4-template
* fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground()
|
2011-12-05 19:46:14 -08:00 |
YuLei Liao
|
443656f88c
|
* fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground()
|
2011-12-06 10:51:12 +08:00 |
dumganhar
|
5408fd1ee7
|
add CocosDenshion project for blackberry
|
2011-12-06 10:34:09 +08:00 |
dumganhar
|
f28793ace6
|
add chipmunk project for blackberry
|
2011-12-06 10:04:08 +08:00 |
dumganhar
|
a3ace6f20d
|
modify some box2d source files for blackberry
|
2011-12-06 09:51:58 +08:00 |
dumganhar
|
791f384e4f
|
add blackberry box2d project
|
2011-12-06 09:50:24 +08:00 |
YuLei Liao
|
df8231362c
|
* add callback support for lua-llthreads
|
2011-12-05 22:10:29 +08:00 |
YuLei Liao
|
a99b2f0675
|
* add Lua llthreads
|
2011-12-05 19:09:24 +08:00 |
YuLei Liao
|
010a386338
|
* add CCApplication, CCFileUtils to Lua support
|
2011-12-05 13:57:43 +08:00 |
YuLei Liao
|
e22dff0469
|
* add Lua CJSON module
|
2011-12-05 13:56:51 +08:00 |
YuLei Liao
|
fb4582b9fd
|
* add TOLUA_RELEASE macro
|
2011-12-05 11:38:38 +08:00 |
Walzer
|
70d5a088f1
|
fixed #887, define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7
|
2011-12-04 20:18:17 +08:00 |
YuLei Liao
|
442e06e62e
|
* add CCNode:getPositionLua(), return CCPoint
|
2011-12-04 11:35:55 +08:00 |
YuLei Liao
|
ffe54c4ce5
|
* add more Lua property for CCNode, CCSprite
|
2011-12-04 10:57:20 +08:00 |
YuLei Liao
|
f0e5cd9896
|
* add Lua property support for CCNode
|
2011-12-04 10:28:20 +08:00 |
YuLei Liao
|
c51ec32daa
|
Merge remote-tracking branch 'upstream/master'
|
2011-12-02 20:46:21 +08:00 |
Walzer
|
e14a3f52ad
|
changelog of 0.10.0
|
2011-12-02 10:36:58 +08:00 |
YuLei Liao
|
cf12806558
|
merge luafix-0.9.2
|
2011-12-01 22:02:16 +08:00 |
YuLei Liao
|
f860edc744
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2011-12-01 22:00:21 +08:00 |
minggo
|
e71044fce3
|
Merge pull request #606 from dumganhar/master
Add two license files used for bada port
|
2011-12-01 04:15:13 -08:00 |
dumganhar
|
9b36298ccf
|
add two license used for bada port
|
2011-12-01 19:26:03 +08:00 |
minggo
|
75d40c2e98
|
Merge pull request #603 from dumganhar/master_base
modify helloworld .cproject, use xcopy /y /s to copy resource
|
2011-12-01 01:28:46 -08:00 |
minggo
|
262d17d010
|
Merge pull request #604 from minggo/master
fixed #854: cache texture on android
|
2011-12-01 01:06:38 -08:00 |
minggo
|
f0e80b32f4
|
fixed #854: cache texture on android
|
2011-12-01 17:04:56 +08:00 |
dumganhar
|
d71b467ca5
|
modify helloworld .cproject, use xcopy /y /s to copy resource
|
2011-12-01 17:02:11 +08:00 |
Walzer
|
014286cf36
|
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
|
2011-12-01 17:01:04 +08:00 |
Walzer
|
21af60ee9c
|
update xcode4 templates
|
2011-12-01 17:00:30 +08:00 |
YuLei Liao
|
fe7f810096
|
* make CCEase* working for CCNode:runAction()
|
2011-12-01 16:55:21 +08:00 |
minggo
|
2f6fb5b189
|
Merge pull request #602 from minggo/master
change file structure in xcode view
|
2011-12-01 00:28:17 -08:00 |
minggo
|
d92bdcc40d
|
change file structure in xcode view
|
2011-12-01 16:27:11 +08:00 |
YuLei Liao
|
2d9e8f065b
|
* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()
|
2011-12-01 14:58:39 +08:00 |
minggo
|
e5fb91198b
|
Merge pull request #601 from dumganhar/master_base
fix a bug in ZwoptexTest.
|
2011-11-30 22:39:08 -08:00 |
dumganhar
|
6973525319
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
|
2011-12-01 14:19:07 +08:00 |
dumganhar
|
ef8e34f9a1
|
fix a bug in ZwoptexTest.
step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.
|
2011-12-01 14:15:10 +08:00 |
minggo
|
ec70d1d240
|
Merge pull request #600 from dumganhar/master_base
fix a bug in IntervalTest
|
2011-11-30 22:05:07 -08:00 |
dumganhar
|
f02ce4b15a
|
fix a bug in IntervalTest
|
2011-12-01 13:56:20 +08:00 |
minggo
|
34d10fb3db
|
Merge pull request #598 from dumganhar/master_base
DemoModernArt test crash on bada
|
2011-11-30 20:45:36 -08:00 |
minggo
|
ed030139b8
|
Merge pull request #599 from minggo/master
make SimpleAudioEngine::setEffectVolume() take effect immediately
|
2011-11-30 20:45:12 -08:00 |
minggo
|
cddaa3fea2
|
fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android
|
2011-12-01 12:12:14 +08:00 |
dumganhar
|
bdddc188aa
|
fix a bug that DemoModernArt crash on bada
|
2011-12-01 12:04:43 +08:00 |
minggo
|
b6b92944d6
|
Merge pull request #597 from minggo/master
fixed #580: update Box2d for vs2010
|
2011-11-30 18:09:33 -08:00 |
minggo
|
ea9cd75e67
|
fixed #580: update Box2d for vs2010
|
2011-12-01 10:08:15 +08:00 |
YuLei Liao
|
6ebf801be2
|
Merge branch 'refs/heads/luafix-0.9.2'
|
2011-11-30 21:55:49 +08:00 |
YuLei Liao
|
0874a38baa
|
* update README
|
2011-11-30 21:55:40 +08:00 |
YuLei Liao
|
f3e654056c
|
* fix merge error 2
|
2011-11-30 21:50:00 +08:00 |
YuLei Liao
|
25f1cf16fd
|
* fix merge error 1
|
2011-11-30 21:47:23 +08:00 |