andyque
|
74ac5d1d5a
|
issue #5057, refactor UIScrollView
|
2014-05-12 11:08:10 +08:00 |
andyque
|
ba802e1308
|
issue #5057, refactor UIRichText
|
2014-05-12 10:39:30 +08:00 |
andyque
|
77a463bac3
|
issue #5057, refactor UIPageView
|
2014-05-12 10:31:52 +08:00 |
andyque
|
7f15a14d55
|
issue #5057, refactor LoadingBar
|
2014-05-12 10:12:22 +08:00 |
andyque
|
43eb75fb1a
|
issue #5057, refactor Listview
|
2014-05-12 09:51:23 +08:00 |
Ricardo Quesada
|
77c03fcf11
|
ShaderCache -> GLProgramCache
|
2014-05-09 18:39:25 -07:00 |
Ricardo Quesada
|
78dd92a7ef
|
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-05-09 11:40:13 -07:00 |
andyque
|
e1fe26543d
|
issue #5057, refactor & remove deprecated warnings
|
2014-05-09 18:37:22 +08:00 |
andyque
|
264769f814
|
issue #5057, refactor LinearGravity
|
2014-05-09 17:54:25 +08:00 |
andyque
|
0c0f18e7f3
|
issue #5047, refactor LayoutParameterType
|
2014-05-09 17:38:05 +08:00 |
andyque
|
d12a71f738
|
issue #5057, refactor UILayoutDefine
|
2014-05-09 17:16:11 +08:00 |
andyque
|
09a53e7b03
|
issue #5057, refactor BackGroundColorType
|
2014-05-09 17:05:36 +08:00 |
andyque
|
e8e0d007bd
|
issue #5057, refactor LayoutType
|
2014-05-09 16:49:00 +08:00 |
andyque
|
305f052344
|
issue #5057, refactor LayoutClippingType
|
2014-05-09 16:31:22 +08:00 |
andyque
|
451b7a1b6b
|
issue #5057, refactor UICheckBox event callback
|
2014-05-09 16:04:55 +08:00 |
andyque
|
c5a505ec4c
|
issue #5057, Merge branch 'v3' into refactor5057
Conflicts:
cocos/ui/CocosGUI.h
|
2014-05-09 15:39:02 +08:00 |
andyque
|
d799ffce40
|
issue #5057, remove include dependency
|
2014-05-09 15:32:51 +08:00 |
andyque
|
f070fc335f
|
issue #5057, refactor BrightStyle to strong typed enum
|
2014-05-09 15:23:34 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
6a7277c38f
|
issue #5057, refactor TextureResType to strong typed enum
|
2014-05-09 14:56:05 +08:00 |
andyque
|
57ce0ee2cf
|
issue #5057, refactor addTouchEventListener to std::function<>
|
2014-05-09 14:30:39 +08:00 |
Dhilan007
|
06f264e87d
|
rename VideoWidget to VideoPlayer.
|
2014-05-09 11:30:07 +08:00 |
andyque
|
21e4d05e6e
|
issue #5057, refactor SEL_TouchEvent to std::function
|
2014-05-09 11:28:36 +08:00 |
andyque
|
a699230e75
|
issue #5057, replace license
|
2014-05-09 09:39:18 +08:00 |
andyque
|
1d7726133c
|
issue #5057, refactor enum SizeType to strong typed enum
|
2014-05-09 09:37:51 +08:00 |
Ricardo Quesada
|
62d9c24518
|
moves shaders files from 2d/ to renderer/
|
2014-05-08 18:01:48 -07:00 |
Dale Stammen
|
eea1ba6946
|
added missing files to projects
|
2014-05-08 10:11:42 -07:00 |
andyque
|
fd362d2ace
|
issue #5057. deprcated PositionType and make a new enum class instead
|
2014-05-08 18:25:49 +08:00 |
Dhilan007
|
af26fb9b07
|
issue #4870:Add a ui widget of playing video
|
2014-05-08 18:13:50 +08:00 |
Dhilan007
|
bda73bc7b3
|
issue #4868:Use system widget to play video on iOS
|
2014-05-08 18:12:53 +08:00 |
andyque
|
0c2fd977ea
|
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
Widget and also simplify the enum value
|
2014-05-08 18:10:21 +08:00 |
minggo
|
a8d728ffc9
|
Merge pull request #6610 from zawasp/vs2013project
upgrade win32 projects for Visual Studio 2013
|
2014-05-08 15:40:02 +08:00 |
andyque
|
238ffcc545
|
issue #4861, fix pass focus to child
|
2014-05-08 11:24:09 +08:00 |
andyque
|
b5f1f7455b
|
issue #4861, fix a problem when layout focus loops
|
2014-05-08 10:46:05 +08: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 |
andyque
|
05b7d274c8
|
issue #4861. fix distance calculation
|
2014-05-07 18:27:05 +08:00 |
andyque
|
def0505ba7
|
closed #4861, refactor
|
2014-05-07 14:26:41 +08:00 |
andyque
|
1282252c25
|
closed #4861, refactor
|
2014-05-07 14:06:44 +08:00 |
andyque
|
8baa88e2e1
|
closed #4861, fixed temparory variable issue
|
2014-05-07 11:55:00 +08:00 |
andyque
|
ef70c684de
|
issue #4861, add requestFocus method and the layout current can get focus
|
2014-05-07 10:23:57 +08:00 |
andyque
|
62a66872aa
|
issue #4861, fixed some boundary conditions
|
2014-05-07 10:05:20 +08:00 |
andyque
|
9d71ae29b9
|
issue #4861. fixed all widget focus diabled bug
|
2014-05-06 17:28:12 +08:00 |
andyque
|
a15dd55baa
|
closed #3861, fixed some typo and indent problem
|
2014-05-06 12:04:52 +08:00 |
andyque
|
bcd2d3ccb3
|
issue #3861, fix layout contentSize caculation
|
2014-05-06 11:46:28 +08:00 |
andyque
|
2d0de93baf
|
issue #4861, fixed a widget bug and add VBox test
|
2014-05-05 11:37:40 +08:00 |
andyque
|
afb65bbebd
|
issue #4861, fix widget query method
|
2014-05-05 11:37:39 +08:00 |
andyque
|
503be87675
|
issue #4861. refactor UILayout to search widget by index
|
2014-05-05 11:37:39 +08:00 |
andyque
|
a7fbd590dc
|
issue #4861. add a horizontal focus test
|
2014-05-05 11:37:39 +08:00 |
andyque
|
9383900123
|
issue #4861. cleanup some code of UILayout and UIWidget
|
2014-05-05 11:37:39 +08:00 |
andyque
|
b35ddfe5b5
|
issue #4861, add focus functionality into Widget class
|
2014-05-05 11:37:38 +08:00 |
andyque
|
1dee81a166
|
issue #4861, refactor setFocused into setHilighted
|
2014-05-05 11:37:38 +08:00 |
Ricardo Quesada
|
462338879e
|
rolling back physics in layer
|
2014-05-01 16:42:35 -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
|
25213c81f6
|
linux cmake improvements
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
|
2014-05-01 13:01:51 -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
|
b5f513ce16
|
Merge branch 'v3' into improved_directory_structure
|
2014-04-30 13:15:10 -07:00 |
Huabing.Xu
|
16105df503
|
getNormalize->getNormalized
|
2014-05-01 01:10:18 +08:00 |
Huabing.Xu
|
ea4fee2c31
|
refactor normalize in Vector2
|
2014-04-30 18:07:05 +08: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
|
cd6fe294b8
|
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
closed #4771: Move PhysicsWorld to Layer
|
2014-04-25 11:52:32 +08:00 |
Huabing.Xu
|
e74f8719cf
|
fix warning in compiling
|
2014-04-21 09:52:59 +08: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 |
CaiWenzhi
|
a8bfa094c0
|
Remove useless codes
|
2014-04-17 14:27:21 +08:00 |
CaiWenzhi
|
ed4fcd5d1a
|
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
|
2014-04-17 14:23:08 +08:00 |
CaiWenzhi
|
19f6526ef8
|
Widget supports contentsize
|
2014-04-17 14:08:25 +08:00 |
andyque
|
a9ed075d50
|
closed #4883. fixed slider hittest problem
|
2014-04-17 10:15:58 +08:00 |
Huabing.Xu
|
d14d3007d0
|
remove kazmath include file
|
2014-04-16 14:08:58 +08:00 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
Huabing.Xu
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
Huabing.Xu
|
e351b778c1
|
migrate setAnchorPoint to Vector2
|
2014-04-15 16:47:29 +08:00 |
Huabing.Xu
|
071cbc7565
|
migrate setPosition to Vector2
|
2014-04-15 16:16:14 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
boyu0
|
c98f50026f
|
issue $4771: move PhysicsWorld to layer.
|
2014-04-15 03:21:18 +08:00 |
Huabing.Xu
|
ec5398e7c6
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
|
2014-04-14 14:08:19 +08:00 |
James Chen
|
7c5b4be0b1
|
Warning fixes in ui, getZOrder -> getLocalZOrder
|
2014-04-11 18:06:53 +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 |
James Chen
|
39b25c9307
|
Removed unused comments in GUIDefine.h
|
2014-04-10 17:15:59 +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 |
Huabing.Xu
|
07ac817a7c
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-10 10:52:15 +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
|
67652357e1
|
1.Makes the create functions of Label clear.
|
2014-04-09 21:35:08 +08:00 |
James Chen
|
61134426a8
|
Some fixes detected by xcode analyze
|
2014-04-09 20:41:09 +08:00 |
Huabing.Xu
|
a269ac2864
|
remove kmMat4 interface in cocostudio and UI
|
2014-04-09 14:44:54 +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 |
andyque
|
4b6aa2a22c
|
closed #4636. remove Hungary style
|
2014-04-04 18:26:53 +08:00 |
andyque
|
77aee27f05
|
issue #4636. refactor ButtonReader
|
2014-04-04 16:51:07 +08:00 |
andyque
|
9bcfea2279
|
issue #4636. fix some typo
|
2014-04-03 17:13:24 +08:00 |
andyque
|
0875b4e51f
|
closed #4636. Done
|
2014-04-03 15:56:45 +08:00 |
andyque
|
ed2c38eb98
|
issue #4636, finish UITextBMFont
|
2014-04-03 15:45:06 +08:00 |
andyque
|
b59beab61a
|
issue #4636, finish UISlider
|
2014-04-03 15:33:57 +08:00 |
Huabing.Xu
|
960ac300d5
|
migrate cocostudio to director matrix stack
|
2014-04-03 14:55:55 +08:00 |
andyque
|
48429f5738
|
issue #4636. finish UILoadingBar
|
2014-04-03 11:34:06 +08:00 |
andyque
|
fe33588038
|
issue #4636. finish UILayout
|
2014-04-03 11:14:35 +08:00 |
andyque
|
1a97ebdcb0
|
issue #4636. finish UIImageView
|
2014-04-03 10:42:30 +08:00 |
andyque
|
52bdb840ee
|
issue #4636. finish UICheckBox
|
2014-04-03 10:34:20 +08:00 |
andyque
|
10134ccc65
|
issue #4636. finish button
|
2014-04-03 10:31:10 +08:00 |
andyque
|
0a6b0a4389
|
issue #4636. refactor Scale9Sprite
|
2014-04-03 10:07:47 +08:00 |
andyque
|
b27fe6ecc2
|
issue #4636. add parameter create method to UITextBMFont
|
2014-04-03 10:07:46 +08:00 |
andyque
|
0b5c10a0fb
|
issue #4636. add parameter create method to UITextAtlas
|
2014-04-03 10:07:46 +08:00 |
andyque
|
a03dc76f7d
|
issue #4636, add parameter create method for UILoadingBar
|
2014-04-03 10:07:46 +08:00 |
andyque
|
92945715eb
|
issue #4636. add parameter create function for UIText
|
2014-04-03 10:07:46 +08:00 |
andyque
|
558abf1a6b
|
issue #4636, add parameter create method to UIImageView
|
2014-04-03 10:07:46 +08:00 |
andyque
|
18c072beff
|
issue #4636, replace const char* to const std::string& in UIButton
|
2014-04-03 10:07:46 +08:00 |
andyque
|
ba9a605568
|
issue #4636, add parameter create method to UICheckBox
|
2014-04-03 10:07:46 +08:00 |
andyque
|
1b0583214b
|
issue #4636, add parameter create method to UIButton
|
2014-04-03 10:07:46 +08:00 |
minggo
|
98ed579b34
|
Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301
Fixed bugs for Editor
|
2014-03-31 15:37:45 +08:00 |
pipu
|
4c1cbabb5e
|
fixed bugs
|
2014-03-31 11:34:26 +08:00 |
Dale Stammen
|
b2d3dbf0fe
|
added wp8 support files and projects
|
2014-03-28 15:39:20 -07:00 |
pipu
|
733b364b51
|
Fixed bugs for Editor
|
2014-03-28 18:54:06 +08:00 |
Dhilan007
|
fd5a4acddb
|
Remove the old implementation of LabelBMFont.
|
2014-03-28 10:28:44 +08:00 |
andyque
|
928e9def8d
|
closed #102, add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
|
2014-03-27 14:27:30 +08:00 |
James Chen
|
1dbfc9e10a
|
Merge pull request #5988 from andyque/fix_silder_hittest
closed 4560, fixed slider hitTest position
|
2014-03-26 19:27:41 +08:00 |
James Chen
|
cdd7356512
|
Merge pull request #5969 from nutty898/develop_nutty_modifylayout_add_Boxes
closed #4534: Adding HBox, VBox layouts, refactoring 'doLayout' function.
|
2014-03-26 18:30:17 +08:00 |
CaiWenzhi
|
a05969c395
|
Move layout "exe" to cpp
|
2014-03-26 17:58:53 +08:00 |
andyque
|
57d8f155df
|
issue #4401. resolve conflicts
|
2014-03-26 14:54:50 +08:00 |
andyque
|
6449ced0ab
|
closed #4560, fixed UISlider hitTest Point
|
2014-03-26 14:41:53 +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
|
f6c6d428ad
|
Merge pull request #5926 from andyque/fix_tests_warnings
issue #4401, remove warnings under win32
|
2014-03-25 18:17:42 +08:00 |
CaiWenzhi
|
243b7e5822
|
Modify layout and add Boxes
|
2014-03-25 17:15:54 +08:00 |
James Chen
|
b40127ea99
|
Never include '.cpp' files.
|
2014-03-25 15:32:14 +08:00 |
James Chen
|
91347aca0c
|
closed #4541: Removes wrong coments in CCProtectedNode.h.
|
2014-03-25 15:07:46 +08:00 |
CaiWenzhi
|
9a8cf6d813
|
Modify Windows Project
|
2014-03-25 14:28:58 +08:00 |
CaiWenzhi
|
c0b67e6d1b
|
Modify mk files
|
2014-03-25 14:28:58 +08:00 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +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 |
andyque
|
f5795c25b6
|
remove warnings under win32
|
2014-03-24 10:12:40 +08: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 |
andyque
|
7ab639ec0f
|
fix lots compile warnings
|
2014-03-20 16:24:55 +08:00 |
andyque
|
8c1bf48357
|
fixed label font size: from int to float
|
2014-03-20 15:03:48 +08:00 |
andyque
|
ca6851f114
|
fix warnings of font and RichText
|
2014-03-20 11:58:36 +08:00 |
andyque
|
7ae77c9335
|
fix cocos2dx engine internal warnings
|
2014-03-20 10:58:04 +08:00 |
Dhilan007
|
e512235299
|
Remove the old implementation of LabelTTF
|
2014-03-14 21:06:40 +08:00 |
James Chen
|
177bf4df9d
|
Some warning fixes.
|
2014-03-14 15:38:43 +08:00 |
CaiWenzhi
|
b8ce59962a
|
Fixed bug of ScrollView
|
2014-03-13 10:11:41 +08:00 |
CaiWenzhi
|
4d99736e4a
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-12 17:06:48 +08:00 |
andyque
|
448b101578
|
fix linux compile error
|
2014-03-11 20:46:11 +08:00 |
andyque
|
48772fb952
|
modify android makefile
|
2014-03-11 18:48:28 +08:00 |
andyque
|
cbcc1bbbcf
|
let ios project compile correct
|
2014-03-11 18:48:26 +08:00 |