615995af54
add base property parser for WidgetReader
2014-06-18 14:15:11 +08: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
95f1bd7e72
update loader
2014-06-18 11:54:25 +08:00
94fdff1da9
Fixed #5563 : Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
2014-06-18 11:51:52 +08:00
6ecca08340
Merge pull request #7039 from minggo/get-child-by-name
...
issue #4693 : add getName(), setName() and getChildByName()
2014-06-18 11:30:14 +08:00
719fdb712d
add frame event test
2014-06-18 11:22:38 +08:00
ca24ad6768
Merge branch 'v3' into cleanupBinaryLoader
2014-06-18 11:19:19 +08:00
8a0a6a2ded
Merge pull request #7064 from kyokomi/TextReader_filePath_fix
...
Fix bug for TextReader #setFontName.
2014-06-18 10:36:29 +08:00
b6ed783b0b
fix use raw char* to represent string.
2014-06-17 17:05:44 +09:00
806d74b6f9
add change play section test
2014-06-17 15:57:30 +08:00
c221a59954
fixed frame's value not right when enter frame
2014-06-17 15:57:06 +08:00
d2a6782a9e
fixed start frame not right
2014-06-17 11:45:57 +08:00
02363c2ae4
read visible property
2014-06-16 17:20:59 +08:00
f9a817a2bf
read flip property
2014-06-16 15:19:58 +08:00
7bb188f15a
fixed not read zorder
2014-06-16 15:03:53 +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
c5fe56ef21
update CMakeLists.txt
2014-06-16 09:44:14 +08:00
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
d7199204bd
Fix bug for TextReader #setFontName.
2014-06-14 23:56:12 +09:00
d9f34a1412
change texture to textureName
2014-06-13 19:52:53 +08:00
5bce6b87ea
change ActionTimeline to cocostudio ActionTimeline folder
2014-06-13 18:51:32 +08:00
57fe37f9f1
add const word
2014-06-13 18:00:46 +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
2031e0e92d
change TimelineAction to ActionTimeline
2014-06-13 16:03:03 +08:00
b181eaf802
modify mk file
2014-06-13 14:43:53 +08:00
e0f6ae9db4
change TimelineAction to cocos/2d folder
2014-06-13 13:36:01 +08:00
65c2a5e3e1
add parse actionTag in loadWidget method of CCNodeReader
2014-06-13 10:49:57 +08:00
f09b1863a9
fixed read sprite
2014-06-12 20:16:39 +08:00
c0170d23c7
fixed warnings
2014-06-12 19:56:15 +08:00
b2c5334de1
change NodeCache to NodeReader
2014-06-12 19:24:27 +08:00
eb2e973e07
change read name
2014-06-12 19:12:05 +08:00
ea7e24ba24
add TimelineActionData
2014-06-12 18:50:37 +08:00
e4f1ac6126
add hd resource
2014-06-12 17:38:26 +08:00
db992b6d0f
modify cocostudio Android.mk
2014-06-12 16:26:18 +08:00
f536020d26
remove unused files
2014-06-12 16:21:41 +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
4d1bf0c1a2
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
2014-06-12 09:42:20 +08:00
28ae57c5fc
add AsyncReader
2014-06-12 00:38:23 +08:00
aa06fab776
support relative path for reading json
2014-06-11 21:11:22 +08:00
8a5bfb9840
issue #4693 : add getName(), setName() and getChildByName()
2014-06-11 16:57:43 +08:00
5515c43bb2
improve lasers
2014-06-11 15:16:08 +08:00
f50263402a
improve parser
2014-06-11 14:56:12 +08:00
2f6f1b7151
improve binary format
2014-06-11 14:45:35 +08:00
7a8f27ee0b
remove unused parser code
2014-06-11 14:15:34 +08:00
09a2ceb7df
add TimelineAction
2014-06-11 11:10:07 +08:00
b895018765
update parser
2014-06-11 09:35:24 +08:00
0c7cbda144
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-10 09:09:53 +08:00
6bbf5a1459
tests
2014-06-06 10:12:23 +08:00
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
8690122c96
add version 300 parsing code in widget reader
2014-06-05 10:25:08 +08:00
b570487bf3
add cocostudio binary file parser
2014-06-05 10:24:12 +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
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
54e93f6c41
fix ObjectFactory refactor issue
2014-06-04 14:56:34 +08:00
38e274de73
refact ui header file include
2014-06-04 14:56:33 +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
28b95bd54a
* Skip UTF8 BOM if it exists
...
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
2014-05-31 00:06:56 +02:00
f3de239647
Merge pull request #6616 from xhcnb/fix_callback
...
Fix crash: use cocostudio gui editor, create a action in editor, when yo...
2014-05-27 14:51:36 +08:00
b0bc406bdc
fixed Armature::getBoundingBox() is wrong when bone's display is null
2014-05-26 16:16:06 +08:00
332f75a57c
Update CCActionObject.h Doxygen comments
2014-05-26 12:02:14 +08:00
7da07342fe
Merge pull request #6734 from 2youyouo2/v3
...
fixed no effect with stopping tween between two frames
2014-05-17 12:17:34 +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
385b2507aa
Merge pull request #6615 from xhcnb/fix_ActionObject
...
FIx: correct TotalTime of ActionObject.
2014-05-15 15:39:15 +08:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
437b30487c
issue #5110 , refactor UITextBMFont
2014-05-14 16:02:31 +08:00
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
e30e05ce92
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-14 15:13:38 +08:00
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
31dd70dba2
Matrix::identity() -> IDENTITY
...
consistency with the rest of the cocos2d API
2014-05-13 10:26:25 -07:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
ccb55448da
Merge pull request #6685 from andyque/refactor5118
...
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-13 11:35:36 +08:00
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
c2f7c10f1c
closed #5118 , refactor, improving variable name
2014-05-13 09:56:10 +08:00
ebffc66a83
closed #5118 , fix CCSGUIReader setAnchorPoint
2014-05-12 18:07:13 +08:00
a0a4df5ac5
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-12 18:00:54 +08:00
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
77a463bac3
issue #5057 , refactor UIPageView
2014-05-12 10:31:52 +08:00
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
3f83367b61
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-11 17:25:39 +08:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
762e8d9249
issue #5057 , refactor WidgetType to strong typed enum
2014-05-09 15:16:33 +08:00
6a7277c38f
issue #5057 , refactor TextureResType to strong typed enum
2014-05-09 14:56:05 +08:00
1d7726133c
issue #5057 , refactor enum SizeType to strong typed enum
2014-05-09 09:37:51 +08:00
3ef1facfb0
issue #5057 , replace deprecated enum with strong typed enum
2014-05-09 09:29:07 +08:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
fd362d2ace
issue #5057 . deprcated PositionType and make a new enum class instead
2014-05-08 18:25:49 +08:00
0a46b3c8d2
Merge branch 'v3' into v3_nutty_fixedreaderbug
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-05-08 15:56:34 +08:00
a562f19880
Fixed bug of guireader
2014-05-08 15:15:09 +08:00
5b09ef9b63
just unschedule, no need release here.
2014-05-08 10:56:59 +08:00
2b581aba18
Fix crash: use cocostudio gui editor, create a action in editor, when you play like:
...
auto _action = getActionByName("action_name");
_action->play(CallFunc::create([](){
CCLOG("done.");
}));
It'll crash.
2014-05-08 10:52:31 +08:00
8507fd7f8d
FIx: correct TotalTime of ActionObject.
2014-05-08 10:28:41 +08: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
44b93f3548
change tab to 4 space
2014-05-05 17:46:06 +08:00
d4f644814c
change tab to 4 space
2014-05-05 17:43:15 +08:00
f6eac43a0a
fixed no effect with stopping tween between two frames
2014-05-05 09:45:06 +08: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
aa04176d83
Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip
...
fixed the clipping of ui layout read from CocoStudio could not work
2014-04-28 11:08:40 +08:00
c492f4d3c3
fixed ui layout clip
2014-04-28 10:06:11 +08: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
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
adcacbf5eb
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelAtlas.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2014-04-24 16:58:46 +08:00
4750e8b417
Fixed bug of gui reader
2014-04-23 15:02:35 +08:00
e74f8719cf
fix warning in compiling
2014-04-21 09:52:59 +08: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
ed4fcd5d1a
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
2014-04-17 14:23:08 +08:00
19f6526ef8
Widget supports contentsize
2014-04-17 14:08:25 +08:00
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
e2a24dec84
replace Point with Vector2
2014-04-15 18:08:29 +08:00
5303f50904
Migrate to Vector2 in DrawPrimitive.h
2014-04-15 17:29:23 +08:00
511e868ac4
migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2
2014-04-15 16:59:16 +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
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
b715a87791
Memory leak fix in macro IMPLEMENT_CLASS_INFO
2014-04-12 12:58:00 +08:00
866c4ad735
remove kmMat4 in Armature
2014-04-11 17:25:28 +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
443195df40
Merge pull request #6123 from ololomax/patch-1
...
set _node to null in createNodeWithSceneFile
2014-04-10 17:05:45 +08:00
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
364fc4722a
issue #4729 : Updates CCInputDelegate.h
2014-04-10 00:52:41 +08:00
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
a269ac2864
remove kmMat4 interface in cocostudio and UI
2014-04-09 14:44:54 +08: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
541d4dea0c
Merge pull request #6105 from andyque/feature3636
...
Added create functions with parameters for all ui controls
2014-04-04 18:34:59 +08:00
6b4451482f
remove matrixToKmMat4 function
2014-04-04 18:13:10 +08:00
e346ed3559
closed #4636 . done
2014-04-04 17:38:58 +08:00
e20b3d8eb8
issue #4636 . refactor SliderReader
2014-04-04 17:35:15 +08:00
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
af5fe04480
issue #4636 . refactor LoadingBarReader
2014-04-04 17:25:20 +08:00
a4e0c1a6e2
issue #4636 . refactor LayoutReader
2014-04-04 17:21:23 +08:00
3482815e69
issue #4636 . refactor ImageViewReader
2014-04-04 17:18:24 +08:00
c252aa5a55
issue #4636 . refactor CheckBoxReader
2014-04-04 17:12:47 +08:00
77aee27f05
issue #4636 . refactor ButtonReader
2014-04-04 16:51:07 +08:00
51404500b7
issue #4636 . fixed WidgetReader error
2014-04-04 16:24:54 +08:00
andyque