minggo
|
49f1518893
|
fix a bug when compile in android
|
2011-06-14 15:43:45 +08:00 |
natural-law
|
214e86a5b6
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
|
2011-06-14 15:05:52 +08:00 |
natural-law
|
489fb7824b
|
fixed #524, Parse the special format of plist files.
|
2011-06-14 14:53:00 +08:00 |
minggo
|
a7a22e528b
|
remove the usage of NDController
|
2011-06-14 14:46:39 +08:00 |
minggo
|
9c49e27bf1
|
add extensions & tools directory
|
2011-06-14 14:31:25 +08:00 |
minggo
|
0f19c30921
|
remove redifine functions
|
2011-06-14 11:32:01 +08:00 |
minggo
|
4d8b2c284c
|
support lua
|
2011-06-14 11:08:39 +08:00 |
minggo
|
8003de7468
|
update to latest code and merge
|
2011-06-14 11:01:38 +08:00 |
minggo
|
23362964bb
|
Merge pull request #293 from liswei/master
fixed #516
|
2011-06-13 19:42:56 -07:00 |
Walzer
|
176dc46d9b
|
[ios] fixed #398, rename install-templates-xcode3.sh to install-templates-xcode4.sh, do the magic of xcode4 template in it.
|
2011-06-13 21:09:06 +08:00 |
Walzer
|
362ab18c97
|
issue #398, xcode4 template for box2d & chipmunk
|
2011-06-13 20:35:39 +08:00 |
Walzer
|
ac9c735cb5
|
issue #398, add template_generator.py & generator shell script, add box2d/chipmunk/cocosdenshion ctemplate
|
2011-06-13 18:20:57 +08:00 |
liswei
|
eeeba67e9e
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-13 17:00:46 +08:00 |
liswei
|
91326028ec
|
fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)
|
2011-06-13 16:58:55 +08:00 |
Walzer
|
220b89c321
|
issue #398, add resources required by helloworld template
|
2011-06-13 14:32:50 +08:00 |
Walzer
|
a308196868
|
issue #398, cocos2d-x only template for xcode is ok now. hura!
|
2011-06-13 14:31:25 +08:00 |
Walzer
|
3b7d82eed7
|
add gitignore for xcode4
|
2011-06-13 13:47:01 +08:00 |
Walzer
|
93b61bb544
|
Merge remote branch 'origin/master'
|
2011-06-11 23:35:06 +08:00 |
Walzer
|
3ca208d30a
|
issue #398, one more step on xcode4 template. But the new project still has compilation errors.
|
2011-06-11 23:34:46 +08:00 |
Walzer
|
37a40caa8d
|
Merge pull request #292 from liswei/master
#512 fix warnings in /Wall flag
|
2011-06-11 08:33:31 -07:00 |
Walzer
|
9266be444b
|
issue #398, add xcode4 templates, semi-finished.
|
2011-06-11 16:53:48 +08:00 |
liswei
|
52623d2549
|
Merge branch 'waring512'
|
2011-06-10 17:52:11 +08:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
Walzer
|
409260c002
|
fix typo in changelog
|
2011-06-09 17:08:20 +08:00 |
Walzer
|
f600846d4b
|
Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp
|
2011-06-08 11:08:29 +08:00 |
RongHong
|
67eb87abfe
|
To fix the crash when the gles version is too low
|
2011-06-08 10:02:07 +08:00 |
RongHong
|
a13e8ae859
|
1.修正gles版本过低时会崩溃的问题
2.修正unscheduleAllSelectors()中遍历哈希表导致崩溃的问题
|
2011-06-03 15:22:50 +08:00 |
Walzer
|
de80caaec5
|
Merge pull request #289 from liswei/master
fixed #521
|
2011-06-02 19:57:24 -07:00 |
liswei
|
49410a2a07
|
Merge branch 'XXX'
|
2011-06-03 10:52:19 +08:00 |
liswei
|
54780b8cb7
|
fixed #521, Fix the effect of PageTurn3D.
|
2011-06-03 10:51:21 +08:00 |
Walzer
|
97afafd856
|
Merge remote branch 'origin/master'
|
2011-06-02 22:26:53 +08:00 |
Walzer
|
3cba64679c
|
add std::string CCString::toStdString() method
|
2011-06-02 22:26:38 +08:00 |
Walzer
|
2759bff33a
|
Merge pull request #288 from minggo/iss518
fixed #518: fix a bug that use tHashSelectorEntry in wrong way
|
2011-06-02 02:03:26 -07:00 |
minggo
|
4f20deff30
|
fixed #518: fix a bug that use tHashSelectorEntry in wrong way
|
2011-06-02 10:07:17 +08:00 |
minggo
|
83e1e0ebd1
|
tests run ok when it don't enable lua
|
2011-06-01 20:29:05 +08:00 |
minggo
|
a8b6b850de
|
use precompile macro to cantrol if enable lua support
|
2011-06-01 17:51:08 +08:00 |
minggo
|
dedbd638d3
|
lua runs ok on Android
|
2011-06-01 14:35:28 +08:00 |
minggo
|
6fe559ad02
|
remove hello.lua, the file is changed to HelloWorld/Resource
|
2011-05-31 15:40:59 +08:00 |
minggo
|
5f5dc0a04b
|
HelloWorld with lua works ok on ios
|
2011-05-31 15:39:54 +08:00 |
minggo
|
fe8fcb0b00
|
invode lua registerred tick
|
2011-05-31 14:49:47 +08:00 |
minggo
|
0d27381cdd
|
format the file
|
2011-05-31 14:49:05 +08:00 |
minggo
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
minggo
|
0b851e5fe8
|
Merge pull request #287 from yangws/master
Text input on android OK now.
|
2011-05-30 02:43:03 -07:00 |
yangws
|
de977bc6c2
|
use 0 replace NULL
|
2011-05-30 16:49:08 +08:00 |
yangws
|
7e2d1d5c48
|
fixed #490 Text input on android use a different way, TextInputTest OK now.
|
2011-05-30 16:36:12 +08:00 |
Walzer
|
a5c9b8631c
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-05-30 14:23:35 +08:00 |
Walzer
|
608e6961c8
|
changelog for 0.8.4
|
2011-05-30 14:22:49 +08:00 |
Walzer
|
58a63f7ec0
|
[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.
|
2011-05-30 14:14:19 +08:00 |
Walzer
|
c790fba340
|
avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution!
|
2011-05-27 16:26:59 +08:00 |
Walzer
|
11c401e3ea
|
[ios] setDepthTest(false) for EffectsTest
|
2011-05-26 21:01:16 +08:00 |