Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,467 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

582 Commits

Author SHA1 Message Date
minggo 1d5652ad48 Merge pull request #8635 from ahlwong/v3 
Fix UIButton setFontSize sync ContentSize
 2014-10-13 17:25:18 +08:00
minggo 2db8217b09 Merge pull request #8543 from Dhilan007/v3-fixwarns 
fix warns and memory leak
 2014-10-11 16:07:54 +08:00
Ahlwong dd5c5a29b9 Refactor UIButton ContentSize update 2014-10-10 21:13:04 -07:00
Ahlwong d95b1cef7a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Update from upstream.
 2014-10-10 19:10:44 -07:00
Ahlwong 4aceaee08c Fix UIButton setFontSize sync ContentSize 2014-10-10 11:17:43 -07:00
minggo 4a193c6d76 Merge pull request #8554 from newnon/v3_scale9sprite_capinets_fix 
Scale9Sprite capInsets set fix
 2014-10-10 18:05:32 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
 2014-10-10 17:02:45 +08:00
minggo 63e4d7ce27 Merge pull request #8614 from andyque/fixEditBoxMaxLengthOnMac 
fix setMaxLength issue of EditBox-mac
 2014-10-10 16:28:21 +08:00
andyque 2013cdb4ef fix setMaxLength issue of EditBox-mac 2014-10-10 15:26:33 +08:00
andyque da48649370 fix button title only content size issue 2014-10-10 11:01:51 +08:00
Ahlwong 5027f24348 Fix UIButton Scale 9 Highlight 2014-10-09 12:48:09 -07:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell 1a7ecbe427 Finalise Mac Support for cmake 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:19 +01:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
martell c7f3594a1b added support for static and shared builds with ui 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:38 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Sergey d9b0039517 Scale9Sprite capInsets set fix 2014-10-03 17:38:02 +04:00
Sergey Perepelitsa d9204b009e scale9Sprite without scale9enabled scale fix 
scale9Sprite crop >  border tile bug fix
 2014-09-30 10:59:20 +04:00
Sergey Perepelitsa c1f37a6926 Misprint fix 
scale9Image double draw fix
 2014-09-28 10:30:33 +04:00
Sergey Perepelitsa ab45c582a7 Scale9Sprite improvements 
small bugs fix
small optimizations
support for cropped sprite frames
 2014-09-28 01:58:26 +04:00
andyque 3c434ec354 remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp 2014-09-24 17:47:38 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
Sergey Perepelitsa 0a46a83794 fix missing includes 2014-09-23 23:19:25 +04:00
Jeff 2ffbe23c50 The files name: modify underline to hyphen 2014-09-19 10:24:17 +08:00
Jeff 6152b70945 LE 2014-09-18 16:33:46 +08:00
Jeff 0ee4ee03c1 CE 2014-09-18 16:00:18 +08:00
Jeff 418ec69abf compile error 2014-09-18 15:18:30 +08:00
Jeff ac6b83f8f9 fix compile error 2014-09-18 14:22:40 +08:00
Jeff c5cc16336a fix compile error 2014-09-18 14:04:54 +08:00
Jeff b9ec99d7f4 compile error & code spelling error 
1.fix compile error on win32
2.modify spelling error
 2014-09-18 11:52:23 +08:00
Jeff ed530454b2 fix compile error 2014-09-18 02:11:20 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff 08e8963b1a fix compile errors 2014-09-18 00:04:48 +08:00
Jeff 27919dad77 add simple implement of WebView for win32 
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
 2014-09-17 22:30:15 +08:00
minggo ccbf694927 Merge pull request #8086 from huangshiwu/v3_test 
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
 2014-09-17 14:50:42 +08:00
huangshiwu c8bdba69ad fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView 2014-09-17 14:00:40 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
andyque af3dd215cb improve android web view 2014-09-15 18:14:04 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
andyque 126ec18a89 add video player debug draw config 2014-09-15 17:59:51 +08:00
andyque 71b6be678e fix header guard 2014-09-15 16:56:51 +08:00
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
andyque 294271682b change return const value to value 2014-09-12 14:39:22 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00