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

229 Commits

Author SHA1 Message Date
Vladimir Timofeev 9bd1ab74c7 Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory. 
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
 2014-12-14 12:14:16 +03:00
pipu accf66c49f Update that serialize plist file name 2014-12-11 19:15:04 +08:00
pipu 70b9767c56 1. Fixes #4957 that click test TestChangePlaySection, then it will crash. 
2. Modify default value of selectedState to serialize check box data.
 2014-12-11 11:34:31 +08:00
pipu d3351a4b11 1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic. 
2. Update how to parse attribute scale9Enabled
 2014-12-10 17:35:39 +08:00
pipu e81dca372a Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader 2014-12-10 15:46:58 +08:00
pipu 6b6fe4129d Update Reader 2014-12-10 12:36:14 +08:00
minggo eef6d08813 Merge pull request #9402 from doomsdayer/v3_listview 
V3 listview
 2014-12-10 11:13:42 +08:00
pipu f54254494c Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp 2014-12-09 15:13:09 +08:00
minggo 5ab4f16fb1 Merge pull request #9411 from pipu/v3_reader_update 
V3 reader update
 2014-12-09 13:44:55 +08:00
yusheng.lu 7426a32d9f 1. ListView demo compeleted. 
2. Optimized ListViewReader format.
 2014-12-08 19:00:12 +08:00
pipu 56a25a2644 Update reader 2014-12-08 15:48:24 +08:00
Liam e4b6a2bf57 update for cocos reader 2014-12-05 19:43:40 +08:00
yusheng.lu 2f456a5668 ListViewReader completed and listview callback feature. 2014-12-05 19:31:10 +08:00
Liam be929dcde6 update for cocos reader 2014-12-05 19:19:53 +08:00
pipu 56f7895e27 Modify bugs for flatbuffers 2014-12-04 20:38:46 +08:00
pipu 6a64b867df Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader 2014-12-03 15:24:21 +08:00
pipu 57dbb214ca Modify that serialize "percent" default property for SilderReader 2014-12-01 19:58:48 +08:00
pipu 69729bcd65 Add that parse "color" in NodeReader 2014-12-01 16:27:21 +08:00
pipu 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
pipu 1447919be1 Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers 2014-12-01 11:49:11 +08:00
pipu 27261ddcc0 Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader 2014-12-01 11:48:04 +08:00
Dale Stammen 301e947c37 no initialization list for WP8 2014-11-27 05:21:04 -08:00
pipu e38da9f9b6 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
pipu e1c287d500 Modify that parse "actionTag" for WidgetReader 2014-11-27 12:12:29 +08:00
pipu 6b999d53f3 Modify that declare and definition that function return value of createNodeWithFlatBuffers() for all kinds of "NodeReader" 2014-11-26 11:50:42 +08:00
pipu 5d50a8ef92 Modify that initialize Color4B for WidgetReader 2014-11-21 19:36:20 +08:00
zhangcheng 32ce3dca2e 1, Update windows project. 2014-11-21 18:12:46 +08:00
pipu 6be17520c7 Config android, linux, wp8 2014-11-21 18:08:09 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
Vladimir Timofeev 27ef26270c Unify TinyXML2 usage. 
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
 2014-11-15 14:43:50 +03:00
minggo 6c67c6921d Merge pull request #8977 from pipu/v3_Modify_TextReader 
Modify that parsing attribute "fontName" of TextReader
 2014-11-11 12:05:49 +08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
pipu 2ed51e042d Modify that parsing attribute "fontName" of TextReader 2014-10-30 18:00:03 +08:00
pipu 0134e9247d Fixed #8838 2014-10-20 10:15:44 +08:00
pipu 1c187a4653 Modify reader in order to parse attribute "Plist" 2014-10-17 16:35:17 +08:00
pipu 20cb663746 Delete the blank block 2014-10-16 19:02:39 +08:00
pipu 7cb2629baa Delete annotate code of all Reader files 2014-10-16 17:44:22 +08:00
pipu 85bbcdd537 Deleting original code that parsing "Visible" 2014-10-16 16:26:46 +08:00
pipu e77f7f02b0 Modify Reader: 
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
 2014-10-16 15:55:38 +08:00
pipu d3f972c139 Modifying warning of *Reader 2014-10-15 17:20:54 +08:00
pipu 0d73c51a09 Modifying cocostudio/CSParseBinary.pb.h 2014-10-12 17:46:09 +08:00
pipu 38ac6533a3 Removing ../../ in header file include 2014-10-11 15:50:44 +08:00
pipu ab969db441 Modifying ImageViewReader, UIImageView 2014-10-11 15:43:37 +08:00
pipu 29eb552d00 1. Modifying ButtonReader 
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
 2014-10-11 15:35:09 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Frank.Xu 1c1d917620 Fix pull request #6894 merge conflicts 2014-09-29 16:22:55 +08:00
