James Chen
8623d206f0
Merge pull request #3364 from dumganhar/carlomorgantinizynga-new_develop_merge
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342 , some more clean up (code review)
2013-08-04 22:44:03 -07:00
James Chen
c61da90441
Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 13:40:59 +08:00
James Chen
e73529b082
Merge pull request #3362 from dumganhar/carlomorgantinizynga-new_develop_merge
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342 , New (experimental) label TTF
2013-08-04 22:39:20 -07:00
James Chen
e08b319726
issue #2170 : [JSB] Label is abstract class now.
2013-08-05 12:49:57 +08:00
James Chen
ea10032b24
issue #2170 : Adding missing libs for Android.
2013-08-05 11:43:43 +08:00
James Chen
9a9ffaeb4d
issue #2170 : A typo fix.
2013-08-05 11:33:59 +08:00
James Chen
b52732cc6b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 11:27:46 +08:00
James Chen
b8a7a4291f
Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 11:26:34 +08:00
James Chen
a979d6c6d3
Merge pull request #3340 from azmeuk/emscripten-fix
...
Fixed emscripten build error.
2013-08-04 20:22:34 -07:00
James Chen
eaabd93051
issue #2170 : Fixing compilaction errors on Emscripten.
2013-08-05 11:10:12 +08:00
James Chen
a2fbf0c2b8
issue #2179 : Fixing compilation errors on Linux.
2013-08-05 10:29:20 +08:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
Éloi Rivard
00c8cf62a5
Fixed emscripten build error.
2013-08-04 16:30:33 +02:00
minggo
1aadf55b59
Merge pull request #3355 from minggo/iss2434-refactor_androidmk
...
closed #2434 : simply Android.mk
2013-08-03 08:33:14 -07:00
minggo
456b5af872
closed #2434:fixed path
2013-08-03 23:12:10 +08:00
carlo morgantini
73286ad76b
some more clean up (code review)
2013-08-02 16:11:20 -07:00
James Chen
1becefefef
Merge pull request #3356 from dumganhar/iss2469-windows-path2
...
closed 2469:LabelTest and TileMapTest crash on windows.
2013-08-02 03:02:17 -07:00
minggo
9cba2c42c1
closed #2434 : simply Android.mk
2013-08-02 17:33:27 +08:00
James Chen
0db8b2bbf3
closed #2469:LabelTest and TileMapTest crash on windows.
2013-08-02 17:31:19 +08:00
James Chen
53f4f1dab6
Merge pull request #3352 from CocosRobot/updategeneratedsubmodule_1375411584
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-02 00:09:33 -07:00
James Chen
c1d715b778
Adding windows support for New Label.
2013-08-02 15:01:27 +08:00
James Chen
67d710a41c
Adding Android support for new label.
2013-08-02 13:46:26 +08:00
minggo
ae3af70594
[ci skip]
2013-08-02 11:38:07 +08:00
minggo
5d4aa7bc6d
[ci skip]
2013-08-02 11:34:36 +08:00
CocosRobot
a6279367d5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-02 02:46:30 +00:00
James Chen
f7b9d887bc
Update AUTHORS [ci skip]
2013-08-02 10:45:41 +08:00
James Chen
85661c976c
Merge pull request #3346 from nakosung/develop
...
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
2013-08-01 19:41:11 -07:00
성낙호
0883723c71
added cc.RemoveSelf
2013-08-02 10:59:16 +09:00
성낙호
c9077961e8
fix for undefined protocol
2013-08-02 10:35:45 +09:00
minggo
26af301776
[ci skip]
2013-08-02 09:26:42 +08:00
minggo
503199b764
Merge pull request #3349 from timothyqiu/path-issue
...
A better way to locate project creator
2013-08-01 18:25:10 -07:00
minggo
5e03b9b29d
Merge pull request #3347 from timothyqiu/docfix
...
More documentation fixes
2013-08-01 18:22:43 -07:00
carlo morgantini
833a45d1af
Some more clean up
2013-08-01 17:54:08 -07:00
carlo morgantini
08d8179a0e
Clean up (see code review)
2013-08-01 17:49:51 -07:00
carlo morgantini
4904e0f31f
Clean up (as requested by code review)
2013-08-01 17:08:57 -07:00
carlo morgantini
6cac521d1b
fix some more problems with the new label stuff (as for code review)
2013-08-01 16:29:39 -07:00
carlo morgantini
f30ec5f428
(not used) global variables removed form CCFontAtlas.cpp
2013-08-01 15:55:46 -07:00
carlo morgantini
972ae78295
Clean up for the new Label stuff
2013-08-01 11:02:32 -07:00
Timothy Qiu
4cb4a9e10a
Use script dir instread of current dir.
2013-08-01 23:18:12 +08:00
Timothy Qiu
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
Timothy Qiu
bc10c2a01f
Change some doc due to the change of source code.
...
Fixed some incorrect use of doxygen command.
2013-08-01 17:47:37 +08:00
minggo
077acb7814
Merge pull request #3343 from dabingnn/Iss2423-TargetAction-Reverse
...
Iss2423 target action reverse
2013-08-01 02:25:38 -07:00
Timothy Qiu
f0ee1e62c0
Fixes tag typos: deprecatd -> deprecated
2013-08-01 17:09:23 +08:00
Timothy Qiu
88e11cab84
Surround code in document with code/endcode tags.
2013-08-01 16:57:42 +08:00
성낙호
f0ab05f9e7
undefined argument should not be counted as a valid argument
2013-08-01 17:52:39 +09:00
Timothy Qiu
978fc634be
Use C++ code in C++ comments.
...
Removed Hungarian notation from parts of the code.
2013-08-01 16:40:56 +08:00
James Chen
163157d827
Merge pull request #3345 from thp/develop-qt5-fixes
...
Qt 5: Build fixes for Qt 5 platform
2013-08-01 00:46:29 -07:00
Thomas Perl
6f967fc107
Qt 5: Build fixes for Qt 5 platform
...
Recent changes to the develop branch broke Qt 5 support.
2013-08-01 09:20:17 +02:00
James Chen
08807cb5f5
Merge pull request #3344 from malvim/develop
...
Fixing typo in create-multi-platform-projects.py
2013-07-31 19:42:58 -07:00