James Chen
|
80004548c8
|
issue #2790: Adds CCVector.h to Xcode project. int —> long
|
2013-12-04 15:56:08 +08:00 |
James Chen
|
52af153a81
|
issue #2790: Commit CCVector.h from Riq’s repo(https://github.com/ricardoquesada/cocos2d-x/blob/template_vector/cocos2dx/cocoa/CCVector.h).
|
2013-12-04 15:56:08 +08:00 |
CocosRobot
|
a354031526
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-04 07:47:50 +00:00 |
minggo
|
fcc3b5ca3c
|
Merge pull request #4430 from samuele3hu/developDeprecated
[ci skip]issue #3309:Add some deprecated functions and classes to support maser cocostudio lua bindings
|
2013-12-03 23:40:57 -08:00 |
samuele3
|
629ffcbbfd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
|
2013-12-04 15:20:09 +08:00 |
samuele3
|
c1a226686f
|
issue #3309:Modify some deprecated cpp files and lua files
|
2013-12-04 15:15:55 +08:00 |
boyu0
|
98779b0a9f
|
issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h
|
2013-12-04 14:36:32 +08:00 |
minggo
|
608e3bfa1b
|
Merge pull request #4410 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN
[ci skip]Corrected "disallow copy and assign"
|
2013-12-03 19:21:45 -08:00 |
minggo
|
92b180080c
|
Merge pull request #4409 from mlepage/develop
[ci skip]Fix typos
|
2013-12-03 19:13:23 -08:00 |
Ricardo Quesada
|
a34352cef7
|
Console is working!
|
2013-12-03 18:46:54 -08:00 |
Huabing.Xu
|
cd562676f5
|
use block allocation for commands
|
2013-12-04 10:39:34 +08:00 |
minggo
|
9babdaa1fa
|
Merge pull request #4419 from boyu0/iss2771_physical_fix_update_physics_transform
[ci skip]issue #2771: add condition test to updatePhysicsTransform
|
2013-12-03 18:15:35 -08:00 |
minggo
|
712bcc7b36
|
Merge pull request #4416 from minggo/change-long
[ci skip]use size_t instead of long in Array
|
2013-12-03 18:08:08 -08:00 |
Nite Luo
|
0c292e59b8
|
Merge branch 'develop' into newRenderer
|
2013-12-03 10:52:10 -08:00 |
darkdukey
|
3eea1d0ef3
|
Merge pull request #3 from dabingnn/newRendererCommandPool
New renderer command pool
|
2013-12-03 10:46:16 -08:00 |
boyu0
|
fd68dc4f9f
|
issue #2771: add condition test to updatePhysicsTransform
|
2013-12-03 16:28:18 +08:00 |
samuele3
|
367799da0d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
|
2013-12-03 15:42:31 +08:00 |
samuele3
|
a8c1bba464
|
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
|
2013-12-03 15:40:59 +08:00 |
Huabing.Xu
|
757f1abc7f
|
1. protected render command construction/destruction function.
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
|
2013-12-03 14:08:47 +08:00 |
minggo
|
02aca34ccf
|
Merge pull request #4417 from boyu0/iss2771_physical
[ci skip]issue #2771 physical, add more joint and joint tests
|
2013-12-02 21:59:46 -08:00 |
boyu0
|
63a4e09c90
|
issue #2771: add more joint tests, add some joint api, fix bugs
|
2013-12-03 12:47:03 +08:00 |
Huabing.Xu
|
44f12ce8e4
|
add RenderCommandPool head file
|
2013-12-03 11:52:51 +08:00 |
Huabing.Xu
|
d4b9e0538b
|
refactor: group command use a non parameter constructor and a reentrant init function
|
2013-12-03 11:24:03 +08:00 |
Huabing.Xu
|
d33f05b3f0
|
refactor: custom command use a non parameter constructor and a reentrant init function
|
2013-12-03 11:17:21 +08:00 |
Huabing.Xu
|
ace75eebce
|
refactor: quad command use a non parameter constructor and a reentrant init function
|
2013-12-03 11:11:46 +08:00 |
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 |