andyque c9b959ec82 replace raw string literal with const external variables to keep consistence. 2014-09-29 11:35:03 +08:00
andyque d4b2e8d154 remove deprecated warning 2014-09-12 17:06:13 +08:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07: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
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
zhangcheng a0ecae21c3 1. fixes TextReader load default font error. 2014-07-10 19:29:39 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
andyque 037a7dc882 fix TextReader TTF font Reader issue 2014-07-07 15:22:14 +08:00
andyque 0483c64286 fix widget ignoreContentSize issue 2014-07-07 15:21:14 +08:00
andyque c8165bb2d9 fix indent problems 2014-07-04 11:53:06 +08:00
andyque a429182765 fix windows compile and running error 2014-07-04 11:22:36 +08:00
andyque f82e96daf0 fix layout background image default color & opacity 2014-07-03 16:56:05 +08:00
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +08:00
andyque b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
andyque 199ad9c623 issue #5161, replace deprecated methods 2014-06-24 10:18:01 +08:00
andyque 312ab4f396 Merge branch 'v3' into feature5161 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
 2014-06-24 09:51:18 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
andyque 4d64b166cc refactor - replace magic string with const string 2014-06-19 17:04:14 +08:00
andyque a26ef87783 cleanup reader code 2014-06-19 15:16:56 +08:00
andyque 515de9eda5 remove magic string of widget json reader 2014-06-19 14:40:24 +08:00
andyque aa5df68b96 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	cocos/3d/CCAnimationCurve.h
	cocos/3d/CCAnimationCurve.inl
 2014-06-18 15:13:34 +08:00
子龙山人 0b677a86d7 Merge pull request #8 from geron-cn/guagnhuiv3 
Guagnhuiv3
 2014-06-18 14:47:11 +08:00
andyque 63475a6f81 refactor Loader 2014-06-18 14:44:00 +08:00
geron-cn 12bb7564cd fix cannot compile in windows 2014-06-18 14:35:43 +08:00
andyque 615995af54 add base property parser for WidgetReader 2014-06-18 14:15:11 +08:00
andyque 95f1bd7e72 update loader 2014-06-18 11:54:25 +08:00
kyokomi b6ed783b0b fix use raw char* to represent string. 2014-06-17 17:05:44 +09:00
andyque 1d01fe8bbc refactor 2014-06-15 16:12:24 +08:00
kyokomi d7199204bd Fix bug for TextReader #setFontName. 2014-06-14 23:56:12 +09:00
andyque 5515c43bb2 improve lasers 2014-06-11 15:16:08 +08:00
andyque b895018765 update parser 2014-06-11 09:35:24 +08:00
andyque 6bbf5a1459 tests 2014-06-06 10:12:23 +08:00
andyque c96a6086c3 improve parsing code 2014-06-05 11:43:43 +08:00
andyque 8690122c96 add version 300 parsing code in widget reader 2014-06-05 10:25:08 +08:00
Ricardo Quesada 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
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
andyque 437b30487c issue #5110, refactor UITextBMFont 2014-05-14 16:02:31 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
andyque c2f7c10f1c closed #5118, refactor, improving variable name 2014-05-13 09:56:10 +08:00
andyque a0a4df5ac5 closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
andyque 74ac5d1d5a issue #5057, refactor UIScrollView 2014-05-12 11:08:10 +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
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 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 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 1d7726133c issue #5057, refactor enum SizeType to strong typed enum 2014-05-09 09:37:51 +08:00
andyque fd362d2ace issue #5057. deprcated PositionType and make a new enum class instead 2014-05-08 18:25:49 +08:00
James Chen 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
pipu c492f4d3c3 fixed ui layout clip 2014-04-28 10:06:11 +08:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
andyque e346ed3559 closed #4636. done 2014-04-04 17:38:58 +08:00
andyque e20b3d8eb8 issue #4636. refactor SliderReader 2014-04-04 17:35:15 +08:00
andyque af5fe04480 issue #4636. refactor LoadingBarReader 2014-04-04 17:25:20 +08:00
andyque a4e0c1a6e2 issue #4636. refactor LayoutReader 2014-04-04 17:21:23 +08:00
andyque 3482815e69 issue #4636. refactor ImageViewReader 2014-04-04 17:18:24 +08:00
andyque c252aa5a55 issue #4636. refactor CheckBoxReader 2014-04-04 17:12:47 +08:00
andyque 77aee27f05 issue #4636. refactor ButtonReader 2014-04-04 16:51:07 +08:00
andyque 51404500b7 issue #4636. fixed WidgetReader error 2014-04-04 16:24:54 +08:00
andyque ec83b3db04 issue #4636. fix ButtonReader 2014-04-04 15:21:28 +08:00
pipu 733b364b51 Fixed bugs for Editor 2014-03-28 18:54:06 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00
CaiWenzhi 7cdfba088d Modify reader 2014-03-07 10:35:58 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
CaiWenzhi 4a2dc4a607 Add custom widget and reader 2014-03-04 16:51:35 +08:00