Michael Contento
b7173cd60d
add Sprite::setScale(float, float)
2013-11-06 14:42:31 +01:00
James Chen
40c663f963
Merge pull request #4116 from dumganhar/cmake-option
...
issue #3113 : [Linux] Adding options for modules.
2013-11-06 03:36:53 -08:00
James Chen
d6d041f561
issue #3113 : [Linux] Adding options for modules.
2013-11-06 19:17:34 +08:00
James Chen
bec1ce929c
Merge pull request #4114 from CocosRobot/updategeneratedsubmodule_1383730712
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 02:37:23 -08:00
CaiWenzhi
e765eb1e7a
Test commit
2013-11-06 18:30:09 +08:00
CaiWenzhi
7163dd4d76
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-06 18:13:51 +08:00
minggo
b30494cc4f
[ci skip]
2013-11-06 18:07:03 +08:00
minggo
8c0ab2d489
[ci skip]
2013-11-06 18:05:02 +08:00
minggo
3deb3b4231
[ci skip]
2013-11-06 17:52:03 +08:00
CocosRobot
8a836dc477
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 09:38:34 +00:00
minggo
cba013736a
Merge pull request #3733 from 2youyouo2/develop
...
fix setcolor
2013-11-06 01:31:27 -08:00
CaiWenzhi
94896b5b74
Modify mk files
2013-11-06 17:20:14 +08:00
2youyou2
3ea0d2f12d
change override function
2013-11-06 16:37:30 +08:00
2youyou2
73e5310bf6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:29:54 +08:00
CaiWenzhi
12570b5e8f
temp commit
2013-11-06 16:20:01 +08:00
CaiWenzhi
7a207431cd
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
...
Conflicts:
cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
2youyou2
fcf0b1ef5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:06:37 +08:00
James Chen
9ed5b406f2
Merge pull request #4112 from CocosRobot/updategeneratedsubmodule_1383724833
...
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
2013-11-06 00:05:48 -08:00
CaiWenzhi
e0aa82da13
Merge master branch to develop branch
2013-11-06 16:04:06 +08:00
CocosRobot
d990699417
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 08:00:35 +00:00
James Chen
ba8b4866e2
Update AUTHORS [ci skip]
2013-11-06 15:57:57 +08:00
James Chen
9d3716e964
Merge pull request #4109 from HoGarfield/JS_Call
...
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
2013-11-05 23:56:03 -08:00
boyu0
6c27a0df0b
issue #2771 : make api more friendly
2013-11-06 15:43:29 +08:00
garfield_ho
f36fd002cd
Remove duplicate
2013-11-06 15:40:23 +08:00
2youyou2
efd8f62992
add virtual
2013-11-06 15:40:06 +08:00
James Chen
dff6a99117
Merge pull request #4108 from dumganhar/64bit-fix
...
[Linux] compilation fix for PR #4099[ci skip]
2013-11-05 23:39:48 -08:00
garfield_ho
f6070406cd
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
2013-11-06 15:31:58 +08:00
James Chen
2e80e95a37
[Linux] compilation fix for PR #4099
2013-11-06 15:26:33 +08:00
2youyou2
12d6bc1722
1. change CCARRAY_FOREACH to range-based loop
2013-11-06 15:25:44 +08:00
James Chen
4e4798fdcc
Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix
2013-11-06 15:15:47 +08:00
James Chen
33a243155f
Merge pull request #4107 from dumganhar/cmake
...
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-05 23:09:23 -08:00
James Chen
f3c40a3e7a
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-06 14:54:35 +08:00
boyu0
a01fcc6f36
issue #2771 : move header definition to first line
2013-11-06 14:51:56 +08:00
boyu0
75dd32cde9
issue #2771 : fix physics test compile error
2013-11-06 14:34:27 +08:00
James Chen
0192c4f042
Merge pull request #4104 from CocosRobot/updategeneratedsubmodule_1383718814
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 22:29:27 -08:00
CocosRobot
d7ed908818
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 06:20:17 +00:00
minggo
c32628e930
[ci skip]
2013-11-06 14:19:08 +08:00
minggo
a416a6b258
Merge pull request #4102 from ricardoquesada/uses_string
...
Uses `const std::string&`
2013-11-05 22:14:27 -08:00
2youyou2
f05c1590ae
1.fix particle kCCPositionTypeFree state bug
2013-11-06 11:20:16 +08:00
James Chen
135e509037
Merge pull request #4101 from dumganhar/cmake-copy-file
...
issue #3113 : Updating CMakeLists.txt, Improve Copying files.
2013-11-05 19:19:51 -08:00
Ricardo Quesada
555f3609c8
Uses `const std::string&`
...
... instead of const char*
* Because it is more robust
* and it is faster... yes faster.
It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.
It is faster to have everthing in std::string as soon as possible to
prevent further conversions.
There are still some parts of the code that require conversion, but
most of the code was converted.
2013-11-05 19:02:03 -08:00
James Chen
c364c4f083
issue #3113 : Updating CMakeLists.txt, Improve Copying files.
2013-11-06 10:57:36 +08:00
Luis Parravicini
8b1d3af720
added | operator for Control::EventType
2013-11-05 23:55:24 -03:00
minggo
2b551732f0
Merge pull request #4097 from hannon235/fix-android-nativeactivity-amd-support
...
[android] update nativeactivity.cpp to work with changes made in commit ...
2013-11-05 17:48:38 -08:00
Ricardo Quesada
84a6aa29cd
Adds more 64-bit fixes
...
Replaces more `int` with `long` where it makes sense.
Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
2013-11-05 17:36:44 -08:00
Nite Luo
51fb1edc0c
Fix sorting bug
2013-11-05 17:00:34 -08:00
Chris Hannon
471dd07f3b
[android] update nativeactivity.cpp to work with changes made in commit 0220f27 (AMD support), changing int to long int for the second argument in most touch callbacks
2013-11-05 15:54:31 -05:00
yinkaile
2a1b0876bc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-05 21:20:40 +08:00
2youyou2
8b86373b08
1.Change to range-based loop
2013-11-05 20:33:29 +08:00
James Chen
5061c7cae4
Merge pull request #4093 from CocosRobot/updategeneratedsubmodule_1383651041
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 04:23:25 -08:00