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

3853 Commits

Author SHA1 Message Date
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
Dhilan007 059ea3dd8a label's small improvement. 2014-05-14 16:41:26 +08:00
andyque 9d5c2ba773 closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
andyque 09fce798f0 closed #5110, add const reference to typedef 2014-05-14 16:14:28 +08:00
andyque 437b30487c issue #5110, refactor UITextBMFont 2014-05-14 16:02:31 +08:00
andyque 76cefcaa3f issue #5110, refactor UITextAtlas 2014-05-14 15:51:50 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
yinkaile e30e05ce92 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-14 15:13:38 +08:00
samuele3hu ee4e5e4800 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-14 14:45:15 +08:00
andyque 578ff2735d issue #5110, fix VideoPlayer android compile error 2014-05-14 14:44:04 +08:00
samuele3hu 534ad2aafb fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value 2014-05-14 14:43:10 +08:00
minggo f22804241a Merge pull request #6725 from dumganhar/ref-tracker 
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
 2014-05-14 13:44:22 +08:00
James Chen 4c23ff5b8c trackRef and untrackRef are static function now. 2014-05-14 11:55:20 +08:00
pandamicro a463a1630f Fixed #5040: Remove memory allocation assertion to permit multiply init 2014-05-14 11:49:09 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
andyque e6a36fde18 issue #5110, refactor VideoPlayer 2014-05-14 11:18:11 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
James Chen 54176b0267 Include <algorithm> for std::find 2014-05-14 10:31:09 +08:00
James Chen c14482254d Fixes wrong indention and whitespace cleanup 2014-05-14 10:25:45 +08:00
James Chen ba3f5f8eee Updates indention in CCRef.h 2014-05-14 10:17:08 +08:00
James Chen 72d29976c3 Disables memory tracker by default 2014-05-14 10:16:05 +08:00
James Chen eb8f07370c Remove a comment in CCRef.cpp 2014-05-14 10:12:49 +08:00
James Chen d9d4d9d51a Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses 2014-05-14 10:07:03 +08:00
CocosRobot 20c50ef189 [AUTO]: updating luabinding automatically 2014-05-14 02:03:18 +00:00
minggo 0303e5d270 Merge pull request #6716 from andyque/issue4900 
closed #4900, add TTF font to UIText
 2014-05-14 09:57:57 +08:00
andyque ca4a7a7e53 issue #4900, refactor 2014-05-14 09:55:55 +08:00
andyque 92d9120967 issue #4900, refactor 2014-05-14 09:37:21 +08:00
andyque df86b07f15 closed #5005, refactor 2014-05-14 09:23:56 +08:00
Ricardo Quesada 723938e292 Adds effectNode in ShaderTest2 2014-05-13 18:12:58 -07:00
Ricardo Quesada 0171e27747 Merge pull request #6714 from Dhilan007/v3_nodefix 
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
 2014-05-13 14:14:27 -07:00
zifter 249dffa346 getter always must be a const method. 2014-05-13 23:28:04 +03:00
Ricardo Quesada 6462a1bf79 Adds simple sample for multitexturing 2014-05-13 12:55:34 -07:00
Ricardo Quesada 31dd70dba2 Matrix::identity() -> IDENTITY 
consistency with the rest of the  cocos2d API
 2014-05-13 10:26:25 -07:00
andyque a28bdb0ed5 closed #5005, refactor 2014-05-13 18:41:38 +08:00
minggo 05c16de87a Merge pull request #6715 from dumganhar/iss5160-animation-notification 
closed #5160: Dispatch a custom event after an animation frame is displayed
 2014-05-13 18:38:44 +08:00
andyque 2a25afbb76 closed #4900. add comment 2014-05-13 18:15:53 +08:00
minggo 7d7d0b8251 Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header 
PLEASE NEVER `using namespace cocos2d;` in header file
 2014-05-13 18:07:18 +08:00
cocoscodeide 0b301d6602 Merge pull request #5 from cocos2d/v3 
update cocos2d-x
 2014-05-13 17:59:18 +08:00
andyque 31a2194dcb closed #4900, add TTF font to UIText 2014-05-13 17:45:15 +08:00
James Chen 1ced31a2d3 issue #5160: Don't use static variables, use member variables 2014-05-13 17:29:05 +08:00
andyque 41fe56ee70 closed #5005, fix a null pointer exception 2014-05-13 17:12:48 +08:00
James Chen 0cd2196b88 closed #5160: Dispatch a custom event after an animation frame is displayed 2014-05-13 17:08:30 +08:00
James Chen d0c98d6269 Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
andyque 2d88c8ea92 closed #5005, fix visible and enable issue 2014-05-13 16:37:41 +08:00
Dhilan007 1a7ca64be2 Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix 2014-05-13 16:36:42 +08:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
Ricardo Quesada cd194cad9f Merge pull request #6711 from ricardoquesada/indent_issues 
fixes more indentation issues
 2014-05-13 00:10:30 -07:00
