minggo
304b09527b
Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime
...
[ci skip]Configuration of VAO in runtime
2013-11-12 22:55:29 -08:00
bmanGH
2687ee8915
put '{' in a new line to follow cocos2d-x coding style
2013-11-13 14:52:16 +08:00
Ricardo Quesada
4848e3d3bb
correct size for Listener ID
2013-11-12 17:14:51 -08:00
bmanGH
683ce1692d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime
...
Conflicts:
cocos2dx/CCConfiguration.cpp
cocos2dx/draw_nodes/CCDrawNode.cpp
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
cocos2dx/platform/android/CCEGLView.cpp
cocos2dx/platform/ios/EAGLView.mm
cocos2dx/textures/CCTextureAtlas.cpp
cocos2dx/textures/CCTextureAtlas.h
2013-11-12 20:18:04 +08:00
CocosRobot
0acaa1f76e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-12 09:50:13 +00:00
samuele3
ae6597dbaa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
...
Conflicts:
tools/bindings-generator
2013-11-12 17:23:41 +08:00
samuele3
18bc96096c
Resolve some warning and modify uint32_t to long
2013-11-12 17:18:51 +08:00
minggo
8d79e67ecf
Merge pull request #4165 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-11 23:57:30 -08:00
James Chen
42ca4f6122
Merge pull request #4187 from dumganhar/develop
...
#include <algorithm> for std::max, std::min on VS2013.
2013-11-11 18:52:16 -08:00
James Chen
db07c781ab
#include <algorithm> for std::max, std::min on VS2013.
2013-11-12 10:35:50 +08:00
James Chen
cfd82a26bb
Merge pull request #4156 from bopohaa/patch-1
...
closed #3159 : Webp Test Crashes.
2013-11-11 18:31:03 -08:00
James Chen
cc3a6ebda9
Merge pull request #4150 from ledyba/fix_ccdevice
...
Close X Display
2013-11-11 17:40:32 -08:00
minggo
44bed76c21
Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3
...
[ci skip]Develop nutty optimizeguireader 3
2013-11-11 17:36:22 -08:00
Ricardo Quesada
d6446e9b14
calls `delete[]` instead of `delete`
...
calls `delete[]` instead of `delete`
2013-11-11 16:07:46 -08:00
James Chen
51cfd3fb4b
Merge pull request #4151 from pyrasis/develop
...
[Win32] fix compile error.
2013-11-11 04:42:42 -08:00
CocosRobot
3472d7ad50
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 10:57:57 +00:00
CaiWenzhi
b688e39584
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-11 18:23:21 +08:00
CaiWenzhi
4f76141c41
optimize guireader
2013-11-11 18:22:14 +08:00
minggo
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo
d3cf36ba37
Merge pull request #4171 from dumganhar/jsb-64bit-fix
...
[ci skip]Jsb 64bit fix
2013-11-11 02:17:42 -08:00
CaiWenzhi
782c26bc37
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-11 17:57:43 +08:00
2youyou2
cdae8f51bc
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-11-11 17:30:52 +08:00
2youyou2
528c257497
add setUserObject method to CCArmatureAnimation
2013-11-11 17:30:37 +08:00
minggo
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
minggo
2a31ff04c2
Merge pull request #4166 from dabingnn/iss3025_TextureCache
...
[ci skip]issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 00:46:46 -08:00
James Chen
49289d7576
Adding cc.TextureCache.getInstance() to jsb_deprecated.js.
2013-11-11 16:45:44 +08:00
James Chen
20b350a58b
Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp).
2013-11-11 16:45:44 +08:00
James Chen
0151ac60ba
fix 64bit warning. unsigned int (int) —> long.
2013-11-11 16:45:44 +08:00
CocosRobot
2e52dd4905
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 08:05:15 +00:00
Huabing.Xu
dfcae4ed0d
issue #3025 : change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore
2013-11-11 16:04:34 +08:00
Huabing.Xu
3fc16256ab
issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 15:40:12 +08:00
yinkaile
677cf00355
fix compiler warning
2013-11-11 15:29:24 +08:00
yinkaile
50ab5783d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-11 15:16:13 +08:00
minggo
cd22f5543b
Merge pull request #3997 from ondesly/screen_size_change
...
[ci skip]android & ios screen size change support
2013-11-10 23:10:13 -08:00
minggo
bbb2579114
Merge pull request #4160 from dabingnn/iss3025_TextureCache
...
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
yinkaile
9f67ea786e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-11 14:57:20 +08:00
yinkaile
0bb8714f86
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-11-11 14:53:18 +08:00
yinkaile
5ba1e4ce10
1.remove compiler wornings
...
2.change void Bone::removeFromParent(bool recursion); to void Bone::removeFromParent();
2013-11-11 14:50:30 +08:00
James Chen
9d7a8c44f9
Reverts auto-generated.
2013-11-11 14:40:23 +08:00
James Chen
8f8d0f86d7
Updating Bindings-generator.
2013-11-11 14:38:12 +08:00
James Chen
ff3bfbe8a2
Using std::unordered_map instead of UTHASH for js_type_class_t.
...
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
2013-11-11 14:36:43 +08:00
James Chen
55cf30b7c8
HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp.
2013-11-11 14:36:43 +08:00
James Chen
5a0df8d2e8
VS2012 doesn’t support invoke another constructor method in current constructor.
2013-11-11 14:36:43 +08:00
James Chen
fe88f7c941
Fixing memory leak of JSStringWrapper::set .
2013-11-11 14:36:43 +08:00
James Chen
9d5813b7d9
Some fixes:
...
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
2013-11-11 14:36:42 +08:00
Huabing.Xu
55b9462b17
issue #3025 : directly use _textureCache in Director
2013-11-11 14:21:41 +08:00
minggo
e193311e55
Merge pull request #4161 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warning
2013-11-10 22:10:10 -08:00
2youyou2
0a72c3c1c2
1.when add a skin to last index, applay it's skindata to the previous skindata
...
2.Do not retain target when regist frame event and movement event
2013-11-11 13:33:47 +08:00
James Chen
707a6c246f
Merge pull request #4157 from dumganhar/iss3137-fix-acc
...
closed #3137 : Device::setAccelerometerEnabled needs to be invoked before adding ACC listener
2013-11-10 21:03:24 -08:00
boyu0
6c1144ee79
issue #2770 : fix some warning
2013-11-11 12:49:38 +08:00