Rohan Kuruvilla
8035562dfa
Adding Eclipse Project files in template directory for new Javascript projects
2013-03-04 11:50:38 -08:00
Rohan Kuruvilla
53be6102f4
Adding Eclipse Project files for C++ projects
2013-03-04 11:50:38 -08:00
James Chen
da0aadefe4
Merge pull request #2086 from lgb/master
...
Updating build-win32.bat, go back to root foler after executing this script.
2013-03-04 05:54:55 -08:00
James Chen
288f8ced59
Update AUTHORS
2013-03-04 11:16:11 +08:00
James Chen
52feaad12f
Merge pull request #2084 from young40/master
...
fixed #1761 : Implementing setVisible() for CCEditBox.
2013-03-03 19:10:20 -08:00
minggo
96c5be91e3
Merge pull request #2076 from sbc100/cocos_nacl
...
Native Client port
2013-03-03 18:24:04 -08:00
James Chen
f8f64e9987
Merge pull request #2095 from dumganhar/master
...
fixed #1760 : Redefinition of cpufeatures module.
2013-03-03 18:08:50 -08:00
James Chen
71589e68ee
fixed #1760 : Redefinition of cpufeatures module.
2013-03-04 10:08:02 +08:00
minggo
160536d4f2
Merge pull request #2090 from jsambuo/linux-audio-getEffectsVolume-fix
...
SimpleAudioEngine::getEffectsVolume() returns bgm volume on linux
2013-03-03 17:34:13 -08:00
jsambuo
54a582b3da
fixing issue with SimpleAudioEngine::getEffectsVolume() for linux
...
SimpleAudioEngine::getEffectsVolume() was returning the background music volume when run on linux.
2013-03-03 11:55:51 -05:00
Oleg Baluk
e09775ae91
return to current directory after run
2013-03-03 16:38:25 +04:00
Oleg Baluk
b8c97b7637
echo messages
2013-03-03 16:36:45 +04:00
Oleg Baluk
1eaad1417f
trim
2013-03-03 16:34:55 +04:00
young40
43e7917463
add setVisible() to CCEditBox [Win32]
2013-03-03 20:13:22 +08:00
young40
882a6761b6
add setVisible() to CCEditBox [Android]
2013-03-03 20:08:50 +08:00
young40
933d316dc4
add setVisible() to CCEditBox [ios & mac]
2013-03-03 18:58:51 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
Sam Clegg
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
Zhe Wang
7469fcf033
Fix typo in AUTHORS
...
Jianfeng Zhou (NetGragon) -> Jianfeng Zou (NetDragon)
2013-03-02 22:14:09 +08:00
minggo
867077205d
Merge pull request #2080 from biteforest/master
...
fix compile error with xcode on case-sensitive file system.
2013-03-02 05:00:42 -08:00
Bite
85fd30aacf
fix compile error when run xcode on case-sensive file system.
2013-03-02 18:15:05 +08:00
minggo
473538f6a8
Merge pull request #2074 from minggo/iss1686-synchronize
...
issue #1686:add () in defining a macro in RenderTextureTest.cpp
2013-03-01 02:38:27 -08:00
minggo
163ab2c0be
issue #1686:add () in defining a macro in RenderTextureTest.cpp
2013-03-01 18:37:37 +08:00
minggo
de808f6b58
Merge pull request #2073 from minggo/iss1686-synchronize
...
Fix some errors in TestCpp
2013-03-01 02:17:17 -08:00
minggo
370fe7d937
issue #1686:fixed a logical error in CCLabelBMFont
2013-03-01 18:15:20 +08:00
minggo
f7802a0794
Merge pull request #2072 from yuezang/iss1425-luatest
...
issue #1425 : exist lua test case is ok.
2013-03-01 01:17:15 -08:00
minggo
8c80210007
issue #1686:not invoke CCLayer::init() in LayerTest to enable receiving touch messages
2013-03-01 17:11:02 +08:00
wangshuai
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
minggo
008e2b0257
Merge pull request #2071 from CocosRobot/updategeneratedsubmodule_1362126622
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 00:58:17 -08:00
CocosRobot
bc159f1ba7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 16:30:34 +08:00
minggo
0dfab6744a
issue #1686:use correct values to initialize CCNodeRGBA member variables
2013-03-01 16:14:10 +08:00
minggo
69867e689e
Merge pull request #2070 from minggo/iss1686-synchronize
...
Iss1686 synchronize
2013-02-28 23:54:42 -08:00
minggo
df56a2e3ec
issue #1686 : invoke sceneOrder() in CCTransitionScene::initWithDuration()
2013-03-01 15:30:40 +08:00
minggo
3e7e9ead5d
issue #1686:add getInnerAction to CCEaseAction
2013-03-01 14:08:23 +08:00
minggo
fb7642a332
issue #1686:change font size and fix a small bug in ActionTest
2013-03-01 11:25:40 +08:00
minggo
061c20d2b9
Merge https://github.com/cocos2d/cocos2d-x into iss1686-synchronize
2013-03-01 11:14:28 +08:00
minggo
27b62952a4
issue #1686:draw polygon in CCFollowAction test case
2013-03-01 11:12:23 +08:00
James Chen
b151f0d0cf
Merge pull request #2067 from CocosRobot/updategeneratedsubmodule_1362107063
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-28 19:10:40 -08:00
CocosRobot
bee13bd7d5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 11:04:33 +08:00
James Chen
b05a4e6acc
Merge pull request #2066 from dumganhar/master
...
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini. Removing some deprecated functions.
2013-02-28 19:03:23 -08:00
James Chen
e4b5ee97b0
Updated cocos2dx.ini.
2013-03-01 10:58:16 +08:00
James Chen
65f19f5c53
Removing some deprecated functions.
2013-03-01 10:57:52 +08:00
James Chen
501a2612cb
tab ~> 4 spaces .
2013-03-01 10:45:07 +08:00
James Chen
7093807f3f
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
2013-03-01 10:41:06 +08:00
minggo
7d0eafa42c
Merge pull request #2065 from minggo/iss1686-synchronize
...
issue #1686:fix some compiling error
2013-02-28 17:52:45 -08:00
minggo
7c8bb82c67
issue #1686:fix some compiling error
2013-03-01 09:51:42 +08:00
James Chen
c4d0ae211f
Merge pull request #2064 from CocosRobot/updategeneratedsubmodule_1362101459
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-28 17:36:54 -08:00
CocosRobot
86891fb15f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 09:31:09 +08:00
minggo
514799db73
Merge pull request #2063 from minggo/iss1686-synchronize
...
Synchronize to cocos2d-iphone v2.1rc0a
2013-02-28 17:28:28 -08:00
minggo
6a1c28f85c
Merge pull request #2062 from jpridavok/master
...
Flush
2013-02-28 17:18:48 -08:00