Dhilan007
|
d11bfeb8d4
|
fix compiling error on win
|
2014-01-12 11:02:48 +08:00 |
Ricardo Quesada
|
71ad9d7dd4
|
Merge pull request #5038 from CocosRobot/updategeneratedsubmodule_1389415140
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-10 20:39:23 -08:00 |
CocosRobot
|
b10783972f
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-11 04:39:03 +00:00 |
Ricardo Quesada
|
0c3fe76529
|
Merge pull request #5037 from ricardoquesada/director_delegate
Director delegate
|
2014-01-10 20:33:41 -08:00 |
Ricardo Quesada
|
95568648c9
|
Console Enabled by default on TestCpp
|
2014-01-10 20:32:39 -08:00 |
Ricardo Quesada
|
f4a99d0627
|
Removes DirectorDelegate
|
2014-01-10 20:26:15 -08:00 |
Ricardo Quesada
|
db15e11acd
|
Merge pull request #5036 from CocosRobot/updategeneratedsubmodule_1389413211
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-10 20:12:21 -08:00 |
CocosRobot
|
f76fcf7f2a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-11 04:06:53 +00:00 |
Ricardo Quesada
|
d4993877eb
|
Merge pull request #5035 from ricardoquesada/console_fixes
Console fixes
|
2014-01-10 20:01:55 -08:00 |
Ricardo Quesada
|
b870180af6
|
Mmmm... what?
removing useless debug message
|
2014-01-10 19:26:03 -08:00 |
Ricardo Quesada
|
c88f81481b
|
JSB compiles OK
|
2014-01-10 19:22:04 -08:00 |
Ricardo Quesada
|
dbcf5021a6
|
Compiles on Linux
|
2014-01-10 19:10:35 -08:00 |
Ricardo Quesada
|
9386866d56
|
cocos2d::log() moved to CCConsole
Unified console code since it is 90% similar to all platforms
|
2014-01-10 19:04:07 -08:00 |
Ricardo Quesada
|
c68ad76bfe
|
don't send "unknown command".
... if the command is an empty command
|
2014-01-10 18:11:35 -08:00 |
Ricardo Quesada
|
2316e4d55f
|
Debug messages are forward to the console
|
2014-01-10 17:58:54 -08:00 |
Ricardo Quesada
|
2a6b9fe08e
|
Console is a property of Director.
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
|
2014-01-10 17:11:14 -08:00 |
minggo
|
a013565420
|
Merge pull request #5023 from dabingnn/develop_layerColorBugForShaderChange
fix layerColor bug for shader change
|
2014-01-10 06:26:49 -08:00 |
James Chen
|
245fa2efe0
|
Update CHANGELOG [ci skip]
|
2014-01-10 15:19:32 +08:00 |
James Chen
|
4d873edff1
|
Update AUTHORS [ci skip]
|
2014-01-10 15:15:19 +08:00 |
James Chen
|
0088399d94
|
Merge pull request #5016 from akof1314/develop
Support MinGW with CMake for TestCpp
|
2014-01-09 23:13:19 -08:00 |
WuHuan
|
16367b7594
|
solve conflicted with math.h isnan
|
2014-01-10 14:20:00 +08:00 |
James Chen
|
1ed6e07375
|
Merge pull request #5026 from CocosRobot/updategeneratedsubmodule_1389323651
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 19:16:38 -08:00 |
CocosRobot
|
8b350cb20a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-10 03:14:18 +00:00 |
James Chen
|
6ebfa19064
|
Merge pull request #5019 from nutty898/develop_nutty_modify_framework_fixedupdatebugs
Develop nutty modify framework fixedupdatebugs
|
2014-01-09 19:06:51 -08:00 |
CaiWenzhi
|
ca5667cb7c
|
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
|
2014-01-10 10:46:30 +08:00 |
Huabing.Xu
|
a1629a09e8
|
fix layerColor bug for shader change
|
2014-01-10 10:03:47 +08:00 |
Ricardo Quesada
|
af733ce9b5
|
Merge pull request #5022 from ricardoquesada/camera_fixes
Camera fixes
|
2014-01-09 14:27:27 -08:00 |
Ricardo Quesada
|
95b7196a2a
|
Adds more tests cases for Node
Adds more tests cases for Node
|
2014-01-09 14:26:36 -08:00 |
Ricardo Quesada
|
1dc169b19f
|
Camera is working again
Projection is passed in the shader.
Since P is in the shader, QuadCommand uses `Vec3Transform` instead of `Vec3TransformCoord` since it is faster.
|
2014-01-09 14:26:22 -08:00 |
Ricardo Quesada
|
d13612ef32
|
Improves description in camera test
|
2014-01-09 11:38:44 -08:00 |
Ricardo Quesada
|
e8ea39127a
|
Merge pull request #5021 from ricardoquesada/node_test
Adds a new test that shows the problem with the Camera
|
2014-01-09 09:32:37 -08:00 |
WuHuan
|
f87af9e998
|
fix linux build
|
2014-01-09 19:49:11 +08:00 |
James Chen
|
02a0f2daed
|
Merge pull request #5018 from dumganhar/iss3644-keyevent
closed #3644: Keyboard pressed events are being repeatedly fired before keyboard is released.
|
2014-01-09 03:25:01 -08:00 |
CaiWenzhi
|
c3b7a9645a
|
Fixed bugs of "anchor point" and "update"
|
2014-01-09 19:00:47 +08:00 |
WuHuan
|
2f4b094598
|
Merge pull request #4 from cocos2d/develop
update
|
2014-01-09 02:56:21 -08:00 |
CaiWenzhi
|
13f1fdd79d
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 18:45:49 +08:00 |
James Chen
|
2e4c76a5d7
|
closed #3644: Keyboard pressed events are being repeatedly fired before keyboard is released.
|
2014-01-09 18:34:35 +08:00 |
James Chen
|
2ce23dca2a
|
Merge pull request #5015 from samuele3hu/developNewUI
closed #3643:Lua websocket can't receive more than 64 bytes of data
|
2014-01-09 02:12:49 -08:00 |
James Chen
|
d08bb221a4
|
Merge pull request #5013 from dumganhar/linux-clang
[travis ci] Adding clang build for linux.
|
2014-01-09 02:01:10 -08:00 |
minggo
|
dfcd0872ed
|
Merge pull request #5006 from dabingnn/develop_layerColorDepthTestOccludeBugcase
Add Test Case: LayerColor should not occlude sprites and labels when dep...
|
2014-01-09 01:59:16 -08:00 |
WuHuan
|
4dbb0ee1e8
|
mingw console
|
2014-01-09 17:48:37 +08:00 |
James Chen
|
4b4dc16030
|
Exports CC and CXX for gcc and clang.
|
2014-01-09 17:48:08 +08:00 |
James Chen
|
488d1d6109
|
Merge pull request #5014 from CocosRobot/updategeneratedsubmodule_1389259028
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 01:28:31 -08:00 |
James Chen
|
c0195015c3
|
updates CC and CCX env variables
|
2014-01-09 17:26:33 +08:00 |
samuele3hu
|
8826659cf1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-09 17:24:37 +08:00 |
samuele3hu
|
2cbe502113
|
issue #3643:Lua websocket can't receive more than 64 bytes of data
|
2014-01-09 17:23:22 +08:00 |
CaiWenzhi
|
c3b2a99be6
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 17:17:52 +08:00 |
CocosRobot
|
c60681c556
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 09:17:11 +00:00 |
James Chen
|
f14bbd59c9
|
Adding clang build for travis ci.
|
2014-01-09 17:16:09 +08:00 |
James Chen
|
ffdfcfbefb
|
Update CHANGELOG [ci skip]
|
2014-01-09 17:13:34 +08:00 |