minggo
|
225348cdde
|
use size_t instead of long in Array
|
2013-12-03 11:09:39 +08:00 |
Nite Luo
|
6862d59bb2
|
Add NewRenderTexture to convert RenderTexture to use new renderer
|
2013-12-02 17:23:52 -08:00 |
Nite Luo
|
8801f508eb
|
Partcle system use the new renderer
|
2013-12-02 12:13:05 -08:00 |
Nite Luo
|
fbadb3329a
|
Merge branch 'develop' into newRenderer
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-12-02 10:55:31 -08:00 |
Ricardo Quesada
|
dbcae0af1e
|
Merge branch 'develop' into console
|
2013-12-02 09:57:53 -08:00 |
Ricardo Quesada
|
eb834bce7f
|
Adds readline
|
2013-12-02 09:57:16 -08:00 |
boyu0
|
dba58f6a9b
|
issue #2771: add more joints
|
2013-12-02 18:29:04 +08:00 |
James Chen
|
229aa5433c
|
Update CHANGELOG [ci skip]
|
2013-12-02 17:27:28 +08:00 |
James Chen
|
7378c0ded0
|
Update AUTHORS [ci skip]
|
2013-12-02 17:26:19 +08:00 |
James Chen
|
9618eb00be
|
Merge pull request #4411 from martell/cmake
closed #3328: cmake support for windows
|
2013-12-02 01:22:57 -08:00 |
martell
|
3b9d8274f8
|
Restore Linux CMake to default
|
2013-12-02 07:41:27 +00:00 |
martell
|
06ff1bc594
|
Fixed HelloCpp Linking on Linux
|
2013-12-02 07:10:37 +00:00 |
martell
|
4f0f3f3235
|
fix for -DEBUG=1
|
2013-12-02 06:57:47 +00:00 |
martell
|
7a8653525b
|
fixed Audio for Linux
|
2013-12-02 06:37:32 +00:00 |
2youyou2
|
963dd6852b
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
|
2013-12-02 13:33:26 +08:00 |
2youyou2
|
246b03d52d
|
fixed alpha effect
|
2013-12-02 13:32:31 +08:00 |
minggo
|
e4883fb105
|
[ci skip]
|
2013-12-02 10:19:39 +08:00 |
minggo
|
d2f235f8b8
|
Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage
[ci skip]issue #2345: add tga support to Image
|
2013-12-01 18:18:42 -08:00 |
minggo
|
24f7819e99
|
Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
|
2013-12-01 18:08:58 -08:00 |
martell
|
1a94e393af
|
Setup for testing for every windows user
|
2013-11-30 09:36:22 +00:00 |
martell
|
2abca22bf4
|
Disabled some annoying Level 4 Warnings
|
2013-11-30 08:27:34 +00:00 |
martell
|
5c40fecd5e
|
fix cmake for linux
|
2013-11-30 08:18:09 +00:00 |
martell
|
f369606d77
|
fix cocos2d-x for vs2013
|
2013-11-30 08:05:39 +00:00 |
martell
|
79401a7596
|
quickly added win32 cmake
|
2013-11-30 06:09:12 +00:00 |
signmotion
|
03d64e0689
|
- Corrected CC_DISALLOW_COPY_AND_ASSIGN.
|
2013-11-29 20:34:15 +02:00 |
signmotion
|
41daad30fa
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-11-29 19:44:03 +02:00 |
Marc Lepage
|
940b0ffd56
|
Fix typos
|
2013-11-29 12:09:38 -05:00 |
Jason Xu
|
266e4e1654
|
rename to with Jni suffex
|
2013-11-29 19:34:36 +08:00 |
Jason Xu
|
27c3a459ed
|
rename android native function names.
|
2013-11-29 17:17:15 +08:00 |
boyu0
|
83f855e2ec
|
issue #2345: delete unnecessary include
|
2013-11-29 15:31:58 +08:00 |
boyu0
|
04c3d95005
|
issue #2345: namespace cocos2d { -> NS_CC_BEGIN
|
2013-11-29 15:25:21 +08:00 |
boyu0
|
dffc12e648
|
issue #2345: new/delete -> malloc/free
|
2013-11-29 15:13:16 +08:00 |
boyu0
|
86074c23d8
|
issue #2345: class Image add tga image format support.
|
2013-11-29 14:31:42 +08:00 |
minggo
|
d3076a1415
|
[ci skip]
|
2013-11-28 16:09:21 +08:00 |
minggo
|
ccc236f93c
|
Merge pull request #4405 from boyu0/upgrade_box2d_to_2.3.0
[ci skip]Upgrade box2d to 2.3.0
|
2013-11-28 00:06:34 -08:00 |
boyu0
|
0ff2e65467
|
reset cmakelists.txt
|
2013-11-28 15:41:23 +08:00 |
minggo
|
3268da3a4d
|
Merge pull request #4401 from minggo/thread-helper
[ci skip]add helper funcion to invoke a function in gl thread
|
2013-11-27 22:26:11 -08:00 |
boyu0
|
cfe522283c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0
|
2013-11-28 12:19:07 +08:00 |
boyu0
|
1c55c207bf
|
update project setting
|
2013-11-28 11:55:18 +08:00 |
minggo
|
5923892a92
|
Merge pull request #4404 from CocosRobot/updategeneratedsubmodule_1385608475
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-27 19:15:22 -08:00 |
CocosRobot
|
a24af527a3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-28 03:14:39 +00:00 |
minggo
|
d9139682ed
|
Merge pull request #4403 from boyu0/iss2771_physical
[ci skip]Iss2771 physical
|
2013-11-27 19:10:25 -08:00 |
minggo
|
c78ce63f14
|
use ThreadHelper::runOnGLThread() in AssetsManager
|
2013-11-28 11:06:08 +08:00 |
Ricardo Quesada
|
21afd63d82
|
Merge branch 'develop' into console
|
2013-11-27 14:29:27 -08:00 |
Nite Luo
|
83972ecf57
|
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
|
2013-11-27 10:16:34 -08:00 |
Nite Luo
|
75381ebc51
|
Merge branch 'develop' into newRenderer
|
2013-11-27 10:16:17 -08:00 |
boyu0
|
4615eae22f
|
issue #2771:remove unneeded include “ccConfig.h”
|
2013-11-27 18:30:48 +08:00 |
boyu0
|
72f2d68edd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-11-27 17:47:37 +08:00 |
minggo
|
eded94ef76
|
don't create a pool, since it doesn't invoke any iOS dependent codes
|
2013-11-27 17:43:54 +08:00 |
boyu0
|
2b43e72e7c
|
issue #2771: fix vs compile errors, change project setting
|
2013-11-27 17:33:33 +08:00 |