Walzer
|
850f23d295
|
update doxygen configs for 0.8.5
|
2011-07-01 07:52:05 +08:00 |
minggo
|
d490bd983e
|
Merge pull request #337 from natural-law/master
fixed #551
|
2011-06-29 20:08:51 -07:00 |
minggo
|
12f816687d
|
Merge pull request #336 from liswei/master
update wophone setup project (such as helloworld,tests)
|
2011-06-29 20:08:01 -07:00 |
natural-law
|
f7e31bac17
|
fixed #551, Add project dependence for project liblua. And set the WorkingDirectory of project HelloLua in VS2010.
|
2011-06-30 10:55:38 +08:00 |
minggo
|
2a39fe0aa4
|
Merge pull request #335 from minggo/iss547
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 19:46:25 -07:00 |
liswei
|
39fb944297
|
update wophone setup project (such as helloworld,tests)
|
2011-06-30 09:36:51 +08:00 |
minggo
|
e53fad8da2
|
Merge pull request #331 from minggo/iss546
[iOS] fixed #546
|
2011-06-29 00:51:14 -07:00 |
minggo
|
0f002b112d
|
Merge pull request #334 from liswei/issue545
fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
|
2011-06-29 00:50:53 -07:00 |
minggo
|
6c47f53b13
|
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 15:45:30 +08:00 |
liswei
|
b23409a942
|
fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
reset glOrthof param value in wophone
|
2011-06-29 15:24:04 +08:00 |
minggo
|
bb90fbfb1e
|
[iOS] fixed #546: CCLabelTTF:initWithString() will crash when the height is 0
|
2011-06-28 15:24:58 +08:00 |
Walzer
|
b72641608c
|
update changelog for 0.8.5
|
2011-06-28 14:45:32 +08:00 |
Walzer
|
3e92c7dcac
|
Merge pull request #330 from yangws/master
fixed #544 #543
|
2011-06-27 23:40:05 -07:00 |
yangws
|
9d4c4b5cb6
|
delete some unused codes.
|
2011-06-28 14:37:06 +08:00 |
yangws
|
0dec97a303
|
fixed #544 The bug reaised by CCGrid render texture in another FBO.
|
2011-06-28 14:32:59 +08:00 |
Walzer
|
7761ab374c
|
changelog for 0.8.5
|
2011-06-28 14:04:05 +08:00 |
minggo
|
e8853583df
|
Merge pull request #329 from minggo/master
Fix some bug
|
2011-06-27 18:23:26 -07:00 |
minggo
|
7099b24ccb
|
Merge pull request #326 from liswei/issue521
issue #521 set depthtest value for true ,then set depthtest value for false
|
2011-06-27 18:20:10 -07:00 |
minggo
|
a99b31d831
|
Merge pull request #327 from natural-law/master
Add Lua support for the win32 new project template.
|
2011-06-27 18:19:16 -07:00 |
minggo
|
f290f8f9a7
|
Merge pull request #328 from yangws/master
compile ok on vs2010
|
2011-06-27 18:18:47 -07:00 |
natural-law
|
082726f107
|
Update the win32 template code as same as the HelloLua project.
|
2011-06-27 17:15:50 +08:00 |
yangws
|
c56dd6e747
|
delete a log output using printf in AppDelegate.cpp
|
2011-06-27 17:08:03 +08:00 |
yangws
|
3b6265aa58
|
Compile ok on vs2010
|
2011-06-27 17:02:58 +08:00 |
natural-law
|
adfd992616
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-27 16:47:36 +08:00 |
natural-law
|
6649987955
|
Add Lua support for the win32 new project template.
|
2011-06-27 16:45:52 +08:00 |
minggo
|
5e15545dbd
|
[Android] fix an error when string is
|
2011-06-27 16:01:25 +08:00 |
liswei
|
bb59728543
|
issue #521 set depthtest value for true ,then set depthtest value for false
|
2011-06-27 15:34:26 +08:00 |
minggo
|
686b9ae179
|
fix the test title
|
2011-06-27 15:22:55 +08:00 |
minggo
|
ad8a545541
|
Merge pull request #325 from natural-law/master
fixed #542
|
2011-06-27 00:04:47 -07:00 |
natural-law
|
739d6d30e5
|
Modify the vcproj files to build liblua & HelloLua projects with release configuration.
|
2011-06-27 14:11:29 +08:00 |
natural-law
|
72f17ecbdf
|
fixed #542, Record the volume user specified though the background music is not playing.
|
2011-06-27 11:43:27 +08:00 |
minggo
|
7ca759470c
|
Merge pull request #324 from yangws/master
Wrap glScissor in CCEGLVIew::setScissorInPoints.
|
2011-06-26 20:09:43 -07:00 |
yangws
|
59f37ddb5d
|
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
|
2011-06-27 10:55:45 +08:00 |
Walzer
|
bf99245dbb
|
hide the xcode4 template generator script into tools folder
|
2011-06-25 14:20:10 +08:00 |
Walzer
|
4b7513a46e
|
[android] roll back to use dynamic link in tempalte.
|
2011-06-25 14:13:08 +08:00 |
Walzer
|
688131c958
|
[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests
|
2011-06-25 12:11:40 +08:00 |
Walzer
|
3db735de73
|
[android] load dynamic libaries in HelloLua.java
|
2011-06-25 11:58:13 +08:00 |
Walzer
|
fbcb3806d9
|
[android] HelloLua use shared link with other libraries
|
2011-06-25 11:57:34 +08:00 |
Walzer
|
00568c229a
|
[android] back to shared library link
|
2011-06-25 11:21:16 +08:00 |
Walzer
|
70b4d701d3
|
fixed #538, xcode template for cocos2d-x lua project
|
2011-06-24 21:25:51 +08:00 |
Walzer
|
fa671c4c0d
|
Merge remote branch 'origin/master'
|
2011-06-24 21:04:00 +08:00 |
Walzer
|
e606027b59
|
fixed #528, Lua can get the CCTouch array in callback function; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now.
|
2011-06-24 21:03:33 +08:00 |
Walzer
|
8f4b20391e
|
Merge pull request #322 from minggo/iss538
[Android] modify android template to work on new codes
|
2011-06-24 03:02:17 -07:00 |
minggo
|
a02f7c75d9
|
[Android] modify android template to work on new codes
|
2011-06-24 17:24:01 +08:00 |
Walzer
|
49b98d2057
|
Merge remote branch 'origin/master'
|
2011-06-24 17:00:29 +08:00 |
Walzer
|
a88aa00526
|
improve HelloLua, rename images, add error msg in LuaEngine, refactor hello.lua, add RootViewController. issue #540 #528
|
2011-06-24 17:00:14 +08:00 |
minggo
|
ea0bf7cdd2
|
Merge pull request #321 from minggo/iss538
[iOS] fixed #538: add template of lua for xcode3
|
2011-06-24 01:23:20 -07:00 |
minggo
|
42ce3c2649
|
Merge pull request #320 from minggo/master
[Android] Totally fix the problem of drawing text
|
2011-06-24 00:39:54 -07:00 |
minggo
|
5677e74813
|
[iOS] fixed #538: add template of lua for xcode3
|
2011-06-24 15:35:00 +08:00 |
minggo
|
e8fda66ccc
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-24 13:55:52 +08:00 |