dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
432ec49c88
fix issue that ControlButton can't swallow touch event.
2014-04-02 17:01:11 +08:00
a567d467b3
Issue #4277 : fixed a bug of ControlButton that it will crash when it deletes itself in its callback.
2014-03-13 10:14:24 +08:00
c6b2b86fe5
closed #4106 : Object which isn't in Vector would also be released when invoking Vector::eraseObject.
...
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
2014-02-21 11:24:37 +08:00
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
713d89b6d8
issue #2790 : Uses Vector<Invocation*> instead of CCArray* for CCControl. Uses std::unordered_map<int, Vector<Invocation*>*> instead of CCDictionary*.
2013-12-07 14:36:07 +08:00
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
8b1d3af720
added | operator for Control::EventType
2013-11-05 23:55:24 -03:00
50c4261092
closed #3104 : Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
2013-11-01 20:53:51 +08:00
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
261f0e4f05
rename some files
2013-09-21 14:40:54 +08:00
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
2e221ee6cc
Array & Dictionary fixes
...
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.
This patch fixes all those issues.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:12:09 -07:00
fc437c5ef4
(Array*) --> static_cast<Array*>() for CCControl.cpp.
2013-08-09 10:56:39 +08:00
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
5d499d351d
Some more changes to make the code more c++ friendly:
...
- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
- Deprecates the old methods
- adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
- the new one is const
- Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
2013-07-16 18:16:04 -07:00
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
ec902c3550
issue #2373 : Adding missing overload const getter functions.
2013-07-05 15:08:52 +08:00
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
cb67ed0227
issue #2129 : Removing CC prefix for extension module.
2013-06-20 14:15:53 +08:00
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
053efa0537
m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default.
2013-03-29 16:19:34 +08:00
9144946176
Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
2013-03-23 12:18:00 +08:00
d730c9749d
Merge pull request #2117 from vipsbpig/master
...
fixed CCControl::registerWithTouchDispatcher()
2013-03-07 18:56:01 -08:00
ce14169f4d
Update CCControl.cpp
2013-03-08 10:26:16 +08:00
Ricardo Quesada