Ricardo Quesada
1bd4f75fa3
Merge pull request #5051 from ricardoquesada/copyright
...
Adds missing copyright headers in some files
2014-01-13 14:48:45 -08:00
Ricardo Quesada
6eed3a2b27
Adds missing copyright headers in some files
2014-01-13 14:48:12 -08:00
Ricardo Quesada
a94a68771c
Merge pull request #5049 from ricardoquesada/node_camera_fixes
...
Camera and Node fixes
2014-01-13 12:54:33 -08:00
Ricardo Quesada
f2c3d2f3ae
Camera and Node fixes
...
OrbitCamera: added getters (public). Setters moved from `protected` to `public
: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
: Setters receives `kmVec3` as well. Old API is still supported
Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
Instead, once the additional transform is set, in order to remove it the user needs to pass
the identity matrix
2014-01-13 12:52:07 -08:00
Ricardo Quesada
be39eee5ea
Merge pull request #5048 from darkdukey/improveProjectCreator
...
Improve project creator
2014-01-13 12:00:24 -08:00
Nite Luo
37522c61c3
Make the ui look a bit better
2014-01-13 11:54:33 -08:00
Nite Luo
2e127f819b
Add Polish the labels for project creator ui
2014-01-13 11:37:44 -08:00
Dhilan007
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
James Chen
cc55be4f1a
Merge pull request #5045 from Dhilan007/develop_crash
...
closed #3676 : fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero.
2014-01-12 23:36:25 -08:00
Dhilan007
d7593fd0f0
fix wrong judgments of conditional compilation.
2014-01-13 11:24:49 +08:00
Dhilan007
fd11791389
add a blank line at the file end.
2014-01-13 10:37:31 +08:00
Dhilan007
34a79a02e7
fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero.
2014-01-13 10:32:34 +08:00
James Chen
831e8e60b0
Merge pull request #5042 from Dhilan007/develop_crash
...
fix compiling error on win after adding `fd_set` in CCConsole.h.
2014-01-12 18:14:37 -08:00
James Chen
5dedd085c8
Merge pull request #5032 from heliclei/develop
...
rename ghprb.py to pull-request-builder.py
2014-01-12 17:43:40 -08:00
Pisces000221
09f23c1bcb
Corrected a few mistakes in project-creator README
2014-01-12 14:38:09 +08:00
Dhilan007
d11bfeb8d4
fix compiling error on win
2014-01-12 11:02:48 +08:00
Dhilan007
b2038d14d6
update lua binding configuration for label.
2014-01-11 22:55:23 +08:00
Dhilan007
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
martell
23cf748534
Added x64 support for Windows - CCExtensions
2014-01-11 12:31:04 +00: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
heliclei
b4a4b70e22
rename ghprb.py to pull-request-builder.py
2014-01-10 17:45:28 +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