a348cbda8b
Move StringUtils functions from deprecated header file to ccUTF8.h ( #15835 )
...
* Move StringUtils functions outside of deprecated header
* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
ea2b73c30e
Renamed ignoreAnchorPointForPosition()
2016-04-22 22:29:49 +09:00
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
c54513bb13
Enumerate getChildren() instead of _children.
2016-03-16 15:03:33 -06:00
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
fefd05e54d
Fix Menu event get released issue
2016-02-02 16:44:32 +08:00
6a6407f711
Pass native references to script scope
2015-12-21 00:16:16 +08:00
eb747cf808
Node::getName() returns string by reference
2015-10-05 21:42:07 +02:00
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
e592a1a02d
fix typos
2015-09-09 11:37:41 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
5d677d49bb
clamp sin value to -1, 1
2015-07-29 10:35:01 +08:00
0d7f1e3672
Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function
2015-07-28 16:05:47 +08:00
2f996b24ef
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-27 16:59:35 +08:00
85d4ce0d5a
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
c4d8ebc780
add Two APIs to Node.
...
1. add getNodeToParentTransform(Node* ancestor)
2. add getNodeToParentAffineTransform(Node* ancestor)
2015-07-20 13:49:23 +08:00
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
c08a355a06
fix the bug of light
...
replace atanf with atan2f
2015-06-17 11:17:46 +08:00
54e23f15e6
Merge pull request #12179 from WenhaiLin/v3-37-physics-ap
...
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-08 16:12:56 +08:00
bd718bb85f
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-04 14:57:37 +08:00
55995ece1a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode
2015-06-04 10:38:39 +08:00
a51a32fa9d
1, add onEnter and onExit of components to CCNode's onEnter and onExit function.
2015-06-03 15:10:48 +08:00
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
847cba026c
added _flags to Action, change API to stopActionsByFlags
2015-05-28 09:52:49 +02:00
98c3ba6f4b
using Action::_tag as flag field
...
adding options to use tag as flag field to Node::stopAllActionsByTag
and ActionManager::removeAllActionsByTag
2015-05-24 17:30:26 +02:00
0644efc55e
isVisitableByVisitingCamera should not affect the calculation of transform
2015-05-22 13:59:45 +08:00
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466254a4b05671818b9a994fbd5f4e02199bf1cf177bbca1a95f0287b42fd3e38b425b2b65d5fa3dd54ddbdbc345548a160d7b409f20967f35a09c50c464c45fab648d1f0779d05
2015-05-05 13:07:32 -07:00
4f96037e15
1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3
...
2. fix bug: memory leak!
2015-04-21 19:38:38 +08:00
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
f55af40016
fix bug: label action in multiple cameras.
2015-04-17 10:19:20 +08:00
1949348124
Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached.
2015-04-10 17:01:21 +08:00
97082cb169
Physics: Fixed position of physics body is wrong when the position of parent node changes
2015-04-10 15:39:39 +08:00
afd4e94c4c
Merge pull request #10160 from lite3/wildpointer
...
fix wild pointer
2015-02-12 18:01:10 +08:00
b233d6928e
Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
...
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-28 15:16:23 +08:00
8f539a0107
Make PositionZ independent from global Z
2015-01-27 15:41:58 -08:00
f2335fb3bc
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-27 16:13:45 +08:00
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
0923a28e4d
fix wild pointer
2015-01-21 21:01:57 +08:00
2a2330438c
fix anchor point bug
2015-01-20 14:10:11 +08:00
af9e49b28d
cache director pointer to improve rendering performance
2015-01-13 10:28:25 +08:00
465bf48442
Merge pull request #9879 from suzukaze/fix-indents
...
Replace tabs with spaces in cocos/2d dir
2015-01-09 14:59:27 +08:00
ba0beaffdc
fixed getParentToNodeTransform. it returned a wrong transform if _transformDirty was true.
2015-01-09 09:58:09 +08:00
e4d560b658
Replace tabs with spaces in cocos/2d dir
2015-01-08 20:17:45 +09:00
61438f7297
[Physics]Reduce temporary object creation and save mathematical labor
2015-01-08 14:25:06 +08:00
8524a5fb97
Improve performance of physics
2015-01-07 17:08:04 +08:00
0db70977f9
wrong scale order
2014-12-25 10:39:48 +08:00
510633ba72
wrong spelling
2014-12-25 10:33:49 +08:00
6eed142e03
rename _rotation_quat to _rotationQuat
2014-12-24 18:12:00 +08:00
17207673ff
merge cocos
2014-12-24 17:34:58 +08:00
88e0f025ef
make it clean
2014-12-24 17:18:09 +08:00
22ae384edf
Rotation representation with quaternion fix #9510
2014-12-24 17:07:54 +08:00
dea483b6ef
performance improve
2014-12-23 18:07:22 +08:00
e8c7f30541
add quaternion
2014-12-22 17:23:44 +08:00
713d19c830
initialize _contentSizeDirty.
2014-12-15 19:43:54 +08:00
4bc4f43b28
Reducing unnecessary function call
2014-11-24 15:27:20 +08:00
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
ec5af7ae90
added missing CC_USE_PHYSICS
2014-10-14 14:12:27 -07:00
8aa03e107f
Merge pull request #8209 from boyu0/fix_physics_crash
...
fix bug: physics crashes when remove/add children too quick.
2014-10-08 13:48:03 +08:00
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
2b0afa6063
fix bug: physics crashes when remove/add children too quick.
2014-09-30 08:15:46 +08:00
31c508ef6d
deprecated Node::_setZOrder()
2014-09-09 10:55:27 +08:00
6b99ce6ec0
Merge pull request #7939 from minggo/remove-_setLocalZOrder
...
remove Node::_setLocalZOrder()
2014-09-09 10:49:09 +08:00
5cca8cc87d
remove Node::_setLocalZOrder()
2014-09-03 17:26:50 +08:00
fab9a0052b
fix normalizedPosition bug
2014-09-03 09:16:31 +08:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
826e1018cb
fix conflict
2014-08-29 16:55:09 +08:00
afaea360fd
Merge pull request #7908 from dabingnn/v3_fix_bugs
...
V3 fix bugs
2014-08-29 16:45:52 +08:00
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
7c870cfcc1
fix skew matrix bug
2014-08-29 09:50:26 +08:00
20d22a1c8a
Users new `// MARK: ` feature to mark sections
...
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
2014-08-28 14:56:15 -07:00
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
681c3c06f1
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
...
stopAllActionsByTag && removeAllActionsByTag
2014-08-28 14:24:37 +08:00
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
4dce59582b
visiting camera
2014-08-08 11:49:59 +08:00
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
e2e8325f58
add safe guard when remove component from node componentContainer
2014-08-06 13:51:16 +08:00
84e82bf497
stopAllActionsByTag && removeAllActionsByTag
2014-07-22 17:14:27 +04:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
316564d58a
Node::enumerateChildren just searches from itself
2014-07-10 11:07:39 +08:00
f7af8938bd
Merge pull request #7277 from darkdukey/fix_rotation3D
...
Fix setRotation3D
2014-07-08 22:05:27 +08:00
f238593bfb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x : (78 commits)
fix ui::Helper::seekWigetByName can not find pages in pageview
[AUTO][ci skip]: updating cocos2dx_files.json
add const for getter. fixed redefinition of 'registerListeners'
Update CCController-android.cpp
fixed missing function
issue #4689 : Refactoring game controller API[ios]
Add resources
version1.2
Remove useless codes
Refactoring game controller API
should not include android cpp files in win/wp project
Remove useless codes
Remove useless codes
Add Lua bindings for utils and CaptureScreen test case
revert Android.mk
issue #4689 : Refactor controller API.
add setXXTEAKeyAndSign
fix indent problems
initialize member variable
fix windows compile and running error
...
2014-07-05 12:26:44 -07:00
4b1f2ccc91
prefixing ivars
2014-07-03 10:16:10 -07:00
mogemimi