3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
2d8bec2ba9
remove Extension EditBox
2014-08-20 16:20:57 +08:00
38fb58cf29
Merge pull request #7792 from minggo/fix-warning
...
fix warnings
2014-08-15 13:33:08 +08:00
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
3f2fccb999
Merge pull request #7771 from samuele3hu/v3_3_module
...
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
d8eb1b26ef
format code
2014-08-14 14:15:16 +08:00
561945d6cd
format code
2014-08-14 14:14:25 +08:00
42e7e3bbe8
format code
2014-08-14 14:11:00 +08:00
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
c673955d5d
uncompress false means zip wrong, download again
2014-08-12 20:13:52 +08:00
0b93cc40d7
when http code 301,302, can follow rediect
2014-08-12 20:12:23 +08:00
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
1bad9ddbc2
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
...
V3 wp8glviewhookpr
2014-08-05 13:51:15 +08:00
38e4ad0fbd
Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview
...
Update : added function for setting min/max scale
2014-08-05 11:52:22 +08:00
1b74bc279a
Fix : remove unused params from header file
2014-08-04 23:20:47 +09:00
6f26a7b983
Fix : remove verbose function
2014-08-04 23:20:13 +09:00
7c0919042f
Fix : small bug
2014-08-04 23:17:09 +09:00
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
358d637e75
Merge pull request #7645 from andyque/testPR7549
...
fix EditBox began/end events not work issue
2014-08-04 15:36:07 +08:00
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
9692dfdc67
Update : added function for setting min/max scale
...
Fix to remove unused params.
2014-08-03 21:25:55 +09:00
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
6dee943352
fix mac EditBox callback issue
2014-08-01 14:56:47 +08:00
630c41e4a3
Merge branch 'patch-1' of https://github.com/yongkangchen/cocos2d-x into testPR7549
2014-08-01 13:37:27 +08:00
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
aaa65dcae4
Merge branch 'v3' into v3_windowChangeModule
2014-07-29 10:20:23 +08:00
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
2795c10627
rename box2d->libbox2d
2014-07-28 12:05:58 +08:00
7f5782c207
chang module name for windows project file
2014-07-28 09:20:02 +08:00
b9cfa4a8b5
fix warn
2014-07-25 14:38:02 +08:00
98943b4517
Merge pull request #7548 from yongkangchen/v3
...
fix Label::setTextColor did not have any effect.
2014-07-25 11:18:10 +08:00
b9d8e84b4d
Merge pull request #7581 from andyque/fixEditBoxCompile
...
fix mac compile error
2014-07-24 21:59:31 +08:00
e9ab6bb5cd
fix EidtBox mac 32bit compile error
2014-07-24 17:56:28 +08:00
c7bfc934fd
windows works now
2014-07-24 12:57:39 +08:00
918da16639
Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError
2014-07-24 10:09:59 +08:00
61ff03ab45
windows cpp-tests works now
2014-07-23 18:34:49 +08:00
f19acbb6db
[FIX]: make sure parent is visible before handling touch
2014-07-23 03:42:29 +04:00
524d9cb8af
Merge pull request #7552 from andyque/fixScale9Sprite
...
fix scale9Sprite addChild zorder issue
2014-07-22 18:39:04 +08:00
1f4c289db4
fix scale9Sprite addChild zorder issue
2014-07-22 16:26:40 +08:00
318afe2baf
add editbox ended event
2014-07-22 15:12:40 +08:00
73cf18163e
fix font size of editbox for mac when glview scale
2014-07-22 15:06:44 +08:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
aef1e01ce5
Merge pull request #7518 from natural-law/android-dependencies
...
Android dependencies
2014-07-18 17:57:42 +08:00
27ba8ecd42
[FIX]: make the scrollView delegate methods optional
2014-07-17 02:10:59 +04:00
7e7c3a1e55
Merge branch 'v3' into android-dependencies
2014-07-16 13:49:20 +08:00
14f3d6f230
Adjust the dependencies of extensions & cocostudio on android.
2014-07-16 13:47:57 +08:00
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
04c5800ee8
[FIX]: When getting the string value, check which textfield is in use
...
[FIX]: when setting the string value, change both textfields.
2014-07-13 05:01:13 +04:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
ec62f05b12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-20 10:51:13 +08:00
0019d9a061
Optimize the win32 projects configuration.
2014-06-20 10:50:43 +08:00
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
08453b911d
Merge pull request #7071 from pandamicro/Script_onEnter_fix
...
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-18 13:37:57 +08:00
94fdff1da9
Fixed #5563 : Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
2014-06-18 11:51:52 +08:00
d00c9fe70a
Fixed #5563 : Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
2014-06-16 12:50:35 +08:00
d524ba1013
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-13 17:59:23 +08:00
742ea7f2df
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
575c5101c7
Merge pull request #6999 from iSevenDays/patch-12
...
fix assertions
2014-06-09 09:46:55 +08:00
7e6fc3b9ac
Merge pull request #7000 from iSevenDays/patch-13
...
Possible use of null pointer.
2014-06-09 09:46:14 +08:00
1a16dd02f8
Possible use of null pointer.
...
Or maybe better to add CCASSERT.
2014-06-09 02:12:17 +03:00
3edef12094
Update CCControlButton.cpp
2014-06-09 02:07:43 +03:00
f5efc49903
fix assertions
...
'label' could be not caught after previous assertions
2014-06-09 02:04:44 +03:00
8962f7fc2e
refactor Scale9Sprite setColor & setOpacity
2014-06-06 16:15:19 +08:00
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
1d5d1f011e
fix scale9Sprite can't culling problem
2014-06-03 17:52:41 +08:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07: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
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
2014-05-16 14:36:00 -07:00
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
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
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
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
fa45f3f4e0
Fixed bug with cascade opacity for control button.
2014-05-10 04:02:24 +03:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
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
8b5d255296
removed obsolete include files
2014-05-05 13:52:20 -07:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
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
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
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
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
1966d1f50e
Fixed #4755 : Fix PhysicsSprite transform not updated issue
2014-04-23 17:11:55 +08:00
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
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
29af6f6c7e
updated project settings
2014-04-19 10:13:12 -07:00
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
a9a1e7cb2f
Remove hard codes
2014-04-16 16:08:26 +08:00
4c9fb311da
Remove hard codes
2014-04-16 16:04:33 +08:00
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
d14d3007d0
remove kazmath include file
2014-04-16 14:08:58 +08:00
0dab97919f
add missed line in PhysicSprite.cpp
2014-04-16 10:46:10 +08:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
e351b778c1
migrate setAnchorPoint to Vector2
2014-04-15 16:47:29 +08:00
6686b657a4
Migrate getPostion and correspondent member variable to Vector2
2014-04-15 16:28:59 +08:00
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
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
867c60a971
remove kmMat4 in PhysicsSprite.cpp
2014-04-11 17:27:55 +08:00
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
b5433f05c1
replace LabelTTF with Label
2014-04-10 16:51:25 +08:00
aa51e5dd22
fix compiler error in wp8
2014-04-10 15:15:17 +08:00
0c3c29b50d
Remove unused comments in CCEditBoxImplIOS.mm
2014-04-10 11:22:55 +08:00
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
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
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
390685ae93
Label:Change setter of system font name.
2014-04-10 10:23:00 +08:00
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
76689cda1a
fixed compile errors.
2014-04-09 21:40:10 +08:00
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
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
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +08:00
5d70170a4b
getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4
2014-04-04 18:41:29 +08:00
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
bb19e39e37
migrate ScrollView to director matrix stack
2014-04-03 15:55:37 +08:00
0a6b0a4389
issue #4636 . refactor Scale9Sprite
2014-04-03 10:07:47 +08:00
432ec49c88
fix issue that ControlButton can't swallow touch event.
2014-04-02 17:01:11 +08:00
48839b9d4d
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 11:26:39 +08:00
9f68a1111e
added wp8 editbox support
2014-03-28 16:03:09 -07:00
623b7ae3f5
added wp8 support files and projects
2014-03-28 15:42:41 -07:00
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +08:00
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
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
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
60d967b5f6
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:13:27 -07:00
44e6efea64
#pragma mark for ios and mac only
2014-03-22 06:08:05 -07: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
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
02ee3a52eb
closed #4448 : Elastic bounce back effect support for cocos2d::extension::ScrollView.
2014-03-19 17:11:34 +08:00
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
e512235299
Remove the old implementation of LabelTTF
2014-03-14 21:06:40 +08:00
cea307bfb8
EditBox:fixed nothing to display when input flag is PASSWORD on Android.
2014-03-13 22:16:38 +08:00
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
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
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
a393eded58
CCLOG -> CCLOGINFO for change of EditBox's position.
2014-03-12 14:16:42 +08:00
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
0aaa1dc0db
closed #4291：open CCEditBox as modal dialog
2014-03-06 22:17:20 +08:00
8666e63b41
Merge pull request #5555 from dabingnn/develop_fixControlSwitchBug
...
Develop fix control switch bug
2014-03-05 18:26:32 +08:00
61ae219a5c
fix: controlSwitch Bug
2014-03-05 14:03:44 +08:00
6462c0bfaf
Solve the bug: debug frames are not shown in ChipmunkTest.
2014-03-05 11:41:46 +08:00
7ac663e02c
GL Program API fixes
2014-03-04 13:51:43 -08:00
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
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
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
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
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
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
b06a98b8ee
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058
2014-02-20 21:01:52 +08:00
e59a14f205
Merge pull request #5058 from zhiqiangxu/develop
...
ScrollView should implement ActionTweenDelegate
2014-02-20 20:33:04 +08:00
be507f6fda
Merge pull request #5059 from zhiqiangxu/useless_code_in_scrollview
...
delete useless code in deaccelerateScrolling
2014-02-20 20:20:28 +08:00
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
a079c9759a
issue #4097 : Deletes CCEditBoxImplTizen.h/.cpp.
2014-02-20 16:42:28 +08:00
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
472c630277
issue #4097 : Deletes CCEditBoxImplTizen.h/.cpp.
2014-02-20 16:40:12 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
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
a261ba9df2
issue #2920 : Change internal ios keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad
2014-02-17 14:33:26 +08:00
3595a4f31b
-fixed memleak
2014-02-12 16:48:18 +03:00
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
7da8c84a75
Renames EGLView -> GLView
2014-01-30 16:51:43 -08:00
862500f99a
Renames EGLView -> GLView
2014-01-30 15:40:56 -08:00
4cbbd8a9f5
EGLView is not longer a singleton
2014-01-30 15:11:54 -08:00
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
00b5a9add5
issue #2920 : fix indent
2014-01-27 18:22:35 +08:00
e16e6a8e84
issue #2920 : fix coding style
2014-01-27 18:19:10 +08:00
23d2d586ed
closed #2920 : fix bug voice recognition input crash on ios7
2014-01-27 18:08:34 +08:00
1c20df5ca9
Makes an assert if CC_ENABLE_CHIPMUNK_INTEGRATION was not enabled in PhysicsDebugNode::create.
2014-01-26 20:05:51 +08:00
13cbaf4968
Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file.
2014-01-26 19:35:21 +08:00
8902359db0
Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled.
2014-01-26 18:32:50 +08:00
e8229ad4e3
Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION or CC_ENABLE_BOX2D_INTEGRATION in CCPhysicsSprite.h.
2014-01-26 17:56:14 +08:00
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
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
minggo