CaiWenzhi
81bdfac795
Modify class name Label LabelBMFont LabelAtlas
2013-12-31 16:36:33 +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
1edf748dc3
[JSB] Adds trigger bindings for CocoStudio.
2013-12-30 20:57:46 +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
0e9b43248c
Merge pull request #4728 from dabingnn/develop_removeCommandPool
...
Develop remove command pool
2013-12-29 21:53:12 -08: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
James Chen
f4825ec94a
Bug fixes for cocostudio.
2013-12-27 20:54:05 +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
minggo
0690305398
Merge pull request #4666 from 2youyouo2/develop
...
change play interface name
2013-12-27 01:50:08 -08:00
chengstory
faaf6d3f2b
fixed #3457 fixes some bug.
2013-12-27 17:21:13 +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
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
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
zhangcheng
6a9fbfbc60
fixed #3457 update libCocosStudio.vcxproj, add trigger code.
2013-12-27 10:24:50 +08:00
chengstory
7a7d939da0
issue #3457 use C++ 11 auto loop.
2013-12-26 23:51:55 +08:00
chengstory
774e3d8536
issue #3457
...
1. replace UIAction NULL to nullptr.
2. modify class variable name.
2013-12-26 23:40:50 +08:00
chengstory
cfbbb7889b
Merge branch 'develop' into #3457
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-12-26 23:01:34 +08:00
chengstory
26df681915
fixed #3457 remove jsoncpp.
2013-12-26 22:45:23 +08:00
CaiWenzhi
26a7f3474c
Modify reader
2013-12-26 21:02:47 +08:00
boyu0
d32fbbbfca
change GroupCommand variable to class member.
2013-12-26 18:11:23 +08:00
CaiWenzhi
ad535e2fcb
Add listview and pageview reader
2013-12-26 17:53:22 +08:00
chengstory
bd46681867
fixed #3457 continue to fixes failed to build.
2013-12-26 17:37:02 +08:00
chengstory
041e78cb54
Fixes failed to build android.
2013-12-26 17:17:02 +08:00
CaiWenzhi
3206727b9c
Modify actionnode
2013-12-26 17:01:31 +08:00
yinkaile
891d8c3a38
change comment
2013-12-26 16:48:19 +08:00
Liam
a158e25767
modify coco action with new coding rule
2013-12-26 16:36:21 +08:00
boyu0
2fb0179293
change QuadCommand variable to class member.
2013-12-26 16:36:03 +08:00
Liam
bc54707893
modify coco action with new coding rule
2013-12-26 16:29:59 +08:00
yinkaile
f0d4f3f9bf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 16:19:21 +08:00
yinkaile
7027587542
fixed armature update
2013-12-26 15:49:20 +08:00
boyu0
f878864794
Specialize GroupCommand and CustomCommand, change generateCommand to new.
2013-12-26 15:41:47 +08:00
yinkaile
c096743325
change comment
2013-12-26 14:57:38 +08:00
chengstory
ab3cf064d1
fixed #4357 failed to build android.
2013-12-26 13:26:23 +08:00
chengstory
8ae7ecff33
Merge branch 'develop' into #3457
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-12-26 12:55:52 +08:00
yinkaile
b44090b40b
change std::map to std::unordered_map
2013-12-26 10:23:51 +08:00
chengstory
19d75cee01
fixed #3647 fixes ComAttribute warning.
2013-12-26 02:18:28 +08:00
chengstory
8afdf88d25
Test triiger 3.0
2013-12-26 01:17:04 +08:00
CaiWenzhi
eaef723bd7
Remove C cast
2013-12-25 22:13:19 +08:00
yinkaile
5eb961b165
fixed warning
2013-12-25 19:46:09 +08:00
yinkaile
d72c9d94d7
upload trigger code.
2013-12-25 17:40:54 +08:00
CaiWenzhi
570b6c95a7
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 17:29:30 +08:00
yinkaile
369b4da721
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #3456
2013-12-25 16:55:56 +08:00
yinkaile
ebf9833958
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-25 16:47:14 +08:00
yinkaile
13408e4dc5
change play interface name
2013-12-25 16:46:31 +08:00
James Chen
142b189305
Some warning fixes.
2013-12-25 16:06:39 +08:00
James Chen
538da31773
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
2013-12-25 11:18:14 +08:00