Ricardo Quesada 8aea6fe89f fixes more indentation issues 2014-05-13 00:10:01 -07:00
CocosRobot 7ad48b632a [AUTO]: updating luabinding automatically 2014-05-13 07:03:12 +00:00
Ricardo Quesada f25de7869b indentation issues 2014-05-12 23:57:46 -07:00
andyque 1c47c833c6 issue #5005, fixed widget visit method 2014-05-13 14:56:44 +08:00
andyque 810c25b85e Merge branch 'v3' into issue5005 2014-05-13 14:52:49 +08:00
andyque 1a319b3f12 issue #5005, deprecated setTouchEnabled 2014-05-13 14:52:27 +08:00
Ricardo Quesada cdac920b5f Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport 2014-05-12 23:52:02 -07:00
Ricardo Quesada 71848aca93 Initial multitexturing support 2014-05-12 23:51:37 -07:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
minggo 75196d96ce Merge pull request #6696 from andyque/issue5121 
issue 5121, fix loading bar init flicker and refator percentage
 2014-05-13 13:45:01 +08:00
Dhilan007 a71ee9924e closed issue:5020:The game still oriented in landscape mode when update the describes of orientation to Portrait in 'MainPage.xaml'. 2014-05-13 12:53:43 +08:00
andyque 7049fd253d closed #5121, add const to getPercent method 2014-05-13 12:06:28 +08:00
andyque b2397f4059 issue #5005, fix widget hittest problem 2014-05-13 12:04:43 +08:00
CocosRobot bf6ed6eb8b [AUTO]: updating luabinding automatically 2014-05-13 03:39:46 +00:00
minggo 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
andyque 7db02fc0e9 closed #5121, change percentage from int to float 2014-05-13 10:34:08 +08:00
andyque 5e01c61d8b closed #5118, fix indent 2014-05-13 10:15:29 +08:00
andyque 9125673c1c issue #5121, fix LoadingBar percentage when initialize 2014-05-13 10:13:08 +08:00
Ricardo Quesada 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
andyque c2f7c10f1c closed #5118, refactor, improving variable name 2014-05-13 09:56:10 +08:00
Ricardo Quesada 5d24b3d99a Merge pull request #6693 from MSOpenTech/wp8-v3-fix2 
Fixes for WP8 V3 build recently broken by recent commits
 2014-05-12 10:06:32 -07:00
Dale Stammen 78df412669 updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
Dale Stammen 34b0245cfe updated WP8 precompiled shaders 2014-05-12 09:27:27 -07:00
Dale Stammen bad71e38d0 fixed for ABSOLUTE and RELATIVE winrt compiler reserved words 2014-05-12 09:26:39 -07:00
Dale Stammen 50336dca40 updated to latest version of cocos2d 2014-05-12 09:25:37 -07:00
James Chen 602d89126f Value: initialize Value with Type::None when its move and copy 
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
 2014-05-12 23:32:51 +08:00
James Chen b24f742c92 Null ptr check in value assignment 2014-05-12 18:45:36 +08:00
andyque ebffc66a83 closed #5118, fix CCSGUIReader setAnchorPoint 2014-05-12 18:07:13 +08:00
andyque a0a4df5ac5 closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
CocosRobot 16b31e3157 [AUTO]: updating luabinding automatically 2014-05-12 08:14:14 +00:00
minggo f290d4d3ff Merge pull request #6632 from andyque/refactor5057 
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
 2014-05-12 16:10:21 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
Dhilan007 64b2562e1f fixed compile fail on android. 2014-05-12 15:22:57 +08:00
minggo 1053cacc16 don't trigger onExitTransitionDidStart 2014-05-12 15:05:21 +08:00
andyque da3e794631 issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
Dhilan007 fc72dc040d Label:fixed wrong logic of alignment. 2014-05-12 14:34:25 +08:00
andyque 56f417c520 issue #5057, fix windows compile error 2014-05-12 14:11:44 +08:00
minggo 94f50b1856 Merge pull request #6535 from dumganhar/value-optimize 
closed #5099: Optimization for Value
 2014-05-12 13:57:50 +08:00
andyque 8232b98525 issue #5057, fix android compile error 2014-05-12 13:54:30 +08:00
CocosRobot 5c735e5277 [AUTO]: updating luabinding automatically 2014-05-12 05:44:32 +00:00
minggo b23056537b Merge pull request #6602 from minggo/remove-unneeded-codes 
remove unneeded codes
 2014-05-12 13:41:12 +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
yinkaile 3f83367b61 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-11 17:25:39 +08:00
James Chen 5b14338d1f Update Android.mk 2014-05-11 13:22:42 +08:00
James Chen 449d1af7a8 Merge pull request #6672 from dumganhar/linux-android-fix 
Linux android build fix
 2014-05-11 12:51:27 +08:00
