CocosRobot
|
745fe13ecb
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-08 02:46:01 +00:00 |
minggo
|
82bcb171a2
|
Merge pull request #11747 from Dimon4eg/v3
Fix crash in AssetsManager
|
2015-05-08 10:44:06 +08:00 |
minggo
|
b6ec472985
|
[ci skip]update CHANGELOG
|
2015-05-08 10:43:40 +08:00 |
minggo
|
14cebf7150
|
Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 10:42:31 +08:00 |
minggo
|
d587ffd5c0
|
Merge pull request #11736 from samuele3hu/v3_7_js
issue 10411:Bug in Physics manual Lua binding
|
2015-05-08 10:04:55 +08:00 |
CocosRobot
|
4195c4b250
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 02:03:02 +00:00 |
minggo
|
5140afe24c
|
Merge pull request #11715 from cnsoft/cnsoft-patch-1
try to fix a nullptr bug.
|
2015-05-08 09:55:13 +08:00 |
minggo
|
09ddf15b9f
|
Merge pull request #11740 from joshuastray/fix-debu
fix jsb debugger bug
|
2015-05-08 09:29:40 +08:00 |
dkorchinskiy
|
0f30ad4f16
|
Fix crash in AssetsManager
|
2015-05-07 18:59:51 +03:00 |
Vincent Yang
|
6f50708beb
|
Merge branch 'v3_addClearforCamera' of https://github.com/dabingnn/cocos2d-x into v3_addClearforCamera
|
2015-05-07 18:43:27 +08:00 |
Vincent Yang
|
60aa223065
|
Add dialog in Scene3DTest.
|
2015-05-07 18:43:07 +08:00 |
Huabing.Xu
|
f064587ae5
|
refactor camera clear to immediate rendering
|
2015-05-07 18:32:32 +08:00 |
Jialong Zhai
|
be923b5901
|
fix jsb debugger bug
|
2015-05-07 18:24:30 +08:00 |
Vincent Yang
|
1daca7fac9
|
Merge bug fix code.
|
2015-05-07 16:52:37 +08:00 |
Vincent Yang
|
45e4a2029f
|
Merge branch 'v3_addClearforCamera' of https://github.com/dabingnn/cocos2d-x into v3_addClearforCamera
|
2015-05-07 16:23:44 +08:00 |
Vincent Yang
|
a8f0ad9d68
|
Add Scene3DTest.
|
2015-05-07 16:22:30 +08:00 |
samuele3hu
|
23e4e0d4e3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-07 16:21:03 +08:00 |
samuele3hu
|
0d53065476
|
issue 10411:Bug in Physics manual Lua binding
|
2015-05-07 16:15:24 +08:00 |
minggo
|
775236b531
|
Merge pull request #11729 from samuele3hu/v3_7_js
Update the configure of js-tests and js-template on the win32 platform
|
2015-05-07 15:48:35 +08:00 |
Huabing.Xu
|
67ec758d15
|
add clear feature when before draw scene with a camera
|
2015-05-07 15:09:06 +08:00 |
minggo
|
65ec7f9545
|
Merge pull request #11728 from WenhaiLin/v3-label-pos
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
|
2015-05-07 13:42:28 +08:00 |
samuele3hu
|
2385e68f72
|
Update the ini files for js binding
|
2015-05-07 13:00:57 +08:00 |
WenhaiLin
|
03bdb7055a
|
Fixed typo
|
2015-05-07 11:48:55 +08:00 |
minggo
|
a718c11eb6
|
Merge pull request #11724 from andyque/fix-binding-generator
fix upstream compile error
|
2015-05-07 11:47:20 +08:00 |
samuele3hu
|
243da71082
|
Update the project configure of js-tests and js-template on the win32 platform
|
2015-05-07 11:38:43 +08:00 |
WenhaiLin
|
03a1167902
|
Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7
|
2015-05-07 11:31:59 +08:00 |
Wenhai Lin
|
d09bd21da4
|
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
|
2015-05-07 11:20:22 +08:00 |
minggo
|
f76dd57bf7
|
Merge pull request #11727 from samuele3hu/v3_7_js
Add $(EngineRoot)external for cocos2d_headers.props
|
2015-05-07 11:17:10 +08:00 |
samuele3hu
|
87db3aba78
|
Add $(EngineRoot)external for cocos2d_headers.props
|
2015-05-07 11:11:33 +08:00 |
andyque
|
db95034798
|
fix android compile error
|
2015-05-07 10:37:19 +08:00 |
minggo
|
83a887f6a0
|
Merge pull request #11714 from ryule/v3
javaactivity-android.cpp needs JNIEXPORT for -fvisibility=hidden
|
2015-05-07 09:37:58 +08:00 |
minggo
|
761a35cca2
|
[ci skip]update CHANGELOG
|
2015-05-07 09:36:49 +08:00 |
minggo
|
b9925dad40
|
[ci skip]update AUTHORS
|
2015-05-07 09:35:51 +08:00 |
minggo
|
fb112995d8
|
Merge pull request #11491 from milos1290/tween
Adding FloatAction to animate any property over time.
|
2015-05-07 09:34:44 +08:00 |
minggo
|
14f8c75c8c
|
[ci skip]update CHANGELOG
|
2015-05-07 09:32:50 +08:00 |
minggo
|
ba1e77d656
|
Merge pull request #11720 from WenhaiLin/v3-label-outline
Label:Fixed outline doesn't match with the characters exactly.
|
2015-05-07 09:30:37 +08:00 |
minggo
|
b60a31f12d
|
Merge pull request #11721 from samuele3hu/v3_7_js
Fix the compile error for libSpine on the win32 platform
|
2015-05-07 09:30:15 +08:00 |
andyque
|
bedd62296f
|
fix binding generator
|
2015-05-07 07:05:23 +08:00 |
Ricardo Quesada
|
6212c7d614
|
Merge pull request #11722 from ricardoquesada/assert_fixes
compiles on win32
|
2015-05-06 09:15:16 -07:00 |
Ricardo Quesada
|
c2bbc06340
|
compiles on win32
|
2015-05-06 08:46:48 -07:00 |
samuele3hu
|
b2c361f1a1
|
Fix the compile error for libSpine on the win32 platform
|
2015-05-06 23:30:08 +08:00 |
WenhaiLin
|
b1803d40db
|
Label:Fixed outline doesn't match with the characters exactly.
|
2015-05-06 17:17:30 +08:00 |
cnsoft
|
62741e3ff8
|
fix a nullptr bug.
get model from : http://pan.baidu.com/s/1sjofSWd pass: 9xis it will crash in cocos studio or client.
|
2015-05-06 14:38:38 +08:00 |
Ricardo Quesada
|
9ca2f79ff2
|
Merge pull request #11713 from ricardoquesada/include_header_love
adds love to header files
|
2015-05-05 22:42:27 -07:00 |
Jongryul Kook
|
dfe30e159f
|
Need JNIEXPORT for -fvisibility=hidden
|
2015-05-06 14:24:48 +09:00 |
Ricardo Quesada
|
fe59b093b5
|
adds love to header files
|
2015-05-05 21:48:05 -07:00 |
samuele3hu
|
cc4fe9b746
|
Modify the configuration about js-tests.
|
2015-05-06 10:52:23 +08:00 |
minggo
|
074b335d83
|
Merge pull request #11711 from super626/texturecube
Make the skybox seamless
|
2015-05-06 10:17:40 +08:00 |
jianglong0156
|
0a1f3ec564
|
Merge pull request #4 from cocos2d/v3
update 2dx
|
2015-05-06 10:11:36 +08:00 |
minggo
|
1d03579966
|
[ci skip]update CHANGELOG
|
2015-05-06 10:03:00 +08:00 |