Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,790 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

107 Commits

Author SHA1 Message Date
huangshiwu 8922121ed1 Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
huangshiwu 8d8f4436db Deprecate DrawPrimitives and enhance DrawNode --fix android compile error 2014-09-11 17:55:47 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
minggo 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
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
Ricardo Quesada 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
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
andyque 83298171d9 refactor Layout 2014-07-30 16:33:37 +08:00
andyque 1daaea1410 remove extension::Scale9Sprite dependency 2014-07-29 16:24:27 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
andyque 4fa1af584c fix listview insert child at index bug 2014-07-18 18:02:46 +08:00
andyque 1dc1df0827 fix Layout typo 2014-07-15 14:57:10 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
andyque 60ea37cabc fix focus functions 2014-06-30 14:09:27 +08:00
andyque a4bd3879ac fix ListView addChild problem 2014-06-25 16:17:16 +08:00
minggo 66703addb2 fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
andyque 4ca184b58a issue #5161, deprecated getSize 2014-06-20 11:18:53 +08:00
andyque 585ccf2c71 issue #5161, replace all _size to _contentSize 2014-06-20 10:40:16 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
pandamicro d00c9fe70a Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary) 2014-06-16 12:50:35 +08:00
pandamicro 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
andyque 7a25fbfe29 refactor touch event 2014-06-09 10:23:11 +08:00
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 2014-06-04 09:19:22 -07:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +08:00
andyque 652c214374 remove sortChildren of Layout 2014-06-04 10:10:50 +08:00
Ricardo Quesada 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
andyque 769300d25e rename UILayout 
Executant.h to UILayoutManager.h
 2014-05-28 10:17:34 +08:00
andyque c5a118ee1b refactor UILayoutExecutant to LayoutManager 2014-05-28 10:11:49 +08:00
andyque df13d4033c refactor Layout and Widget 2014-05-27 13:49:00 +08:00
andyque b17de0cdcb add const to UILayout 2014-05-27 11:30:35 +08:00
andyque e32a637bf5 add const to ui framework methods 2014-05-27 11:30:35 +08:00
andyque d8d5139aaf closed #5176, refactor UILayout and focus 2014-05-26 23:04:44 +08:00
andyque 40f2128acd Merge branch 'v3' into 5176 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/UIPageView.cpp
	cocos/ui/UIScrollView.cpp
	cocos/ui/UIScrollView.h
 2014-05-26 14:00:23 +08:00
andyque 634fea7c45 Merge remote-tracking branch 'upstream/v3' into refactor5183 2014-05-26 09:18:32 +08:00
andyque d612518421 fix ui widget copyProperties issue 2014-05-23 15:03:46 +08:00
andyque 3f363f0e51 issue #5176, add focus to UIScrollView 2014-05-23 10:59:18 +08:00
andyque 65fe431eae issue #5176, fix a typo 2014-05-22 18:11:27 +08:00
andyque 1165ba8bc3 issue #5176, readd addChild methods into UIListView 2014-05-22 17:49:19 +08:00
andyque c8d9ab8122 issue #5176, refactor passTouchEventToParent method of UIWidget 2014-05-22 15:23:13 +08:00
andyque 0c065b4be0 issue #5176, refactor Layout and UIPageView 2014-05-22 13:51:44 +08:00
andyque d5e68e4803 issue #5176, fix override problems 2014-05-22 11:01:58 +08:00
andyque dbd2de63b2 issue #5183, fix Layout visit issue 2014-05-21 15:21:55 +08:00
andyque 1ed9b9749e Revert "Merge pull request #6752 from andyque/refactorLayout" 
This reverts commit ae118a9d22, reversing
changes made to 6f2f2046c7.
 2014-05-20 14:36:29 +08:00
andyque 432f688a67 issue #5183, refactor 2014-05-20 10:16:19 +08:00
andyque b434840bc9 issue #5183, add layout parameter type to widget for convenient access 2014-05-16 10:33:28 +08:00
andyque 1b3c28ea90 Merge branch 'v3' into refactorLayout 
Conflicts:
	cocos/ui/UILayout.cpp
 2014-05-16 10:22:53 +08:00