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

156 Commits

Author SHA1 Message Date
Dale Stammen 78df412669 updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
Dale Stammen bad71e38d0 fixed for ABSOLUTE and RELATIVE winrt compiler reserved words 2014-05-12 09:26:39 -07:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
andyque da3e794631 issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
andyque 56f417c520 issue #5057, fix windows compile error 2014-05-12 14:11:44 +08:00
andyque 8232b98525 issue #5057, fix android compile error 2014-05-12 13:54:30 +08:00
andyque b735ce3ffc issue #5057, fix andriod and linux compile 2014-05-12 11:55:00 +08:00
andyque 9d7d06a1f8 issue #5047, refactor UIVideoPlayer 2014-05-12 11:35:57 +08:00
andyque 4f3c128c4f issue #5057, refator UITextField 2014-05-12 11:29:22 +08:00
andyque eeaf48d3e5 issue #5047, refactor UISlider 2014-05-12 11:17:06 +08:00
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