36fa5ad84e
Remove CC_CONSTRUCTOR_ACCESS, refer to #603
2022-03-18 21:46:07 +08:00
f37ae2d8eb
Update project urls
2022-02-24 18:51:36 +08:00
9eeeb151a1
Committing clang-format changes
2021-12-28 03:00:34 +00:00
0076283252
Huge changes for all string_view
2021-12-26 23:26:34 +08:00
2ba77a42fb
Committing clang-format changes
2021-12-25 02:04:45 +00:00
adf09cf173
Reserve extension GUI for cpp-tests only
2020-10-18 12:31:45 +08:00
6448083c7d
Remove deprecated sources, remove old extension GUI
2020-10-18 00:27:23 +08:00
0d121d7913
remove void in function declaration ( #19954 )
2019-07-22 09:38:46 +08:00
9dc04bf228
remove opengl codes ( #19797 )
2019-06-05 02:58:33 -07:00
18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
6318634887
Merge pull request #14641 from liamcindy/v3_ui_controlButton
...
fix controlButton test error
2015-12-14 19:47:41 +08:00
4d89508377
update for controlButton size
2015-12-14 17:38:52 +08:00
d27f50aaf2
Fix typos in documentation and comments
2015-12-12 21:04:22 +09:00
f877f26bd2
update for controlButton
2015-12-11 11:56:58 +08:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
7493c7bf3e
fxi compile warning
2014-09-03 14:47:04 +08:00
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
c0b0ca0e70
Merge pull request #6655 from zifter/FixCascade
...
Fixed bug with cascade opacity and color for control button. #4881
2014-05-19 11:13:29 +08:00
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
fa45f3f4e0
Fixed bug with cascade opacity for control button.
2014-05-10 04:02:24 +03:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
f51c39c034
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
...
Thank @pandamicro.
2014-03-21 13:44:29 +08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
46009e5daf
Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619
...
Conflicts:
extensions/GUI/CCControlExtension/CCControlButton.cpp
2014-01-09 11:16:44 +08:00
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +08:00
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
07215f1184
Add scale ratio to button touchdown
2013-11-04 17:17:01 +04:00
dd7bfd7b60
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
...
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
2013-09-13 19:06:09 +08:00
d8bd65b2e8
issue #2784:Add class constructor js-binding document
2013-09-13 16:46:31 +08:00
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +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
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
ec902c3550
issue #2373 : Adding missing overload const getter functions.
2013-07-05 15:08:52 +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
d735835753
Fixing coloring in CCControlButtons by overriding the set/get color functions
2013-05-07 13:48:58 -07:00
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
halx99