James Chen 292c1a5aa4 Linux android build fix 2014-05-11 12:50:51 +08:00
James Chen 14b6a046a3 Warning fix in CCDeprecated.cpp and CCGLProgramState.h 2014-05-11 12:14:17 +08:00
James Chen 3d22c30933 issue #4660: Warning fix in CCLabel.cpp and ConvertUTF.c 2014-05-11 11:24:01 +08:00
James Chen 602fa28577 issue #4660: Updates comments and doc for deprecated ccutf8 api 2014-05-10 21:51:42 +08:00
James Chen 448c1ad352 issue #4660: Removes unused function in ccUTF8.cpp 2014-05-10 19:34:49 +08:00
Dhilan007 4692c67b78 issue #4660:remove unnecessary API. 2014-05-10 19:33:05 +08:00
James Chen 645a9761c8 issue #4660: CCTweenFunction.h/.cpp must be in 'action' filter 2014-05-10 19:33:05 +08:00
James Chen f0cf415228 issue #4660: Fix windows include path doesn't contain `external/ConvertUTF` 2014-05-10 19:33:05 +08:00
James Chen 3a30adde0f issue #4660: A warning fix in CCFontAtlas.cpp 2014-05-10 19:33:05 +08:00
James Chen 07204a0602 issue #4660: Updates win32 project 2014-05-10 19:33:05 +08:00
James Chen e693a51c6e issue #4660: Linux build ok 2014-05-10 19:24:04 +08:00
James Chen 20adf418fd Updates 2d/CMakeLists.txt 2014-05-10 19:24:04 +08:00
James Chen e003a09a2c Updates CMakeLists.txt 2014-05-10 19:24:04 +08:00
James Chen dd3ed008b9 issue #4660: Updates Android.mk 2014-05-10 19:24:04 +08:00
James Chen b003ba5eb0 issue #4660: Oops, utf16 is 2 bytes. 2014-05-10 19:24:03 +08:00
James Chen a61b1097db issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String 2014-05-10 19:24:03 +08:00
James Chen 5fda13639d issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
James Chen ed8633141f issue #4660: Updates android.mk 2014-05-10 19:24:03 +08:00
James Chen 9f4d2acaee issue #4660: StringUtils is a namespace now 2014-05-10 19:24:03 +08:00
James Chen 20a8808b78 issue #4660: Refactors utf8 api, make it safer and easier to use. 2014-05-10 19:24:03 +08:00
Huabing.Xu bbac0be9a6 add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS 2014-05-09 22:04:19 -07:00
Ricardo Quesada 4d579892b1 Merge pull request #6668 from dabingnn/v3_fix_accident_changes 
V3 fix accident changes
 2014-05-09 21:38:09 -07:00
Huabing.Xu ba63befa5e roll back target=android-10 2014-05-09 21:36:35 -07:00
Ricardo Quesada a8c2fb5431 Fixes deprecated warnings 2014-05-09 21:29:24 -07:00
Ricardo Quesada 605fe8e4f3 fixes double free crash on GLProgramStateCache 2014-05-09 21:06:02 -07:00
CocosRobot f0c240f885 [AUTO]: updating luabinding automatically 2014-05-10 03:47:56 +00:00
Ricardo Quesada 32d96ca9ad Compiles on Windows Phone 8 
... but does not run
 2014-05-09 19:42:57 -07:00
Ricardo Quesada 488a8deae9 Shader fixes for windows 2014-05-09 19:13:12 -07:00
Ricardo Quesada e8d2cf7871 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 19:08:08 -07:00
Ricardo Quesada 8f71e65482 Compiles on windows, sort of 2014-05-09 19:07:22 -07:00
yangxiao d46729862c android rename ShaderCahe to GLProgramCache 2014-05-09 19:05:39 -07:00
Ricardo Quesada b62f4e51a4 Updates Linux project 2014-05-09 18:40:53 -07:00
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -07:00
Ricardo Quesada b5fdbf2d49 it is v3.1-alpha1 2014-05-09 17:03:34 -07:00
Ricardo Quesada faf617bc37 fixes for Linux 2014-05-09 16:57:11 -07:00
Ricardo Quesada f511b1f8a1 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 16:46:35 -07:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
yangxiao 1be6ba961c Merge branch 'newcode' into improved_glprogram 2014-05-09 16:05:42 -07:00
yangxiao 877d8dd771 android works!! 2014-05-09 15:59:49 -07:00
Ricardo Quesada 9cad6cf027 removes some unused directories from the propery sheet 
... for Visual Studio
 2014-05-09 15:35:53 -07:00
Ricardo Quesada 4c623f1f5e compiles and runs on Windows Phone 8 
What's missing is to have the pre-compiled shaders from MS
to test the the ShaderTest
 2014-05-09 15:14:50 -07:00
yangxiao 879958855b UniformValue use union array 2014-05-09 14:38:36 -07:00
Ricardo Quesada 739af170ad compiles and runs on Windows!!! 2014-05-09 13:24:56 -07:00
Ricardo Quesada 9ffaeec515 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 12:00:33 -07:00
Ricardo Quesada 16c6b2163d More VisualStudio fixes 2014-05-09 11:59:52 -07:00
Huabing.Xu e72633c066 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram 2014-05-09 11:53:22 -07:00
Huabing.Xu a8b27de799 fix bug for y flipped coord (particle system) 2014-05-09 11:50:37 -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
Ricardo Quesada 8565e899f9 adds missing files to VisualStudio 2014-05-09 11:38:43 -07:00