Ricardo Quesada
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
2014-05-16 14:36:00 -07:00
Mazyad Alabduljaleel
9fa30f2c61
Added Secure input for CCEditBox on Mac
...
[NEW]: Implemented NSSecureTextField when CCEditBox inputFlag is set to Password
[FIX]: Cleanup CCEditBoxMac. CCCustomNSTextField class is not needed.
2014-05-16 11:21:56 +04:00
NatWeiss
146c9da102
Fix compilation error using arch i386
...
Adding a member variable to hold the `placeholderAttributes` property fixes a compilation error regarding synthesis when building with ARCH=i386.
2014-05-14 10:29:11 -07:00
Ricardo Quesada
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
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
James Chen
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
zifter
fa45f3f4e0
Fixed bug with cascade opacity for control button.
2014-05-10 04:02:24 +03:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
Mircea Rila
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
Dale Stammen
8b5d255296
removed obsolete include files
2014-05-05 13:52:20 -07:00
Ricardo Quesada
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
Ricardo Quesada
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
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
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
pandamicro
1966d1f50e
Fixed #4755 : Fix PhysicsSprite transform not updated issue
2014-04-23 17:11:55 +08:00
Huabing.Xu
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
James Chen
a75432ec35
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
...
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
Dale Stammen
29af6f6c7e
updated project settings
2014-04-19 10:13:12 -07:00
Huabing.Xu
3b83d52f95
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
samuele3hu
a9a1e7cb2f
Remove hard codes
2014-04-16 16:08:26 +08:00
samuele3hu
4c9fb311da
Remove hard codes
2014-04-16 16:04:33 +08:00
samuele3hu
edc4dde15f
fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
2014-04-16 15:31:44 +08:00
Huabing.Xu
d14d3007d0
remove kazmath include file
2014-04-16 14:08:58 +08:00
Huabing.Xu
0dab97919f
add missed line in PhysicSprite.cpp
2014-04-16 10:46:10 +08:00
Huabing.Xu
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
Huabing.Xu
e351b778c1
migrate setAnchorPoint to Vector2
2014-04-15 16:47:29 +08:00
Huabing.Xu
6686b657a4
Migrate getPostion and correspondent member variable to Vector2
2014-04-15 16:28:59 +08:00
Huabing.Xu
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
Mazyad Alabduljaleel
b369c24f01
+ [NEW]: setting the font for Editbox text
...
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
2014-04-13 00:19:14 +04:00
Huabing.Xu
867c60a971
remove kmMat4 in PhysicsSprite.cpp
2014-04-11 17:27:55 +08:00
Huabing.Xu
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
koowolf
b5433f05c1
replace LabelTTF with Label
2014-04-10 16:51:25 +08:00
koowolf
aa51e5dd22
fix compiler error in wp8
2014-04-10 15:15:17 +08:00
James Chen
0c3c29b50d
Remove unused comments in CCEditBoxImplIOS.mm
2014-04-10 11:22:55 +08:00
James Chen
150e73ba62
Merge commit 'refs/pull/6197/head' of git://github.com/cocos2d/cocos2d-x into pull/6197
2014-04-10 11:21:16 +08:00
James Chen
efb443dea0
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
...
issue #4729 : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
Huabing.Xu
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
Dhilan007
390685ae93
Label:Change setter of system font name.
2014-04-10 10:23:00 +08:00
James Chen
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
Dhilan007
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
Dhilan007
76689cda1a
fixed compile errors.
2014-04-09 21:40:10 +08:00
Dhilan007
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
Anton Sokolchenko
e98e4c403f
Potential leak of an object stored into "self"
...
1. By executing 314: _systemControl = [[CCEditBoxImplIOS_objc alloc] initWithFrame:rect editBox:this];
2. We entered to the function 67: -(id) initWithFrame: (CGRect) frameRect editBox: (void*) editBox
3. Then 69: "self = [super init];" returns object with +1 retain count
4. 93: "return nil" Potential leak of an object stored into "self".
2014-04-09 12:00:15 +03:00
Huabing.Xu
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
Huabing.Xu
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
Huabing.Xu
b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
Huabing.Xu
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +08:00
Huabing.Xu
5d70170a4b
getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4
2014-04-04 18:41:29 +08:00
Huabing.Xu
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
Huabing.Xu
bb19e39e37
migrate ScrollView to director matrix stack
2014-04-03 15:55:37 +08:00
andyque
0a6b0a4389
issue #4636 . refactor Scale9Sprite
2014-04-03 10:07:47 +08:00
Ryeeeeee
432ec49c88
fix issue that ControlButton can't swallow touch event.
2014-04-02 17:01:11 +08:00
James Chen
48839b9d4d
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 11:26:39 +08:00
Dale Stammen
9f68a1111e
added wp8 editbox support
2014-03-28 16:03:09 -07:00
Dale Stammen
623b7ae3f5
added wp8 support files and projects
2014-03-28 15:42:41 -07:00
Dhilan007
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
Dhilan007
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
andyque
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +08:00
minggo
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
James Chen
8d28884c9f
Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel
...
issue #3821 : Uses new label instead of LabelTTF in engine.
2014-03-25 13:46:17 +08:00
Dale Stammen
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
Dale Stammen
60d967b5f6
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:13:27 -07:00
Dale Stammen
44e6efea64
#pragma mark for ios and mac only
2014-03-22 06:08:05 -07:00
James Chen
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
James Chen
f7e003758f
issue #4448 : Respond to move event if dragging is enabled, no matter whether mouse is in the content of cocos2d::extension::ScrollView.
2014-03-19 17:11:34 +08:00
James Chen
02ee3a52eb
closed #4448 : Elastic bounce back effect support for cocos2d::extension::ScrollView.
2014-03-19 17:11:34 +08:00
Jeong YunWon
2f1a7ebf42
Elastic bounceback for ScrollView
...
Add iOS-like elastic bounceback.
If you scroll content of scroll view out of insets,
its content will be scrolled 0.35 of user scrolled distance.
2014-03-18 18:51:07 +09:00
Dhilan007
e512235299
Remove the old implementation of LabelTTF
2014-03-14 21:06:40 +08:00
Dhilan007
cea307bfb8
EditBox:fixed nothing to display when input flag is PASSWORD on Android.
2014-03-13 22:16:38 +08:00
James Chen
1595465361
Merge pull request #5736 from Dhilan007/develop_editbox
...
EditBox:fixed clip the text width to fit to the text box on Android and IOS.
2014-03-13 18:36:48 +08:00
dingpinglv
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
Dhilan007
9c9d2c24bf
EditBox:fixes clip the text width to fit to the text box on Android and IOS.
2014-03-12 21:40:58 +08:00
James Chen
a393eded58
CCLOG -> CCLOGINFO for change of EditBox's position.
2014-03-12 14:16:42 +08:00
James Chen
08ce108454
Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since After re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now.
...
We need to fix this as soon as possible.
2014-03-12 14:12:07 +08:00
koowolf
0aaa1dc0db
closed #4291:open CCEditBox as modal dialog
2014-03-06 22:17:20 +08:00
minggo
8666e63b41
Merge pull request #5555 from dabingnn/develop_fixControlSwitchBug
...
Develop fix control switch bug
2014-03-05 18:26:32 +08:00
Huabing.Xu
61ae219a5c
fix: controlSwitch Bug
2014-03-05 14:03:44 +08:00
zhangbin
6462c0bfaf
Solve the bug: debug frames are not shown in ChipmunkTest.
2014-03-05 11:41:46 +08:00
Ricardo Quesada
7ac663e02c
GL Program API fixes
2014-03-04 13:51:43 -08:00
Ricardo Quesada
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
andyque
7d2db27cae
fixed #3599 . use a scheduler to fix the position of editbox when it's parent postion has been changed
2014-03-03 15:46:43 +08:00
Ricardo Quesada
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
Ricardo Quesada
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
Ricardo Quesada
eb66ddd931
visit and draw improved.
...
`visit()` and `draw()` are improved.
they both receive:
- `Renderer`
- `kmMat4` for transformation
- `bool` whether or not the transform changed from the previous frame
Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).
Those parameters are needed for:
- `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
- we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
- whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.
We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
2014-02-27 21:43:54 -08:00
James Chen
3885772e5f
Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7
...
closed #2920 : fix bug: voice recognition input crash on ios7
2014-02-21 13:46:31 +08:00
James Chen
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
James Chen
b06a98b8ee
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058
2014-02-20 21:01:52 +08:00
James Chen
e59a14f205
Merge pull request #5058 from zhiqiangxu/develop
...
ScrollView should implement ActionTweenDelegate
2014-02-20 20:33:04 +08:00
James Chen
be507f6fda
Merge pull request #5059 from zhiqiangxu/useless_code_in_scrollview
...
delete useless code in deaccelerateScrolling
2014-02-20 20:20:28 +08:00
boyu0
6f7dde3a99
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-20 16:51:21 +08:00
James Chen
a079c9759a
issue #4097 : Deletes CCEditBoxImplTizen.h/.cpp.
2014-02-20 16:42:28 +08:00
James Chen
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
James Chen
472c630277
issue #4097 : Deletes CCEditBoxImplTizen.h/.cpp.
2014-02-20 16:40:12 +08:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
boyu0
0b07d376f6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-19 13:42:02 +08:00
boyu0
a261ba9df2
issue #2920 : Change internal ios keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad
2014-02-17 14:33:26 +08:00
Denis
3595a4f31b
-fixed memleak
2014-02-12 16:48:18 +03:00
boyu0
20ee1d2666
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-07 11:37:01 +08:00
Ricardo Quesada
7da8c84a75
Renames EGLView -> GLView
2014-01-30 16:51:43 -08:00
Ricardo Quesada
862500f99a
Renames EGLView -> GLView
2014-01-30 15:40:56 -08:00
Ricardo Quesada
4cbbd8a9f5
EGLView is not longer a singleton
2014-01-30 15:11:54 -08:00
Ricardo Quesada
efaec7b7ec
Merge branch 'develop' into glview_improvements
...
Conflicts:
samples/Lua/HelloLua/Classes/AppDelegate.cpp
template/multi-platform-lua/Classes/AppDelegate.cpp
2014-01-27 10:52:35 -08:00
boyu0
00b5a9add5
issue #2920 : fix indent
2014-01-27 18:22:35 +08:00
boyu0
e16e6a8e84
issue #2920 : fix coding style
2014-01-27 18:19:10 +08:00
boyu0
23d2d586ed
closed #2920 : fix bug voice recognition input crash on ios7
2014-01-27 18:08:34 +08:00
James Chen
1c20df5ca9
Makes an assert if CC_ENABLE_CHIPMUNK_INTEGRATION was not enabled in PhysicsDebugNode::create.
2014-01-26 20:05:51 +08:00
James Chen
13cbaf4968
Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file.
2014-01-26 19:35:21 +08:00
James Chen
8902359db0
Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled.
2014-01-26 18:32:50 +08:00
James Chen
e8229ad4e3
Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION or CC_ENABLE_BOX2D_INTEGRATION in CCPhysicsSprite.h.
2014-01-26 17:56:14 +08:00
James Chen
25b15d94d4
[Android] Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in extension project. Define it in `Application.mk` instead.
2014-01-26 17:55:38 +08:00
Ricardo Quesada
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
James Chen
a63f092d94
closed #3808 : EditBox on Mac works again.
2014-01-22 10:53:43 +08:00
James Chen
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
Ricardo Quesada
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
Ricardo Quesada
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
Ricardo Quesada
1b5b9da102
compiles on Android
...
compiles on Android
2014-01-16 21:58:14 -08:00
Ricardo Quesada
cfbceb0e22
Fixes compilation issues on Linux
2014-01-16 21:49:14 -08:00
Ricardo Quesada
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
xuzhiqiang
6dc6101357
more useless code
2014-01-14 22:40:02 +08:00
xuzhiqiang
8f76080b15
more useless code
2014-01-14 22:30:38 +08:00
James Chen
b9dfad3df3
Merge pull request #5039 from martell/win64
...
closed #3700 : Added x64 support for Windows - CCExtensions
2014-01-14 05:49:42 -08:00
xuzhiqiang
f59c969216
delete useless code in deaccelerateScrolling
2014-01-14 21:22:55 +08:00
xuzhiqiang
3a86ec1ead
fix compile
2014-01-14 20:36:37 +08:00
xuzhiqiang
a2afff85a8
fix compile
2014-01-14 20:33:02 +08:00
xuzhiqiang
1d30bd0d80
fix compile
2014-01-14 20:27:14 +08:00
xuzhiqiang
4eafd7b4c5
CCActionTweenDelegate => ActionTweenDelegate
2014-01-14 20:19:57 +08:00
xuzhiqiang
562fdcf98b
CCScrollView should inherit CCActionTweenDelegate
2014-01-14 20:03:12 +08:00
Dhilan007
d7593fd0f0
fix wrong judgments of conditional compilation.
2014-01-13 11:24:49 +08:00
Dhilan007
fd11791389
add a blank line at the file end.
2014-01-13 10:37:31 +08:00
Dhilan007
34a79a02e7
fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero.
2014-01-13 10:32:34 +08:00
martell
23cf748534
Added x64 support for Windows - CCExtensions
2014-01-11 12:31:04 +00:00
WuHuan
16367b7594
solve conflicted with math.h isnan
2014-01-10 14:20:00 +08:00
WuHuan
2f4b094598
Merge pull request #4 from cocos2d/develop
...
update
2014-01-09 02:56:21 -08:00
Dhilan007
ccda90cab5
fix compiling error in CCControlSlider.cpp on vs.
2014-01-09 15:52:04 +08:00
James Chen
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
James Chen
d4ff0ff7b8
Merge pull request #4075 from v1ctor/fix-extensions-slider
...
closed #3615 : ControlSlider doesn't support setting selected thumb sprite
2014-01-08 18:50:34 -08:00
WuHuan
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
WuHuan
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
James Chen
e93b567000
ScrollView::intWithView supports be invoked several times.
2014-01-07 22:16:24 +08:00
James Chen
4bb091067f
Adds empty constructor for TableView and TableViewCell.
2014-01-07 22:15:20 +08:00
James Chen
26efb4bf5c
long —> ssize_t for some classes.
2014-01-07 18:26:31 +08:00
James Chen
5c217f70d1
ScrollView uses new renderer now.
2014-01-07 17:46:24 +08:00
James Chen
2a3481f20c
Moves temp files to CURRENT_BINARY_DIR.
2014-01-06 23:44:36 -08:00
James Chen
d74d21a6f0
Merge pull request #4884 from daltomi/debug
...
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
2014-01-05 19:08:37 -08:00
Daniel T. Borelli
8ffb05b6c9
Linux fix missing file -> rename dir loadSceneEditorFileTest to LoadScene...; add string::npos; const correctness
2014-01-04 19:26:16 -03:00
James Chen
6827538802
Adds override keyword for override functions.
2014-01-04 18:12:09 +08:00
Dhilan007
35246b0810
fix compiling error and miss file on vs.
2014-01-04 12:25:12 +08:00
Huabing.Xu
d75d2159dd
fix control switch bug
2014-01-03 19:53:14 +08:00
James Chen
d1ad635ad8
Merge pull request #4497 from zhiqiangxu/develop
...
closed #3559 : Useless conversion in ScrollView::onTouchBegan
2014-01-01 17:55:41 -08:00
James Chen
6fb3a8c081
Merge pull request #4513 from gamechefs/dcurlfix
...
closed #3534 : Fixes to asset manager to ensure there is no crash on DNS resolver as well as no hanging if connection breaks during download
2013-12-27 04:11:08 -08:00
James Chen
93ed5a4f0f
long --> ssize_t for TableView callback.
2013-12-26 04:09:24 -08:00
boyu0
07925d112e
issue #2920 : add version detect.
2013-12-25 17:21:28 +08:00
boyu0
3764005d88
issue #2920 : add “FIX ME” comment.
2013-12-25 14:46:29 +08:00
boyu0
622431758e
issue #2920 : temporary fix dictation input crash on ios7.
2013-12-25 10:22:52 +08:00
James Chen
ed93f90ccc
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
2013-12-23 16:58:26 +08:00
minggo
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
Ricardo Quesada
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
Huabing.Xu
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
boyu0
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
James Chen
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +08:00
Omer Saeed
f831a2f1b9
Fixes to asset manager in the MASTER branch
2013-12-17 20:09:21 +05:00
Huabing.Xu
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
James Chen
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
James Chen
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
Ricardo Quesada
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
xuzhiqiang
e8f55069e3
reduce useless convert
2013-12-16 18:20:10 +08:00
xuzhiqiang
f797dea827
bug fix
2013-12-16 12:27:30 +08:00
Huabing.Xu
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
boyu0
c15ad14ed3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-16 03:45:06 +08:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
Dhilan007
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
Huabing.Xu
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
minggo
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
minggo
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
boyu0
00b115843c
issue #3162 : add updateColor function to Label and delete duplicate functions.
2013-12-11 16:38:47 +08:00
boyu0
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
James Chen
f1fac73bb4
issue #2790 : Fix wrong include.
2013-12-07 16:14:00 +08:00
James Chen
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
James Chen
d8061477c1
issue #2790 : Removes CCSort.h/.cpp from projects.
2013-12-07 14:21:01 +08:00
James Chen
a12a101548
issue #2790 : Removes CCSorting.h/.cpp, uses Vector<T> for storing used and freed cells.
2013-12-07 14:17:47 +08:00
boyu0
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
boyu0
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
minggo
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
James Chen
18d604d349
issue #2790 : Bug fix in CCScale9Sprite.cpp. Sprite::Sprite::create --> Sprite::create
2013-12-04 16:02:54 +08:00
James Chen
f6676bd7ef
issue #2790 : [] -> getObjectAtIndex.
2013-12-04 16:02:51 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
minggo
c78ce63f14
use ThreadHelper::runOnGLThread() in AssetsManager
2013-11-28 11:06:08 +08:00
James Chen
a04c45f0d9
issue #3258 : Renames ControlSwitchSprite::createWithMaskSprite to ControlSwitchSprite::create.
2013-11-26 16:19:12 +08:00
Ricardo Quesada
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
Ricardo Quesada
d3c44cbb0b
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
James Chen
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
Ricardo Quesada
c943702bc8
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
samuele3
b281a2f06f
Hot fix:repalce unsigned int/int type of params with long to solve tableview bug
2013-11-18 15:55:58 +08:00
Ricardo Quesada
208d25bdff
ControlSwitch compies
...
Uses procted constructor
2013-11-15 12:04:47 -08:00
Ricardo Quesada
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
Ricardo Quesada
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
minggo
38eabaf315
fix warning
2013-11-14 14:09:12 +08:00
minggo
23b2bdb6eb
Merge pull request #4137 from HoGarfield/AssetsManager.uncompress
...
[ci skip]Adding test whether the file directory exists when uncompressing file entry,if does not exist then create directory
2013-11-13 18:39:42 -08:00
Ricardo Quesada
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
minggo
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
James Chen
394f4e703b
Reverting AssetsManager::update.
2013-11-11 17:06:32 +08:00
boyu0
6c1144ee79
issue #2770 : fix some warning
2013-11-11 12:49:38 +08:00
garfield_ho
2c76d8c150
There are not directory entry in some case.So we need to test whether the file directory exists when uncompressing file entry, if does not exist then create directory
2013-11-08 11:23:06 +08:00
minggo
109adaf337
Merge pull request #4103 from luisparravicini/issue-2882
...
[ci skip]added | operator for Control::EventType
2013-11-07 18:59:33 -08:00
Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
Luis Parravicini
8b1d3af720
added | operator for Control::EventType
2013-11-05 23:55:24 -03:00
Victor Buldakov
bebd8c63ab
Merge branch 'develop' into fix-extensions-slider
2013-11-04 20:32:15 +04:00
Victor Buldakov
67cbd929e4
Merge branch 'develop' into fix-button-scale-to
2013-11-04 20:30:14 +04:00
Victor Buldakov
07215f1184
Add scale ratio to button touchdown
2013-11-04 17:17:01 +04:00
James Chen
9be8ca3714
[cmake] output lib to root/lib
2013-11-04 21:03:08 +08:00
James Chen
922924e1ab
TestCpp is ok.
2013-11-04 21:03:07 +08:00
samuele3
790be0decc
issue #3037:Modify vs2012 config
2013-11-04 14:43:22 +08:00
Victor Buldakov
5213aa7bc9
fix cc
2013-11-04 01:27:16 +04:00
Victor Buldakov
20cb7a6cbc
Merge branch 'develop' into fix-extensions-slider
2013-11-04 01:23:36 +04:00
Victor Buldakov
550245c6dc
Add selected image to slider
2013-11-04 01:17:32 +04:00
James Chen
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
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
James Chen
262b54eef2
issue #3069 : Updating ScrollView.
2013-10-25 16:06:52 +08:00
James Chen
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
James Chen
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
James Chen
d8683ef705
Merge pull request #3988 from lite3/develop
...
closed #3060 : The Node's anchor point was changed after being added to ScrollView.
2013-10-24 03:01:49 -07:00
samuelhu
26caaa0a36
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-23 09:57:21 +08:00
minggo
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
minggo
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
lite3
c6f9f0e406
do not change anchor point of child.
2013-10-22 11:30:53 +08:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
Dhilan007
8fb0327597
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 14:57:33 +08:00
minggo
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
Dhilan007
c6344875de
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:30:51 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
Dhilan007
5116e91c4b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
2013-10-16 11:00:22 +08:00
minggo
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
Dhilan007
2865ad798b
issues #2905:Updating project configuration for folder change.
2013-10-15 10:18:37 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
f3f24e3bbd
issue #2905:use - to connect multiple words
2013-10-12 13:54:16 +08:00
minggo
ad6325b0dd
fix conflicts
2013-10-12 11:31:32 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
James Chen
edcf9fecb4
[Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'.
2013-10-11 21:52:28 +08:00
James Chen
f05225ae4c
Merge pull request #3888 from ktaobo/avoid-copy
...
Avoid unnecessary object duplication using passing arguments by reference
2013-10-11 00:09:28 -07:00
Keita Obo
43c2001d71
Avoid unnecessary object duplication using passing arguments by reference
2013-10-10 22:06:10 +09:00
minggo
6e62be5443
issue #2905 : modify makefile to include correct header files
2013-10-10 17:39:53 +08:00
minggo
866906fd58
issue #2905:modify project settings to include correct audio path
2013-10-10 15:40:06 +08:00
rablwupei
5ea249a265
fix memory leak
2013-10-08 20:03:10 +08:00
Dhilan007
cafe930026
issues #2774:AssetsManager Test downloading progress label not sync with actual download.
2013-09-29 09:48:55 +08:00
CaiWenzhi
72f02f47a0
Modify version
2013-09-26 14:16:22 +08:00
CaiWenzhi
8a2cdf5a48
Modify wrong codes.
2013-09-25 19:04:37 +08:00
James Chen
3ffad35f0e
Merge pull request #3741 from signmotion/develop
...
Fixed some compiling-warnings (MSVC2012).[ci skip]
2013-09-24 02:27:14 -07:00
CaiWenzhi
f4471ae93c
Modify layout enum
2013-09-23 21:26:44 +08:00
CaiWenzhi
be7c7a5f0b
Modify windows project.
2013-09-23 19:54:43 +08:00
CaiWenzhi
fa892c2158
Remove layoutexecutant class
2013-09-23 19:16:20 +08:00
Michael Contento
f6dcf88685
Prevent nullptr access in AssetsManager
2013-09-23 12:05:22 +02:00
Liam
c4dfdbcb14
change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN
2013-09-23 14:44:55 +08:00
Liam
082e28b631
fixed action node crash
2013-09-23 14:34:50 +08:00
signmotion
7d139a3bc3
Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').
2013-09-22 23:50:54 +03:00
Liam
e8cf0a1485
add judgment for retaining _actionSpawn
2013-09-22 23:55:12 +08:00
Liam
0840baa1ab
retan ActionNode _actionSpawn while create
2013-09-22 22:49:25 +08:00
minggo
261f0e4f05
rename some files
2013-09-21 14:40:54 +08:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
minggo
4c9771ba3c
rename some class names to obey cocos2d-x coding style
2013-09-20 19:19:31 +08:00
James Chen
c38dfb6a17
issue #2087 : Setting default touch priority to -1 for CCInputDelegate
2013-09-19 09:24:11 +08:00
James Chen
d7274b9475
issue #2087 : Should not use fixed priority with 0 value, it's for scene graph based priority.
2013-09-19 09:19:03 +08:00
James Chen
db98d662af
issue #2087 : Fixing crash of ComponentTest.
2013-09-19 09:15:56 +08:00
James Chen
3fbf61ad52
issue #2087 : Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes.
2013-09-19 09:14:51 +08:00
Liam
3515a4f286
limited action frame index
2013-09-18 16:36:16 +08:00
minggo
801b7831df
Merge pull request #3671 from chengstory/#4684
...
Remove unused files from mk files.
2013-09-17 22:08:38 -07:00
zhangcheng
820b8630dc
1. fixes failed to build linux.
2013-09-18 11:51:14 +08:00
zhangcheng
529d43544f
1. rename CCCActionFrameEasing.cpp to CCActionFrameEasing.cpp.
2013-09-18 11:22:30 +08:00
zhangcheng
0708edb762
1. remove CocoStudio/GUI/Action *.cpp *.h
2013-09-17 23:45:53 +08:00
James Chen
f403f7d683
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-09-17 23:24:14 +08:00
James Chen
513237d5f6
Fixing armature test crash.
2013-09-17 23:03:33 +08:00
zhangcheng
c065dd2920
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
2013-09-17 22:41:42 +08:00
zhangcheng
a1d2045793
1.rename cocoaction system files
2013-09-17 22:39:42 +08:00
CaiWenzhi
1f45bad5e7
Modify guy example
2013-09-17 21:19:04 +08:00
zhangcheng
ec401d1148
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
2013-09-17 21:15:36 +08:00
zhangcheng
b86a8271d9
1. Upload Cocostudio Action.
2013-09-17 21:14:45 +08:00
CaiWenzhi
d9721a41dd
Merge branch 'develop' into Merge_GUI_to_Develop
2013-09-17 21:01:50 +08:00
James Chen
e3a34bd5c5
Merge pull request #3657 from 2youyouo2/develop
...
update armature[ci skip]
2013-09-17 05:45:17 -07:00
CaiWenzhi
f42797bc0d
Merge branch 'develop' into Merge_GUI_to_Develop
2013-09-17 20:43:16 +08:00
CaiWenzhi
841408d1bc
Modify events methods
2013-09-17 20:34:26 +08:00
2youyou2
57ec881727
support set tween key
2013-09-17 20:14:08 +08:00
CaiWenzhi
9d07b2c1d2
Temp commit
2013-09-17 20:13:23 +08:00
James Chen
1896305fcb
closed #2450 : Fixing HttpClientTest crashes on 64bit system.
2013-09-17 18:21:20 +08:00
CaiWenzhi
9d6d9dcd19
Add getDescription method
2013-09-17 17:59:20 +08:00
2youyou2
07f72ac1b4
Change rotation range from(-180 -- 180) to (-infinity -- infinity)
2013-09-17 16:40:47 +08:00
zhangcheng
a25c2cabf8
1. Fixes failed to build windows.
...
2. Upload CocoGUI Resources.
2013-09-17 13:25:15 +08:00
James Chen
28b266bc5e
[Android] Android.mk fixes after adding GUI test.
2013-09-17 10:49:59 +08:00
James Chen
157ffa9299
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
...
Merge gui to develop 3.0 branch
2013-09-16 07:45:23 -07:00
CaiWenzhi
0b48552f04
Modify scene reader
2013-09-16 21:07:11 +08:00
James Chen
b128018f76
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
...
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-09-16 20:58:26 +08:00
CaiWenzhi
759fcc147b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop
2013-09-16 20:55:55 +08:00
CaiWenzhi
ca599b4852
Merge guy to 3.0 branch
2013-09-16 20:54:13 +08:00
signmotion
5dffb1b44e
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
2013-09-16 15:38:03 +03:00
James Chen
72c2d4ca35
Merge branch 'develop' into 2youyouo2-develop
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:12:03 +08:00
James Chen
c12a655fdf
[GUI] Fix compilation error on win32.
2013-09-16 20:05:25 +08:00
James Chen
621e682e6e
[GUI] Fixing compilation errors for win32.
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:00:48 +08:00
James Chen
dba7f3eae6
[GUI] Fixing compilation errors for win32.
2013-09-16 19:53:59 +08:00
James Chen
208f705845
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-09-16 18:18:23 +08:00
James Chen
cc41377591
[CocoGUI] Updating linux makefile.
2013-09-16 17:24:25 +08:00
James Chen
3e7708dcd1
Updating Android.mk
2013-09-16 17:12:15 +08:00
James Chen
5ee8ad8c4f
Fix compilation errors for CocoGUI.
2013-09-16 17:12:15 +08:00
CaiWenzhi
210af21615
Modify member names
2013-09-16 17:12:15 +08:00
CaiWenzhi
a6428824d5
Modify makefiles
2013-09-16 17:12:15 +08:00
CaiWenzhi
cf4b8c0163
Add guy loading of scene
2013-09-16 17:12:15 +08:00
CaiWenzhi
4843046d17
Merge GUI to develop step 1;
2013-09-16 17:12:15 +08:00
2youyou2
a08ce3df73
change singleton class get method to getInstance
2013-09-16 15:16:05 +08:00
2youyou2
16c70363dd
standardizate code
2013-09-16 14:56:59 +08:00
2youyou2
302555e711
standardizate code
2013-09-16 14:13:55 +08:00
2youyou2
d8b64b8645
standardize code
2013-09-16 12:21:18 +08:00
zhangcheng
d4496ac02d
1. replace "CCFileUtils" to "FileUtils".
2013-09-16 12:16:11 +08:00
2youyou2
b7b079c1c6
standardize code
2013-09-16 12:02:57 +08:00
2youyou2
c767ff355c
delete extensions/CCArmature
2013-09-16 11:46:08 +08:00
James Chen
e31c4f008d
Merge pull request #3597 from chengstory/#4560
...
SceneEditorTest He version
2013-09-15 20:23:05 -07:00
2youyou2
ac8261bcd5
update Android.mk
2013-09-16 09:56:25 +08:00
2youyou2
77db15bd0d
change variables name
2013-09-15 20:24:25 +08:00
2youyou2
db4813f161
1.remove CC from class name
...
2.fix async loading
2013-09-15 19:08:45 +08:00
2youyou2
9fd89dbfc2
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CCArmature/CCArmature.cpp
extensions/CCArmature/CCArmature.h
extensions/CCArmature/CCBone.cpp
extensions/CCArmature/CCBone.h
extensions/CCArmature/animation/CCArmatureAnimation.cpp
extensions/CCArmature/animation/CCTween.cpp
extensions/CCArmature/animation/CCTween.h
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/datas/CCDatas.h
extensions/CCArmature/display/CCDecorativeDisplay.cpp
extensions/CCArmature/display/CCDecorativeDisplay.h
extensions/CCArmature/display/CCDisplayFactory.cpp
extensions/CCArmature/display/CCDisplayFactory.h
extensions/CCArmature/display/CCDisplayManager.cpp
extensions/CCArmature/display/CCDisplayManager.h
extensions/CCArmature/display/CCSkin.cpp
extensions/CCArmature/display/CCSkin.h
extensions/CCArmature/external_tool/CCTexture2DMutable.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.h
extensions/CCArmature/external_tool/Json/lib_json/json_reader.cpp
extensions/CCArmature/external_tool/Json/lib_json/json_value.cpp
extensions/CCArmature/external_tool/Json/lib_json/value.h
extensions/CCArmature/physics/CCColliderDetector.cpp
extensions/CCArmature/physics/CCColliderDetector.h
extensions/CCArmature/utils/CCArmatureDataManager.cpp
extensions/CCArmature/utils/CCArmatureDefine.h
extensions/CCArmature/utils/CCDataReaderHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.h
extensions/CCArmature/utils/CCUtilMath.cpp
extensions/cocos-ext.h
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.h
samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson
2013-09-15 15:19:13 +08:00
2youyou2
b329eb3854
update linux Makefile
2013-09-14 23:47:15 +08:00
yinkaile
5e1f91d396
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CocoStudio/Armature/CCArmature.h
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
extensions/CocoStudio/Armature/animation/CCProcessBase.h
extensions/CocoStudio/Armature/animation/CCTween.h
extensions/CocoStudio/Armature/datas/CCDatas.h
extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
extensions/CocoStudio/Armature/display/CCDisplayManager.h
extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
extensions/CocoStudio/Armature/physics/CCColliderDetector.h
extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
2013-09-14 19:54:49 +08:00
zhangcheng
0121943c11
1. Adds SceneEditorTest hd version
2013-09-14 16:34:26 +08:00
James Chen
997a5a36c1
[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.
2013-09-14 09:02:49 +08:00
James Chen
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
yinkaile
74bd8b09d6
update armature
2013-09-13 18:07:37 +08:00
samuele3hu
d8bd65b2e8
issue #2784:Add class constructor js-binding document
2013-09-13 16:46:31 +08:00
samuele3hu
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
James Chen
c90291e01d
ScrollView::_touches is std::vector now, so it should not be inited by NULL pointer.
2013-09-12 21:02:30 +08:00
James Chen
6f37529236
[dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private.
2013-09-12 20:47:15 +08:00
James Chen
24c8438fa6
[Dispatcher] Updating Android.mk, and some refractor.
2013-09-12 17:31:37 +08:00
James Chen
6a2536b5bd
[Dispatcher] Fixing logic errors in CCScrollView after using EventDispatcher.
2013-09-12 16:03:03 +08:00
James Chen
5d95711865
[EventDispatcher] Fixing compilation error after changing of Touch(It doesn't inherit from Object).
2013-09-12 14:42:56 +08:00
James Chen
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
chengstory
bdfde89ef8
Merge branch '#develop' into #4551
...
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-09-10 16:25:31 +08:00
chengstory
e04a47b807
1. update mkfile.
2013-09-10 13:08:05 +08:00
chengstory
9bf6ab1e16
1. fixes error of 34 line in android.mk.
2013-09-10 11:50:08 +08:00
chengstory
8b509c456f
1. add shadernode.cpp to linux, nacl mk files.
2013-09-10 11:47:02 +08:00
chengstory
100228b4ae
1. fixes failed to build on linux.
2013-09-10 11:21:18 +08:00
chengstory
669de88e73
1. remove any unused functions.
2013-09-10 11:02:50 +08:00
zhangcheng
1115d0d3f9
1. merge scenereader Armature merge to cocos2dx 3.0.
2013-09-09 19:51:26 +08:00
성낙호
bf4eaa7e7c
merged
2013-09-09 18:20:16 +09:00
James Chen
b8c82ae5a9
[develop] Warning fixes.
2013-09-08 11:26:38 +08:00
성낙호
95c6c66d58
* obey naming convention
...
* hide unnecessary methods from public.
2013-09-06 16:10:11 +09:00
Ricardo Quesada
530a0119ae
`getNodeToParent()` returns a `const &`
...
This gives a little performance improvement.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 18:31:32 -07:00
minggo
c4a97cdfa1
Merge pull request #3485 from ricardoquesada/perf_and_bug_fixes
...
Perf and bug fixes
2013-08-26 23:22:33 -07:00
Ricardo Quesada
0093263c18
Little performance improvements
...
Uses `AffineTransform::IDENTITY`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
samuele3hu
6ae80bcaf0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-23 16:14:19 +08:00
minggo
ddb4219d24
Merge pull request #3457 from boyu0/iss2434_gen_android_mk
...
closed #2434 : Add android_mk_generator.py to generate Android.mk
2013-08-22 03:05:11 -07:00
boyu0
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
samuele3hu
3b90d0b5b6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 13:40:35 +08:00
Ricardo Quesada
d7590affda
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/cocoa/CCArray.cpp
cocos2dx/cocoa/CCArray.h
cocos2dx/label_nodes/CCLabel.cpp
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/display/CCDisplayManager.cpp
2013-08-21 21:27:44 -07:00
minggo
d9da52ce86
Merge pull request #3454 from minggo/array-support-sort
...
Array can be use in stl::sort() when not using vector inside
2013-08-21 20:50:03 -07:00
boyu0
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
Ricardo Quesada
a3eb0a058e
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/platform/mac/CCFileUtilsMac.mm
extensions/CCBReader/CCBAnimationManager.cpp
extensions/CCBReader/CCBReader.cpp
extensions/CCBReader/CCBSequenceProperty.cpp
extensions/GUI/CCScrollView/CCScrollView.cpp
2013-08-21 20:27:19 -07:00
Ricardo Quesada
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
Ricardo Quesada
4104cdc20e
Better destructors logs
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:08:51 -07:00
samuele3hu
27c59a799d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 11:01:38 +08:00
minggo
2de8963a0a
fix warnings caused by deprecating some functions of Array
2013-08-22 10:45:47 +08:00
samuele3hu
3cb095f48a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 10:17:59 +08:00
James Chen
1ee7790f0e
Initializing Array after it was constructed.
2013-08-22 10:15:47 +08:00
xbruce
d2684338a5
Update CCScrollView.cpp
...
change release mode
2013-08-20 14:58:26 +08:00
minggo
f97f7edeb6
Merge pull request #3440 from ricardoquesada/better_array
...
Better array
2013-08-19 23:39:36 -07:00
samuele3hu
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
James Chen
7e3d3b3d3e
Merge pull request #2950 from zcgit/develop
...
a potential bug in Layer.
2013-08-19 19:02:53 -07:00
Ricardo Quesada
511ec1cc5d
Compiles with improved CCArray
...
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
James Chen
175316f2c6
Merge pull request #3404 from timothyqiu/docfix
...
Documentation fix: broken links and wrong encoding in the doc...
2013-08-18 19:35:47 -07:00
성낙호
200a1ec831
style edited
2013-08-16 19:03:27 +09:00
samuele3hu
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
samuele3hu
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
samuele3hu
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
James Chen
86fef75963
issue #2521 : Removing an unused method ControlStepper::setValue(double value, bool send); since it's not implemented and there is an similar method 'setValueWithSendingEvent' could replace it.
2013-08-12 11:20:48 +08:00
James Chen
a34c70d253
issue #2521 : Fixing a logical error in CCBReader::addOwnerOutletNode. 'NULL != node' --> 'NULL == node'.
2013-08-12 11:19:21 +08:00
James Chen
331f0ef7b0
issue #2521 : Capture event of ControlButton in CCB for JSB.
2013-08-12 11:18:07 +08:00
James Chen
fb6f97de95
closed #2521:[JSB] CCBReader can't set properties to owner if 'owner var' is set.
2013-08-10 14:43:55 +08:00
성낙호
d202a6fa24
applied cocos2d-x coding style
2013-08-09 14:39:40 +09:00
James Chen
fc437c5ef4
(Array*) --> static_cast<Array*>() for CCControl.cpp.
2013-08-09 10:56:39 +08:00
Timothy Qiu
3c394da6a4
Changed two 'XXX class for cocos2d for iphone'.
2013-08-09 02:31:51 +08:00
Timothy Qiu
3d8d0e40ee
Fixed broken links and wrong encoding in the doc.
...
Fixed Obj-C names when referening functions.
Changed some GB2312 encoded characters to UTF-8.
2013-08-09 02:31:51 +08:00
성낙호
eda9846e6f
DelegateProtocol is weak-referenced again
2013-08-08 18:36:56 +09:00
성낙호
31a3fd65c1
key with hash to support multiple assetsManager
2013-08-08 17:29:29 +09:00
James Chen
8024e95fa4
Merge pull request #3363 from tiantian20007/localDev
...
closed 2501: make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
2013-08-07 19:55:31 -07:00
James Chen
87736683c0
Merge pull request #3387 from pyrasis/tizen_2.2
...
[Tizen] Enable LocalStorage
2013-08-07 03:08:38 -07:00
Lee, Jae-Hong
5a8ec8ca5e
[Tizen] Enable LocalStorage
...
- add sqlite3 headers and libraries.
- use sqlite3 library.
2013-08-07 19:01:41 +09:00
성낙호
3fc48ecf15
purgeStoragePath added
2013-08-07 14:36:26 +09:00
성낙호
1c91e73a8c
added jsb support for AssetsMAnager
2013-08-07 14:07:01 +09:00
James Chen
a5067f63dd
Merge pull request #3372 from pyrasis/tizen_2.2
...
[Tizen] Fix Debug Settings
2013-08-05 22:51:06 -07:00
Lee, Jae-Hong
1acfca45b2
[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1
2013-08-06 14:42:53 +09:00
Lee, Jae-Hong
3db495ab0e
[Tizen] Fix Debug Settings.
...
- fix debugging failure problem
2013-08-06 01:26:56 +09:00
tianTian
77d6692fed
make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
2013-08-05 10:23:41 +08:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
minggo
9cba2c42c1
closed #2434 : simply Android.mk
2013-08-02 17:33:27 +08:00
James Chen
85661c976c
Merge pull request #3346 from nakosung/develop
...
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
2013-08-01 19:41:11 -07:00
성낙호
c9077961e8
fix for undefined protocol
2013-08-02 10:35:45 +09:00
Timothy Qiu
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
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
Timothy Qiu
bc10c2a01f
Change some doc due to the change of source code.
...
Fixed some incorrect use of doxygen command.
2013-08-01 17:47:37 +08:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
Lee, Jae-Hong
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
minggo
f7fd7a8af5
fixed warnings on Android and windows
2013-07-28 21:43:20 +08:00
samuele3hu
cc95fcaa69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-28 14:35:38 +08:00
samuele3hu
3aeefb51b3
Modify deprecated CCPhysicsDebugNode typedef and some test bug
2013-07-28 14:33:02 +08:00
minggo
4f6e1fb944
set _isDownloading to false before return
2013-07-28 09:53:59 +08:00
James Chen
d67ab3e4cc
Untabify for CCBValue.cpp.
2013-07-28 00:31:09 +08:00
James Chen
ab84dacf8f
issue #2430 : CCBValue::Type is strong enum type now.
2013-07-28 00:26:24 +08:00
James Chen
584402984b
Adding deprecated constants for CCBReader.
2013-07-27 23:04:14 +08:00
James Chen
fa5c26c5e2
member variables renaming according cocos2d-x style.
2013-07-27 22:31:57 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
carlo morgantini
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
James Chen
feadd2b2dd
issue #2430 : Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
...
Also added more deprecated constants.
2013-07-27 00:55:41 +08:00
James Chen
387ae822b1
issue #2430 : Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp
2013-07-26 22:57:15 +08:00
James Chen
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
James Chen
2bfccb4a43
A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType
2013-07-26 21:36:32 +08:00
James Chen
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
James Chen
6c2e6e8cb0
Merge pull request #3253 from metalbass/patch-3
...
Added virtual destructors to some interfaces to fix issue 3095
2013-07-26 05:47:35 -07:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
minggo
859da78499
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
2013-07-26 17:47:52 +08:00
minggo
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
Thomas Perl
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
minggo
0b3ed85914
issue #2430:fix some compiling error
2013-07-26 16:43:40 +08:00
minggo
bafc01c2aa
issue 2430:fix a compiling error and add missing cpp
2013-07-26 15:55:12 +08:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
minggo
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
James Chen
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
minggo
0b8de88ddc
issue 2430:use enum class
2013-07-26 12:08:18 +08:00
minggo
f94a02ac01
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-26 11:25:18 +08:00
James Chen
d882fc3ef0
Merge pull request #3263 from 2youyouo2/Fix_3.0
...
Fix armature supper fast
2013-07-25 19:58:22 -07:00
2youyou2
7c4460f9e0
Fix armature supper fast
2013-07-26 10:19:19 +08:00
Ricardo Quesada
8bf24f0475
ccGLXXX -> GL::xxx
...
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`
Also, converts the class `DrawPrimitives` into a namespace
2013-07-25 18:42:53 -07:00
Ricardo Quesada
191aaebe2a
More const fixes
...
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
2013-07-25 17:47:42 -07:00
Ricardo Quesada
07c6c904cc
Removes more Hungarian notation and more
...
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07:00
Ricardo Quesada
d683e10808
More constant fixes
...
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()
And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
Ricardo Quesada
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
minggo
323af3c889
issue #2430:use upper letters for enum item in AssetsManager and WebSocket
2013-07-25 22:29:12 +08:00
boyu0
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
minggo
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
minggo
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
metalbass
2982a42fbf
Fixed typo. virutal -> virtual
2013-07-25 13:03:40 +02:00
metalbass
c7329e9301
Added virtual destructors to some interfaces to fix issue 3095
2013-07-25 12:54:51 +02:00
minggo
2293630335
issue #2430:move enum in ccTypes.h class
2013-07-25 18:46:43 +08:00
minggo
acdd1cfe9d
issue #2430:move GLProgram enum into class
2013-07-25 17:48:22 +08:00
minggo
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
minggo
658bffbb69
issue #2430:use upper letter for enum item in ccGLStateCache.h
2013-07-25 15:04:13 +08:00
James Chen
477dd6c3c7
issue #2404 : cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now.
2013-07-25 10:33:19 +08:00
Thomas Perl
8044c52d6d
Qt 5: Add support for building libextension
2013-07-24 20:23:07 +02:00
James Chen
762b987ae7
issue #2404 : [Extensions] Updating the file for deprecated methods.
2013-07-24 18:00:40 +08:00
James Chen
fb1b510557
issue #2404 : Deprecated some methods in NodeLoaderLibrary.h/.cpp.
2013-07-24 18:00:02 +08:00
James Chen
00999b464e
issue #2404 : Reverting callback interface for CCBReader.
2013-07-24 17:59:21 +08:00
James Chen
debd1965c9
Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated
...
Conflicts:
cocos2dx/include/CCDeprecated.h
2013-07-24 16:53:14 +08:00
Ricardo Quesada
1f37d4d00a
More best practices fixes and other bug fixes
...
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
Éloi Rivard
2875284882
emscripten bugfix
2013-07-23 08:58:43 +02:00
Éloi Rivard
36065400bc
Created CCDeprecated-ext
2013-07-23 08:58:43 +02:00
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
James Chen
b58d18e20a
More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.
2013-07-22 14:28:19 +08:00
Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
James Chen
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
yinkaile
0470ce936b
1.Fix release CCTexture2DMutable.cpp crash
...
2.Change frame tween method
2013-07-19 19:02:26 +08:00
Lee, Jae-Hong
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
Ricardo Quesada
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
boyu0
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
Ricardo Quesada
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
boyu0
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
Ricardo Quesada
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
James Chen
80590dcfc1
Merge pull request #3132 from samuele3hu/ScriptHandler
...
issue 2377:Add scriptHandlerMgr to manager lua script handler
2013-07-16 02:40:50 -07:00
James Chen
b71e9d83e1
Merge pull request #3165 from sunzhuoshi/master
...
Fixed bad js constant names and added config macro for "spine" extension
2013-07-16 02:36:49 -07:00
sunzhuoshi
ec7456a43c
Removed config macro for "spine" extension
2013-07-16 16:19:20 +08:00
sunzhuoshi
6d0f7dfe88
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
2013-07-16 15:04:51 +08:00
samuele3hu
241c01bec3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-16 14:47:46 +08:00
James Chen
13e939b55e
Merge pull request #3157 from ricardoquesada/override_love
...
closed 2407: Adds more readability to the class internals.
2013-07-15 22:05:33 -07:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
yinkaile
f6c59928b2
Merge branch 'master' into develop
2013-07-16 09:37:56 +08:00
Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
pktangyue
652f679d50
override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class
2013-07-15 20:13:30 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
James Chen
93bb7bcb31
friend SIOClientImpl --> friend class SIOClientImpl, that will be clearer.
2013-07-13 19:26:46 +08:00
James Chen
4b2165e648
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
2013-07-13 19:24:41 +08:00
James Chen
8409e2942f
Fixing warning in SocketIO.cpp
2013-07-13 19:20:11 +08:00
yinkaile
619a8810fe
Change Physics detector
2013-07-13 19:14:30 +08:00
Chris Hannon
8791c8119e
task: hiding non-interface methods in the SsocketIO and SIOClient classes, adding SIOClientImpl as friend to access
2013-07-12 13:05:15 -04:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
58fe3c7563
closed #2393 : fixed conflicts
2013-07-12 15:07:44 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
minggo
bb758df0d0
issue #2393:mark ccp as deprecated
2013-07-12 14:11:55 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
Ricardo Quesada
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
Chris Hannon
126ebb888c
Implements a socket.io client extension, adds a test case and updates the android makefiles.
...
Contains the following tasks:
-initial socket.io extension commit
-sioclientimpl subclasses websocket:delegate to respond to websocket events
-implement static connect methods and basic client creation
-move SocketIO class files into correct extension folder (network)
-create SocketIO test in TestCpp
-update project references
-add missing static modifier to connect method
-implement basic test methods
-update extensions tests with SocketIO test entry
-implement basic handshake and opensocket methods for SocketIO
-add Delegate class to handle callbacks, implement virtual Delegate methods in test
-implement socket and client registries for lookup when connecting to hosts and endpoints
-connect delegate onOpen method by separating impl creation from connection
-update test to demonstrate onOpen callback
-create send and emit methods, move SIOClient into header file, add send and emit methods to test
-implement basic socket.io message parsing
-improve logging for events and messages
-add logic to pull event name from payload
-schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety
-add onConnect handler to to catch socket.io onconnect vs websocket onopen
-add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects
-modify SIOClientImpl to track _uri for easier lookup in registries
-connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code
-create SIOEvent callback type, implement event registry in clients, add test for event registration and callback
-update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed
-check for connect before sending or emitting in the client, cleanup some codes
-change connect logic to reuse existing socket connections instead of opening a new one
-implements get and set Tag methods for clients for easy reference
-improve endpoint handling, add endpoint tests to test layer
-additional error handling within socket disconnect error and failure to open connection
-fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method
-add disconnect and onClose handlers to client so that onClose is called in the delegate
-add disconnect test methods to test layers
-change c-style casts to static_casts when using a CCDICT_FOREACH
-remove some unneeded namespace completion
-add usage documentation
-add handling for disconnect from server, cleanup some codes
-update comments and documentation in the socketiotest
-update includes so the NDK doesn't complain when compiling with c++11
-add socketio.cpp and test.cpp to the android makefiles
-update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2013-07-11 17:41:42 -04:00
James Chen
093d9a507c
closed #2396 : indentation fix.
2013-07-11 17:07:41 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
pktangyue
8f7d9093c9
Merge remote-tracking branch 'origin/develop' into patch1
2013-07-11 16:08:46 +08:00
James Chen
5727d7099b
issue #2395 : Scale9Sprite's default anchor point is center now.
2013-07-11 13:59:57 +08:00
James Chen
b2c0d17aeb
Merge pull request #3122 from dumganhar/iss2389-http-cookie
...
closed 2389: Adding cookie support for HttpClient
2013-07-10 18:37:29 -07:00
James Chen
3af6f6fe58
enableCookies is static method now
2013-07-10 15:46:01 +08:00
Lee, Jae-Hong
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
James Chen
3f57275848
issue #2389 : Adding cookie support for HttpClient
2013-07-10 11:37:39 +08:00
yinkaile
24daabe469
Merge branch 'master' into develop
2013-07-10 10:01:41 +08:00
yinkaile
54e5fca2aa
Bone can add a particle display as a CCNode
2013-07-10 10:00:51 +08:00
yinkaile
ac6d4e5cbb
remove CCShaderNode
2013-07-09 22:07:56 +08:00
Éloi Rivard
e6354bbf0a
Various linux eclipse projects compilation fixes
2013-07-09 15:23:19 +02:00
James Chen
5eb849a789
closed #2381 : ControlSwitch was displayed ugly when adding more than one switch.
2013-07-09 17:23:13 +08:00
James Chen
596c4c3cf2
issue #2387 : Using static_cast instead of C style cast while iterating CCDictionary.
2013-07-09 14:40:43 +08:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
James Chen
976d4ad11e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
cocos2dx/actions/CCActionInterval.cpp
cocos2dx/cocoa/CCDictionary.cpp
samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
2013-07-09 09:48:41 +08:00
Ricardo Quesada
9fe9341646
From C++ best practices
...
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07:00
yinkaile
4a8cde4dad
Change Tween Type to Frame Index
2013-07-08 23:25:11 +08:00
dumganhar
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
dumganhar
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
pktangyue
3e5c62f905
fix CCScale9Sprite CapInsets bug for rotated sprite frame
2013-07-08 17:00:27 +08:00
James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
yinkaile
6fc0eaf5b1
update
2013-07-07 17:27:42 +08:00
minggo
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
minggo
7e56bb57c8
Merge pull request #3076 from samuele3hu/execDev
...
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-05 01:32:06 -07:00
samuele3hu
ec2f5376f1
issue #2244:Add namespace to some enums
2013-07-05 16:05:38 +08:00
James Chen
ec902c3550
issue #2373 : Adding missing overload const getter functions.
2013-07-05 15:08:52 +08:00
James Chen
d2746bbe90
issue #2373 : Removing inline for virtual function. Adding more const getter functions.
2013-07-05 15:08:52 +08:00
samuele3hu
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
minggo
7bcafb46a4
Merge pull request #3051 from samuele3hu/execDev
...
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
2013-07-04 03:33:12 -07:00
samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
1d94ce12a2
Merge branch 'const_love' of https://github.com/ricardoquesada/cocos2d-x into const_love
2013-07-04 10:29:56 +08:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
YangLe
18b662c942
fix CCScale9Sprite for rotated sprite frame
...
fix Issue #1145
2013-07-04 00:03:44 +08:00
samuele3hu
ec801ae89d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-02 15:29:19 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
yinkaile
58550a834c
1.Fix empty frame bug
...
2.Change Skin function interface name
2013-07-02 10:32:32 +08:00
Ricardo Quesada
b434f7332a
Removes #if from header class
...
preventing ugly bugs
2013-07-01 11:52:04 -07:00
James Chen
8b1325b544
Merge pull request #3034 from Squallium/develop
...
Added CocosDenshion dependency to libextension project
2013-07-01 01:54:02 -07:00