Dhilan007
49d8b76b9e
fix crash related to not support the z length modifier for size_t on vs
2014-01-05 11:59:32 +08:00
chengstory
10fec47b04
fixed #3582 update libCocoStudio windows project.
2014-01-05 11:38:01 +08:00
chengstory
b4118a7ccc
fixed #3582
...
1. add #include "cocostudio/CCComBase.h" into CocoStudio.h
2014-01-05 03:55:10 +08:00
chengstory
aae6d27c74
fixed #3582
...
1. revert ComRender::create(cocos2d::Node *node, const char *comName).
2014-01-05 03:11:32 +08:00
chengstory
bac600ab9f
fixed #3582
...
1. create Component By component Factory.
2014-01-05 02:22:32 +08:00
chengstory
7efacc4890
issue #3582 void serialize(void *r) -> bool serialize(void *r)
2014-01-05 01:13:16 +08:00
James Chen
7d2ec6c2c6
Merge pull request #4881 from dumganhar/utf16-to-utf8-error
...
compilation error fix. ssize_t -> int
2014-01-04 06:22:09 -08:00
James Chen
f94221a93b
compilation error fix. ssize_t -> int
2014-01-04 22:21:14 +08:00
CocosRobot
f44775b581
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 14:05:19 +00:00
James Chen
2c47690ebb
Merge pull request #4878 from dumganhar/utf16-to-utf8-error
...
Wrong warning fixes correct in ccUTF8.cpp.
2014-01-04 05:58:18 -08:00
James Chen
3c04d586b0
Wrong warning fixes correct in ccUTF8.cpp.
2014-01-04 21:54:05 +08:00
James Chen
42356e8597
Exchanges order of Sprite::setSpriteFrame(string), Sprite::setSpriteFrame(frame) . It’s needed for bindings-generator to generate correct binding glue codes.
2014-01-04 21:53:03 +08:00
CocosRobot
0b2926cb70
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 11:09:00 +00:00
samuele3hu
362c1dc0ea
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-04 18:37:34 +08:00
samuele3hu
465aba951c
Fix:Remove the ScollView and TableView of extension gui lua binding
2014-01-04 18:36:33 +08:00
Daniel T. Borelli
08dad98592
map:erase() is safe for item.second == FontAtlas*
2014-01-04 07:22:50 -03:00
CocosRobot
c793f2e0fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 10:19:07 +00:00
James Chen
6827538802
Adds override keyword for override functions.
2014-01-04 18:12:09 +08:00
James Chen
17be52740a
Removes duplicated file in Android.mk
2014-01-04 16:57:46 +08:00
James Chen
284d845f2f
Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795
2014-01-04 16:55:40 +08:00
samuele3hu
70ee13e2e1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-04 15:46:27 +08:00
samuele3hu
0550ec33ad
Fix:Resolve the bugs that some lua test cases can’t run
2014-01-04 15:46:04 +08:00
CocosRobot
ad11468b7b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 07:40:50 +00:00
James Chen
4c3fa3da49
Merge pull request #4865 from dumganhar/testjs-bugfix
...
Some fixes for TestJavascript
2014-01-03 23:34:08 -08:00
James Chen
98265e7961
Reverts GUIReader definition. it should be inherited from Object to make bindings happy.
2014-01-04 15:17:36 +08:00
James Chen
b2dc16c065
closed #3580 : FileUtilsTest->TextWritePlist crashes
2014-01-04 15:03:46 +08:00
WuHuan
e972c97dcf
support mingw
2014-01-04 14:40:22 +08:00
James Chen
ef5ab1b9be
sharedXXX -> getInstance, purgeXXX -> destroyInstance.
2014-01-04 14:23:40 +08:00
James Chen
43cdf1713b
Merge pull request #4864 from daltomi/test
...
fix bad name variable CCDirector
2014-01-03 21:44:42 -08:00
Daniel T. Borelli
d10992951b
fix bad name variable
2014-01-04 02:22:09 -03:00
James Chen
98346474b8
Merge pull request #4863 from Dhilan007/develop_crash
...
fix compiling error and miss file on vs.
2014-01-03 20:41:19 -08:00
Dhilan007
35246b0810
fix compiling error and miss file on vs.
2014-01-04 12:25:12 +08:00
CocosRobot
e42f721c6b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 04:22:17 +00:00
James Chen
44105c5d01
Merge pull request #4861 from dumganhar/develop
...
Fixing CocoStudio bindings error.
2014-01-03 20:12:05 -08:00
James Chen
322cf0d233
Fixing CocoStudio bindings error.
2014-01-04 12:11:10 +08:00
James Chen
e65c6b8e53
Merge pull request #4841 from dumganhar/template-container-unit-test
...
Template container unit test
2014-01-03 20:01:25 -08:00
CocosRobot
d29cdb5b52
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 03:58:44 +00:00
James Chen
55e45d44c4
Merge pull request #4810 from chengstory/#3480
...
Update SceneReaderTest Samples
2014-01-03 19:49:28 -08:00
James Chen
9342ae105a
issue #3577 : const_iterator —> iterator for Vector::erase(first, last). Makes android build happy.
2014-01-04 11:41:06 +08:00
James Chen
ebf6d07720
issue #3577 : iterator —> const_iterator since Map::getRandomObject is a const function.
2014-01-04 11:41:05 +08:00
James Chen
f55be38ad8
Merge pull request #4853 from Dhilan007/develop_crash
...
fix label not appear on the screen
2014-01-03 19:00:06 -08:00
CocosRobot
0ed307a583
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 02:58:59 +00:00
Dhilan007
b14999a7a7
fix label not appear on the screen
2014-01-04 10:56:14 +08:00
James Chen
32546b58f9
Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode
...
Develop nutty modify framework add node
2014-01-03 18:53:51 -08:00
James Chen
f3eb21e748
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
...
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-03 18:51:16 -08:00
James Chen
61af958976
closed #3579 : Bug fix in setTouchEnabledForLayer for jsbindings.
2014-01-04 10:32:04 +08:00
James Chen
baeacaddfc
closed #3579 : Bug fix in setTouchEnabledForLayer for luabindings.
...
Also fixed lua module error.
2014-01-04 10:30:11 +08:00
James Chen
0082cf3e4d
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-04 10:28:09 +08:00
Ricardo Quesada
76960ab83a
Merge pull request #4851 from ricardoquesada/node_vertex_z_fix
...
Node vertex Z fix
2014-01-03 17:55:32 -08:00
Ricardo Quesada
5a0284c183
Node vertex Z fix
...
Node correctly sets the Z vertex in getNodeToParentTransform(),
and not in transform().
This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
2014-01-03 17:54:07 -08:00
CocosRobot
54ee3392fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 01:40:17 +00:00
minggo
964d327db9
Merge pull request #4848 from dumganhar/more-warning-fixes
...
More warning fixes.
2014-01-03 17:31:02 -08:00
minggo
93f3545154
Merge pull request #4842 from Dhilan007/develop_crash
...
update js binding for studio change.
2014-01-03 17:29:14 -08:00
James Chen
46153d8c34
More warning fixes.
2014-01-04 09:17:37 +08:00
Ricardo Quesada
a7b33e3ec3
Fixes NodeToWorld
...
Multiplication was in the incorrect order
2014-01-03 14:21:33 -08:00
Dawid Drozd
b7314cd655
Fix for missing field in particle file.
2014-01-03 21:27:08 +01:00
Dawid Drozd
43ce4fa546
Fixed mistake in documentation addImage doesn't support gif format
2014-01-03 21:22:05 +01:00
Dhilan007
e017609fc4
fix compiling error in jsb_cocos2dx_studio_manual.cpp on android.
2014-01-03 23:59:05 +08:00
Dhilan007
b6e676caa4
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
2014-01-03 23:03:48 +08:00
Dhilan007
b4d392dc38
update js binding for studio change.
2014-01-03 21:33:48 +08:00
CaiWenzhi
8c5678a59e
Modify wrong codes.
2014-01-03 20:35:14 +08:00
CaiWenzhi
785e1740e4
Add "addNode" methods
2014-01-03 20:29:16 +08:00
chengstory
20b118739e
Merge branch 'develop' into #3480
2014-01-03 20:20:18 +08:00
CaiWenzhi
24a9f57b8e
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
2014-01-03 20:05:49 +08:00
Liam
0e42c1c369
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2014-01-03 19:53:23 +08:00
chengstory
7f8224b621
Merge branch 'develop' into #3480
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
2014-01-03 19:36:22 +08:00
CocosRobot
126c315673
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 11:32:54 +00:00
chengstory
46c7338008
fixed #3480
...
1. remove unused getnode and setnode interface.
2. add condition test.
3. Modify ComAttribute to support for parse json file.
4. Replace scenereader callback function to C++ 11 implement.
2014-01-03 19:30:47 +08:00
minggo
5ad3414921
Merge pull request #4834 from minggo/bug-fix
...
Put "initxx" functions into protected.
2014-01-03 03:27:55 -08:00
CaiWenzhi
a7f482fbf9
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
2014-01-03 19:17:26 +08:00
CaiWenzhi
3ccb80085f
Fixed bugs of page view
2014-01-03 19:14:17 +08:00
minggo
4fc7ad6e3d
Merge pull request #4791 from dabingnn/develop_clippingNodeMobile
...
fix bug clippingNodetest on mobile
2014-01-03 02:36:52 -08:00
minggo
1d04b42947
Put "initxx" functions into protected.
2014-01-03 18:15:56 +08:00
James Chen
86598edb73
Merge pull request #4829 from CocosRobot/updategeneratedsubmodule_1388738242
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 00:39:24 -08:00
CocosRobot
37c8b03253
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 08:37:25 +00:00
James Chen
c5ec24195a
Merge pull request #4821 from nutty898/develop_nutty_modify_framework_optimizewidgets
...
optimize button
2014-01-03 00:35:48 -08:00
James Chen
5346677a47
Merge pull request #4825 from samuele3hu/developNewUI
...
Update the lua test cases about the armature
2014-01-03 00:29:24 -08:00
CaiWenzhi
a32976802a
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
2014-01-03 15:50:35 +08:00
CaiWenzhi
767bf81e90
Modify renderers draw order define.
2014-01-03 15:46:42 +08:00
Dhilan007
8e2c51d31e
update vs project for split spine binding.
2014-01-03 15:29:50 +08:00
CaiWenzhi
9c0e669e09
Add "override"
2014-01-03 15:14:48 +08:00
samuele3hu
a72cf0428c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 14:53:15 +08:00
samuele3hu
2b19da00df
Update the lua test cases about the armature
2014-01-03 14:51:36 +08:00
CocosRobot
0661d87cdb
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 05:02:28 +00:00
James Chen
ac6b72450f
Merge pull request #4816 from samuele3hu/developNewUI
...
Update the lua test cases about the GUI
2014-01-02 20:53:19 -08:00
CaiWenzhi
7d8d645c70
Modify "include"
2014-01-03 12:15:42 +08:00
CaiWenzhi
e734f3ccaf
optimize button
2014-01-03 12:14:21 +08:00
andyque
88efbfc9cc
remove srand function call
2014-01-03 11:56:58 +08:00
andyque
774542a341
fix compile error of getRandomObject in map
...
and add srand to vector and map
2014-01-03 11:53:16 +08:00
samuele3hu
53f2415fcf
Resolve the android compile error
2014-01-03 11:29:56 +08:00
samuele3hu
51e3e3fd1b
Resolve the android and linux compile error
2014-01-03 11:15:46 +08:00
James Chen
4de2f82bd2
Merge pull request #4815 from andyque/fix
...
ix move assignment operator doesn't clear previous content bug
2014-01-02 18:55:41 -08:00
samuele3hu
bfc7441453
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 10:51:05 +08:00
samuele3hu
cdc82d6e8c
Add a newline
2014-01-03 10:50:06 +08:00
andyque
67153f816c
remove unused code
2014-01-03 10:44:43 +08:00
samuele3hu
c4588722dd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 10:41:03 +08:00
andyque
0e90ef8337
fix move assignment operator doesn't clear previous content bug
2014-01-03 10:39:53 +08:00
samuele3hu
07a3efb585
Update the lua test cases about the GUI
2014-01-03 10:39:19 +08:00
James Chen
04760f2508
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
2014-01-03 10:30:55 +08:00
andyque
c68efd7c5c
Merge remote-tracking branch 'upstream/develop' into develop
2014-01-03 09:39:10 +08:00
chengstory
e08e4ce0f8
fixed #3480 add search paths.
2014-01-03 02:21:36 +08:00
chengstory
77dca5958f
issue #3480 upload Samples resources.
2014-01-03 02:03:05 +08:00
chengstory
5903a74bd2
issue #3480
...
1. add getNode and setNode class function to Component.
2. fixes some build error.
2014-01-03 01:42:14 +08:00
chengstory
6892d8cf6a
issue #3480
...
1. add SceneReader Tests.
2. Modify class member name.
2014-01-03 01:14:12 +08:00
James Chen
0fe73f3a5d
Merge pull request #4804 from minggo/android-config
...
don't build spine module when build 2d module
2014-01-02 06:53:15 -08:00
James Chen
831e0b08e0
Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop
...
closed #3291 : XMLHttpRequest.status needs to be assigned even when connection fails.
2014-01-02 06:46:25 -08:00
CocosRobot
c120394cae
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 14:20:27 +00:00
James Chen
e337fb35fc
closed #3291 : XMLHttpRequest.status needs to be assigned even when connection fails.
2014-01-02 21:59:47 +08:00
minggo
d345139a08
fix compiling errors
2014-01-02 21:53:18 +08:00
minggo
674b38beef
no in header file
2014-01-02 21:43:27 +08:00
minggo
676e25d304
2d module don't denpend on spine
2014-01-02 20:17:11 +08:00
James Chen
602468e3f2
Merge pull request #4802 from dumganhar/develop
...
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
2014-01-02 04:08:22 -08:00
minggo
2b5be1bacf
Merge pull request #4801 from minggo/namespace
...
fix compiling errors because of new namespace of network module
2014-01-02 04:03:03 -08:00
James Chen
05b1be3aeb
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
2014-01-02 19:59:10 +08:00
minggo
9124f189c3
fix compiling errors because of new namespace of network module
2014-01-02 19:44:46 +08:00
CocosRobot
1c5638ad4f
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 11:36:25 +00:00
James Chen
b071578541
Merge pull request #4798 from andyque/fixassignment
...
fix missing check self assignment of Vector<T>, Map<K,V>, Value and String
2014-01-02 03:31:39 -08:00
minggo
054972fd3b
Merge pull request #4796 from minggo/deprecated-function
...
use std::function for call back
2014-01-02 03:29:17 -08:00
andyque
961b27eacb
remove move semantic into another pr
2014-01-02 18:32:47 +08:00
andyque
8a7228049a
fixed self assignment error and provide move semantics to pushBack of Vector<T>
2014-01-02 18:31:43 +08:00
andyque
75d5bcfb42
remove const modifier of move semantic
2014-01-02 18:05:22 +08:00
andyque
80adda2ce8
fixed self assignment error and provide move semantics to pushBack of Vector<T>
2014-01-02 17:54:52 +08:00
minggo
ded3e753f3
use std::function for call back
2014-01-02 17:23:00 +08:00
Liam
dd0b22be8d
resolved ui animation easing error for develop branch
2014-01-02 17:18:40 +08:00
Liam
ef76edbd1c
merge from develop branch
2014-01-02 17:02:55 +08:00
minggo
f2b1a3cc83
Merge pull request #4793 from minggo/namespace
...
network -> cocos2d::network
2014-01-02 00:38:50 -08:00
James Chen
c29e328490
Merge pull request #4779 from samuele3hu/DispatcherBak1
...
Develop branch adds lua trigger for CocoStudio
2014-01-02 00:29:30 -08:00
minggo
07600bd46b
network -> cocos2d::network
2014-01-02 16:25:35 +08:00
James Chen
67c5ba8dfb
closed #3565 : Adds missing `lua_pop`to prevent lua stack issues.
2014-01-02 16:21:35 +08:00
Kenneth Chan
80df88d2cf
Add missing bindings to setBlendFunc for various classes
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2014-01-02 16:21:35 +08:00
Huabing.Xu
57b0426994
fix bug clippingNodetest on mobile
2014-01-02 16:19:23 +08:00
samuele3hu
d802518413
Rename Cocos2dStudio.lua to CocoStudio.lua
2014-01-02 15:51:25 +08:00
James Chen
7abeacd86e
HttpClient don't have to be inherited from Object, its a singeton, ok?
2014-01-02 15:47:38 +08:00
samuele3hu
a2b706c87c
Rename some common script files to keep consistent
2014-01-02 15:18:32 +08:00
CocosRobot
c6425172b7
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 06:58:15 +00:00
James Chen
91e25bc0b4
Merge pull request #4782 from CocosRobot/updategeneratedsubmodule_1388645344
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-01 22:51:49 -08:00
CocosRobot
ada5eb82ec
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 06:49:06 +00:00
James Chen
1480dd99d6
Merge pull request #4777 from 2youyouo2/develop
...
update armature, change interface from "by" to "with"
2014-01-01 22:47:18 -08:00
James Chen
69d681e343
Merge pull request #4781 from dumganhar/js-ui-test
...
Updates JSB gui test
2014-01-01 22:44:25 -08:00
James Chen
dd54e906f0
ccs.XXX —> ccui.XXX for gui js bindings.
2014-01-02 14:21:24 +08:00
James Chen
efc7effac5
Adds override keyword for some override methods in gui::Widget class.
2014-01-02 14:20:52 +08:00
samuele3hu
f1d94b9b7b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
2014-01-02 12:02:28 +08:00
samuele3hu
b8d4010ae5
Develop branch adds lua trigger for CocoStudio
2014-01-02 12:00:37 +08:00
Lee, Jae-Hong
c44dea5eb8
[Win32] Update project files.
...
- lIbGUI
2014-01-02 12:49:56 +09:00
boyu0
0a06d93328
issue #3401 : physical lua banding script and auto script
2014-01-02 11:45:11 +08:00
yinkaile
1f38fc28a6
change interface
2014-01-02 11:07:31 +08:00
minggo
3a1c5e4f6e
Merge pull request #4759 from Dhilan007/develop_crash
...
fix crash related to not support the z length modifier for size_t on vs
2014-01-01 18:47:21 -08:00
James Chen
0ec2738ce5
Merge pull request #4720 from zarelaky/develop
...
closed #3556 : openal context not destroy correctly on mac and ios
2014-01-01 05:55:03 -08:00
CocosRobot
ff550bf865
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-01 13:49:57 +00:00
James Chen
71d21d2e10
Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename
2013-12-31 19:13:59 +08:00
James Chen
8c1c9fef15
Bug fix in cc.VisibleRect
2013-12-31 18:17:20 +08:00
James Chen
74a7f68dc1
[JSB] Adds cc.VisibleRect.
2013-12-31 18:12:42 +08:00
CaiWenzhi
81bdfac795
Modify class name Label LabelBMFont LabelAtlas
2013-12-31 16:36:33 +08:00
Dhilan007
ebf3faadc3
fix crash related to not support the z length modifier for size_t on vs
2013-12-31 16:32:16 +08:00
Huabing.Xu
b2934d32bc
Merge branch 'develop' into develop_RenderTextureBug
...
* develop: (32 commits)
fix align text error in label
Update the JS binding code & samples for latest cocos2d engine.
[AUTO] : updating submodule reference to latest autogenerated bindings
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
Updates nativeactivity.cpp.
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
remove other non-functional jenkins scripts
[AUTO] : updating submodule reference to latest autogenerated bindings
move ghprb.py to tools/jenkins-scripts/
issue #2050 : commit resources
add github pull request builder for Jenkins
Adds an empty LuaEngine::parseConfig function.
[JSB] Adds trigger bindings for CocoStudio.
update cocos2d-x version string
update describe for support translucency on android
update describe for support translucency on android
update describe for support translucency on android
recover java activity on android.
remove draw increment
migrate ShaderTestSprite to new renderer
...
2013-12-31 14:58:11 +08:00
minggo
a80c9dd625
Merge pull request #4752 from Dhilan007/label_distanceField
...
fix align text error in label
2013-12-30 22:27:55 -08:00
Dhilan007
b51efbd654
fix align text error in label
2013-12-31 14:13:26 +08:00
Huabing.Xu
bf1f5dd0e0
fix rendertexture bug
2013-12-31 11:48:51 +08:00
CocosRobot
2555318c13
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-31 03:36:47 +00:00
minggo
2b54e5e296
Merge pull request #3864 from dumganhar/iss2865-deprecate-ccnotification
...
closed #2865:Deprecates NotificationCenter, uses new EventDispatcher instead.
2013-12-30 19:31:34 -08:00
James Chen
8145bf903e
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
2013-12-31 11:02:01 +08:00
James Chen
973adc6b2f
Updates nativeactivity.cpp.
2013-12-31 10:55:59 +08:00
James Chen
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
CocosRobot
674804f1b4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 13:49:19 +00:00
James Chen
1d8ee016e5
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
...
closed #2050 : fix tilemap firstgid bug
2013-12-30 05:42:19 -08:00
Huabing.Xu
a14006bb8f
calculation matrix
2013-12-30 21:24:16 +08:00
James Chen
edb2ad0933
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
...
Conflicts:
cocos/editor-support/cocostudio/TriggerMng.cpp
2013-12-30 21:06:57 +08:00
James Chen
165e6c2a78
Adds an empty LuaEngine::parseConfig function.
2013-12-30 21:04:00 +08:00
James Chen
1edf748dc3
[JSB] Adds trigger bindings for CocoStudio.
2013-12-30 20:57:46 +08:00
Huabing.Xu
c030553d8c
Fix missed popMatrix
2013-12-30 20:25:25 +08:00
minggo
3680995f0b
Merge pull request #4742 from minggo/develop
...
update cocos2d-x version string
2013-12-30 04:23:41 -08:00
minggo
046d6696bc
update cocos2d-x version string
2013-12-30 20:22:25 +08:00
minggo
c7fd67ee29
Merge pull request #4736 from chengstory/#3474
...
fixed #3474
2013-12-30 02:14:55 -08:00
CaiWenzhi
b8aa9fbf93
Merge branch 'develop' into develop_nutty_modify_framework_testbugfixed
2013-12-30 15:57:41 +08:00
boyu0
0984eafaef
closed #2050 : move autorelease to CLN
2013-12-30 15:32:04 +08:00
chengstory
0488aa6dcb
fixed #3474
...
1. Modify CCLOG, Add classname.
2. change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack.
3. remove unused do while(0).
2013-12-30 15:26:51 +08:00
minggo
b474f7ca0e
Merge pull request #4735 from dabingnn/develop_transitionPageTurn
...
migration transition page turn to new renderer
2013-12-29 23:25:38 -08:00
minggo
714af52e0c
Merge pull request #4732 from Dhilan007/update_vs_project
...
fix compiling error on liblua VS 2012 project
2013-12-29 23:24:01 -08:00
Huabing.Xu
1962dfa52d
migration transition page turn to new renderer
2013-12-30 14:43:18 +08:00
CaiWenzhi
e5b0bbad74
Fixed bugs
2013-12-30 14:40:49 +08:00
Dhilan007
30b3a6f8c3
fix compiling error on liblua VS 2012 project
2013-12-30 14:21:32 +08:00
CocosRobot
a269fba371
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 05:58:34 +00:00
minggo
0e9b43248c
Merge pull request #4728 from dabingnn/develop_removeCommandPool
...
Develop remove command pool
2013-12-29 21:53:12 -08:00
boyu0
1f72fafd08
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
2013-12-30 12:30:59 +08:00
James Chen
d72a9d2c0d
Merge pull request #4727 from dumganhar/develop
...
Fix of wrong include symbol of CCVector.h
2013-12-29 19:55:58 -08:00
James Chen
c5c03a3b35
Fix of wrong include symbol of CCVector.h
2013-12-30 11:55:01 +08:00
boyu0
a76c59f644
closed #2050 : add tile map xml format test and fix tile property bug.
2013-12-30 11:33:41 +08:00
James Chen
200f07dc34
closed #3290 : [JSB] The order of onEnter and onExit is wrong. For develop branch.
2013-12-30 11:10:02 +08:00
James Chen
31e2b3d5c2
Merge pull request #4715 from SBKarr/develop
...
closed #3542 : AngelCode binary file format support for LabelBMFont.
2013-12-29 18:11:19 -08:00
zarelaky
2822066a5f
openal context not destroy correctly on mac and ios
2013-12-30 08:37:36 +08:00
Roman "SBKarr
93f6d9c4f5
Added test case for binary fnt file
...
Also, fixed nul-termination issue in file parsing
2013-12-28 23:00:07 +04:00
CocosRobot
203b0f183e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-28 06:59:45 +00:00
James Chen
e509a52551
Small fix for `FREE` wrong variable.
2013-12-28 14:38:13 +08:00
James Chen
b17117a1a1
More warning fixes.
2013-12-28 14:34:52 +08:00
Roman "SBKarr
b0e6b5a43f
AngelCode binary file format support for LabelBMFont
2013-12-27 22:32:07 +04:00
CocosRobot
2051041df7
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 13:12:17 +00:00
James Chen
0d16f7bc3b
Merge pull request #4712 from dumganhar/cocostudio-test
...
Merge PR #4672 : We need to replace trigger system by EventDispatcher in future.
2013-12-27 05:05:41 -08:00
James Chen
f4825ec94a
Bug fixes for cocostudio.
2013-12-27 20:54:05 +08:00
minggo
3760cddf49
Merge pull request #4705 from Dhilan007/failed_dispatch_receive
...
fix failed to receive dispatch signal on some android device
2013-12-27 04:33:30 -08:00
James Chen
b03c8259b1
Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test
...
Conflicts:
cocos/scripting/auto-generated
2013-12-27 20:18:58 +08:00
samuele3hu
aa0eb36071
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
2013-12-27 20:08:09 +08:00
samuele3hu
30439e4689
Improve the coding style
2013-12-27 20:07:00 +08:00
James Chen
9baa64f274
Merge pull request #4688 from walzer/develop
...
make CC_USE_PHYSICS can ACTUALLY be switch off
2013-12-27 04:04:48 -08:00
James Chen
bf881f3ac0
Merge pull request #4691 from samuele3hu/DispatcherBak1
...
Reconstruct the operation of handling lua script event
2013-12-27 03:58:08 -08:00
CaiWenzhi
af563653e2
Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed
2013-12-27 18:26:30 +08:00
CaiWenzhi
d8a5fd6af4
Modify wrong codes
2013-12-27 18:23:53 +08:00
CocosRobot
0116866e58
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 10:16:22 +00:00
CaiWenzhi
6fe49bf6dd
Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed
2013-12-27 18:12:09 +08:00
Dhilan007
b319cb58ac
fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m].
2013-12-27 18:05:48 +08:00
CaiWenzhi
b2da9d2da5
Fixed bugs
2013-12-27 17:58:00 +08:00
minggo
5ce228e68c
Merge pull request #4703 from CocosRobot/updategeneratedsubmodule_1388138100
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 01:57:03 -08:00
minggo
ec3b3ea012
Merge pull request #4696 from dumganhar/warning-fix
...
Some warning fixes on linux.
2013-12-27 01:56:47 -08:00
CocosRobot
68cf83ee7d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 09:55:01 +00:00
chengstory
3f4e4c9684
Merge branch 'develop' into #3457
2013-12-27 17:51:27 +08:00
minggo
0690305398
Merge pull request #4666 from 2youyouo2/develop
...
change play interface name
2013-12-27 01:50:08 -08:00
CaiWenzhi
495e574f44
Fixed bugs
2013-12-27 17:22:51 +08:00
chengstory
faaf6d3f2b
fixed #3457 fixes some bug.
2013-12-27 17:21:13 +08:00
CaiWenzhi
385894548d
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
2013-12-27 17:19:29 +08:00
James Chen
a47a7075e4
Merge pull request #4699 from boyu0/iss3509_physics_switch_foreground_bug
...
closed #3509 : Sprites with PhysicsBody moves to wrong position when swit...
2013-12-27 00:28:43 -08:00
James Chen
012e7f6618
Merge pull request #4698 from dumganhar/map-fix
...
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
2013-12-27 00:09:21 -08:00
CaiWenzhi
6123344d9b
Modify location of members define
2013-12-27 16:07:02 +08:00
CaiWenzhi
26fd64c61a
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
2013-12-27 16:02:38 +08:00
CaiWenzhi
e45c2a8601
Modify manager of some widgets' children
2013-12-27 16:01:03 +08:00
boyu0
1e8e15506d
closed #3509 : Sprites with PhysicsBody moves to wrong position when switch foreground/background.
2013-12-27 15:53:55 +08:00
James Chen
3ee48fc1ca
Map::bucketSize fix.
2013-12-27 15:50:48 +08:00
walzer
ece68aafc2
add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0
2013-12-27 15:49:08 +08:00
James Chen
0d4a816e3b
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
2013-12-27 15:44:23 +08:00
byeonggee.seo
b9d56ae793
CCData bugfix
2013-12-27 16:34:00 +09:00
CaiWenzhi
1a486f22ec
Add "override"
2013-12-27 15:15:11 +08:00
James Chen
febc19ea8d
Some warning fixes on linux.
2013-12-26 23:06:16 -08:00
Dhilan007
861925e752
fix compiling error in vs project on win7.
2013-12-27 14:38:22 +08:00
Huabing.Xu
66e550e5a0
Merge branch 'develop' into develop_removeCommandPool
...
* develop: (33 commits)
fix black screen when back to foreground on android.
Fix set FPS broken.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update CCString.cpp
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Renames: IntValueMap —> ValueMapIntKey
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
Modify reader
long --> ssize_t for TableView callback.
Generates execute file in cocos root_dir/bin folder for HelloCpp.
Add listview and pageview reader
[AUTO] : updating submodule reference to latest autogenerated bindings
Modify actionnode
[AUTO] : updating submodule reference to latest autogenerated bindings
optimize loop
fix LabelTestNew
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
Fix box2dView
...
2013-12-27 14:07:04 +08:00
Huabing.Xu
76d07fc76e
remove empty interface releaseToCommandPool
2013-12-27 14:02:17 +08:00
Huabing.Xu
268f2fcc21
adjust comment codes
2013-12-27 13:52:44 +08:00
Huabing.Xu
40af66a7bc
remove commandPool in renderCommand
2013-12-27 13:51:11 +08:00
minggo
ef6295f046
Merge pull request #4693 from Dhilan007/black_screen_android
...
fix black screen when back to foreground on android.
2013-12-26 21:46:18 -08:00
chengstory
4cb227ae0d
fixed #3457 ui action can not play.
2013-12-27 12:45:05 +08:00
zhangcheng
dd4339b0bb
Merge branch ' #3457 ' of git://github.com/chengstory/cocos2d-x into #3457
2013-12-27 12:41:01 +08:00
zhangcheng
1b666d4d41
fixed #3457 scenetest crashed when back to menu.
2013-12-27 12:39:21 +08:00
samuele3hu
ee7aa0f077
Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug
2013-12-27 12:05:12 +08:00
Dhilan007
f250d24766
fix black screen when back to foreground on android.
2013-12-27 11:56:56 +08:00
James Chen
0d9fe874a3
Fix set FPS broken.
2013-12-26 19:49:54 -08:00
samuele3hu
d51440f62a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
2013-12-27 11:17:11 +08:00
Liam
0cdf2d15fe
merge from develop branch
2013-12-27 10:50:50 +08:00
Liam
2a6c24f8bf
update coco action with correct coding rule
2013-12-27 10:43:49 +08:00
samuele3hu
6d9e865f15
Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong
2013-12-27 10:35:44 +08:00
zhangcheng
6a9fbfbc60
fixed #3457 update libCocosStudio.vcxproj, add trigger code.
2013-12-27 10:24:50 +08:00
luocker
fc655162fa
Update CCString.cpp
...
we can't change _string value after get Array.
2013-12-27 00:26:02 +08:00
walzer
d7704d574a
issue #3517 , enable CC_USE_PHYSICS by default
2013-12-27 00:00:50 +08:00
walzer
c5e95618d9
fixed #3517 , make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment
2013-12-26 23:55:05 +08:00