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

919 Commits

Author SHA1 Message Date
cai wenzhi d14522880d Fixed bug of NodeReader 2014-07-21 22:45:33 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
minggo aef1e01ce5 Merge pull request #7518 from natural-law/android-dependencies 
Android dependencies
 2014-07-18 17:57:42 +08:00
zhangcheng 24d87ad05b 1. fixes ActionManagerEx crashes. 2014-07-17 17:24:41 +08:00
minggo a653d0eb28 Merge pull request #7440 from boyu0/add_utils_atof 
Add utils::atof(), fix bug: particle not shown on android.
 2014-07-17 09:59:15 +08:00
zhangcheng 1530ba4a90 1、fixes Trigger condition value can't be export. 2014-07-16 16:12:55 +08:00
zhangcheng 80de57be39 1、 fixes lua TriggerTest bug. 2014-07-16 14:50:35 +08:00
zhangbin 7e7c3a1e55 Merge branch 'v3' into android-dependencies 2014-07-16 13:49:20 +08:00
zhangbin 14f3d6f230 Adjust the dependencies of extensions & cocostudio on android. 2014-07-16 13:47:57 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
pandamicro 216af377d0 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans 2014-07-15 11:32:12 +08:00
pandamicro db8f0ea3ab Fixed #5724: Use correct transform in CCSkin's updateTransform function 2014-07-15 11:31:10 +08:00
pandamicro 67c07f94f4 Issue #5724: Correction of property name in CCBone 2014-07-15 11:30:36 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
zhangbin e4319bf534 Adjust the dependencies of cocosbuilder & cocostudio on android. 2014-07-14 09:48:16 +08:00
zhangbin b0c465d96b Adjust the dependencies between modules on android. 2014-07-14 09:48:16 +08:00
geron-cn 64408a5d8f fix bug: crash in ui csbs 2014-07-11 19:02:14 +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
minggo d1d84e0d1f Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError 
1. fixes TextReader load default font error.
 2014-07-11 13:40:16 +08:00
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 4895e6d54a Merge pull request #7362 from geron-cn/chukongv3 
Chukongv3
 2014-07-10 21:17:19 +08:00
zhangcheng a0ecae21c3 1. fixes TextReader load default font error. 2014-07-10 19:29:39 +08:00
geron-cn 1c4cb78745 deal with null in string 2014-07-10 18:24:11 +08:00
kaile.yin 04c63cc370 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-10 17:51:02 +08:00
kaile.yin 42f2302866 fixed call Bone::setRotation has no effect 2014-07-10 17:50:38 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
andyque 41ccd5e465 add v1.4 tests 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
minggo 7d74be3158 Merge pull request #7356 from 2youyouo2/v3 
fixed Armature blend func effect
 2014-07-09 18:37:15 +08:00
kaile.yin c53cb42e83 fixed Armature blend func effect 2014-07-09 14:25:51 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07: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
minggo a942aae84f Merge pull request #7316 from cocoscodeide/v3 
lua runtime template 1.2
 2014-07-04 18:33:36 +08:00
chuanweizhang2013 39b03de8a9 revert Android.mk 2014-07-04 15:39:07 +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
minggo eb97b9ad45 Merge pull request #7305 from andyque/fixLayoutReader 
fix layout background image default color & opacity
 2014-07-03 17:16:56 +08:00
andyque f82e96daf0 fix layout background image default color & opacity 2014-07-03 16:56:05 +08:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression 
Support regular expression
 2014-07-03 15:20:06 +08:00
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse 
V3 op binary parse
 2014-07-03 14:00:01 +08:00
minggo 2cfea323b0 Merge pull request #7300 from 2youyouo2/v3 
fixed add relative data bug
 2014-07-03 13:56:04 +08:00
minggo 6cc600ccce fix compiling warnings 2014-07-03 11:43:56 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 2b1ef55ea9 1. fixes scene parse crash. 2014-07-02 15:58:42 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
zhangcheng cf9b049926 1. fixes same name warning. 2014-07-02 10:53:35 +08:00
minggo 5b282e338f Merge pull request #7279 from andyque/fixTextReader 
fix Text reader font name
 2014-07-02 10:04:00 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
minggo d9a1f76755 fix effect of spine 2014-07-02 09:58:07 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
geron-cn 17c320f1e2 fix 2014-07-01 19:06:51 +08:00
geron-cn c561f4e2f4 fix win can not compile 2014-07-01 18:55:09 +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
geron-cn dfdc4f6b66 fix bug: did not addarmature to the relativedata 2014-07-01 16:24:59 +08:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +08:00
minggo 80204e3048 Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse 
Cleanup binary loader add scene binary parse
 2014-07-01 13:47:35 +08:00
andyque b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
andyque 4e63a3da7d modify nodeReader to support LabelAtlas and LabelBMFont 2014-07-01 10:11:36 +08:00
minggo 40e88ab6eb Merge pull request #7251 from 2youyouo2/v3_current_frame_index 
add gotoFrameAndPlay and setCurrentFrame interface
 2014-06-30 17:32:24 +08:00
zhangcheng a3fcddde39 1. NULL->nullptr. 
2. bRet->ret.
 2014-06-30 17:15:55 +08:00
2youyou2 b76127231c add gotoFrameAndPlay and setCurrentFrame interface 2014-06-30 15:53:12 +08:00
pandamicro bee41712ad Fix Travis CI compilation issue 2014-06-30 11:58:15 +08:00
2youyou2 30a13c05c9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-30 11:08:22 +08:00
2youyou2 aba7421ef6 fixed crashed when remove armature in frame event. 2014-06-30 10:14:31 +08:00
2youyou2 1a9e42ef85 fixed armature blend func has no effect 2014-06-30 10:11:43 +08:00
andyque d06ca0e75d fix gui reader 2014-06-26 17:29:07 +08:00
zhangcheng a6d6287b29 1. remove hungary style. 
2.  fixes build error.
 2014-06-26 10:08:17 +08:00
Dale Stammen 3fd615845b removed deleted header file from project 2014-06-25 10:08:54 -07:00
zhangcheng 98c21f6f57 1. remove Hungary style. 2014-06-25 18:10:06 +08:00
zhangcheng bdf7be6fa0 1. add classname = "" log. 2014-06-25 14:32:38 +08:00
zhangcheng 644b61e261 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
minggo 66703addb2 fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 
replace size with contentSize
 2014-06-24 18:43:33 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader 
Fix NodeReader crash
 2014-06-24 10:49:10 +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
Dale Stammen 44d6248056 added missing cocoloader files 2014-06-23 08:31:29 -07:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
andyque 3e5ab0ec8e fix linux compile error 2014-06-23 17:09:54 +08:00
andyque ce58c2ddd6 remove unused header file 2014-06-23 16:53:06 +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 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +08:00
yinkaile aac4ded898 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 11:24:12 +08:00
yinkaile 510bc23b16 1.fixed action may shake a little 
2.fixed frame event will emit even they do not in current play section
 2014-06-20 11:23:26 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
minggo e374bd67c7 Merge pull request #6946 from hanjukim/skip-utf8-bom 
Skip UTF8 BOM if it exists and bug fix for unterminated string
 2014-06-19 22:02:38 +08:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3 
add TimelineAction
 2014-06-19 21:05:15 +08:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09: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
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
子龙山人 e1095c4f09 Merge pull request #9 from geron-cn/guanghuiv3 
Guanghuiv3
 2014-06-19 13:38:53 +08:00
geron-cn 6abc9aba0e add binary read to test-cpp 2014-06-18 20:09:12 +08:00
andyque b55b95adc3 fix linux compile error 2014-06-18 18:28:31 +08:00
andyque 20b41d2886 fix android compile error 2014-06-18 18:25:31 +08:00
geron-cn 5cfbd3a2bd add binary decode to armature 2014-06-18 17:43:13 +08:00
andyque 9398395de8 fix custom property 2014-06-18 16:19:24 +08:00
andyque 1533374bd1 add ui animation for binary parsing 2014-06-18 15:55:01 +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
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
andyque 615995af54 add base property parser for WidgetReader 2014-06-18 14:15:11 +08:00
minggo 08453b911d Merge pull request #7071 from pandamicro/Script_onEnter_fix 
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
 2014-06-18 13:37:57 +08:00
andyque 95f1bd7e72 update loader 2014-06-18 11:54:25 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
minggo 6ecca08340 Merge pull request #7039 from minggo/get-child-by-name 
issue #4693: add getName(), setName() and getChildByName()
 2014-06-18 11:30:14 +08:00
2youyou2 719fdb712d add frame event test 2014-06-18 11:22:38 +08:00
andyque ca24ad6768 Merge branch 'v3' into cleanupBinaryLoader 2014-06-18 11:19:19 +08:00
minggo 8a0a6a2ded Merge pull request #7064 from kyokomi/TextReader_filePath_fix 
Fix bug for TextReader #setFontName.
 2014-06-18 10:36:29 +08:00
kyokomi b6ed783b0b fix use raw char* to represent string. 2014-06-17 17:05:44 +09:00
2youyou2 806d74b6f9 add change play section test 2014-06-17 15:57:30 +08:00
2youyou2 c221a59954 fixed frame's value not right when enter frame 2014-06-17 15:57:06 +08:00
2youyou2 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
2youyou2 02363c2ae4 read visible property 2014-06-16 17:20:59 +08:00
2youyou2 f9a817a2bf read flip property 2014-06-16 15:19:58 +08:00
2youyou2 7bb188f15a fixed not read zorder 2014-06-16 15:03:53 +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
2youyou2 c5fe56ef21 update CMakeLists.txt 2014-06-16 09:44:14 +08: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
maldewar 74c4073418 Update _bPlaying on CCActionObject. 
The method CCActionObject::isPlaying() return the state of the member var _bPlaying,
which is initially declared false and never updated. The change updates this variable
across the play, pause, stop and end states of the action.
 2014-06-13 17:52:42 -07:00
2youyou2 d9f34a1412 change texture to textureName 2014-06-13 19:52:53 +08:00
2youyou2 5bce6b87ea change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00
2youyou2 57fe37f9f1 add const word 2014-06-13 18:00:46 +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
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00
2youyou2 b181eaf802 modify mk file 2014-06-13 14:43:53 +08:00
2youyou2 e0f6ae9db4 change TimelineAction to cocos/2d folder 2014-06-13 13:36:01 +08:00
pipu 65c2a5e3e1 add parse actionTag in loadWidget method of CCNodeReader 2014-06-13 10:49:57 +08:00
2youyou2 f09b1863a9 fixed read sprite 2014-06-12 20:16:39 +08:00
pipu c0170d23c7 fixed warnings 2014-06-12 19:56:15 +08:00
2youyou2 b2c5334de1 change NodeCache to NodeReader 2014-06-12 19:24:27 +08:00
2youyou2 eb2e973e07 change read name 2014-06-12 19:12:05 +08:00
2youyou2 ea7e24ba24 add TimelineActionData 2014-06-12 18:50:37 +08:00
2youyou2 e4f1ac6126 add hd resource 2014-06-12 17:38:26 +08:00
2youyou2 db992b6d0f modify cocostudio Android.mk 2014-06-12 16:26:18 +08:00
2youyou2 f536020d26 remove unused files 2014-06-12 16:21:41 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00
2youyou2 4d1bf0c1a2 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
 2014-06-12 09:42:20 +08:00
youyou 28ae57c5fc add AsyncReader 2014-06-12 00:38:23 +08:00
2youyou2 aa06fab776 support relative path for reading json 2014-06-11 21:11:22 +08:00
minggo 8a5bfb9840 issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08:00
andyque 5515c43bb2 improve lasers 2014-06-11 15:16:08 +08:00
andyque f50263402a improve parser 2014-06-11 14:56:12 +08:00
andyque 2f6f1b7151 improve binary format 2014-06-11 14:45:35 +08:00
andyque 7a8f27ee0b remove unused parser code 2014-06-11 14:15:34 +08:00
2youyou2 09a2ceb7df add TimelineAction 2014-06-11 11:10:07 +08:00
andyque b895018765 update parser 2014-06-11 09:35:24 +08:00
2youyou2 0c7cbda144 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-10 09:09:53 +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
andyque b570487bf3 add cocostudio binary file parser 2014-06-05 10:24:12 +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 d089b251db fix other platform compile error 2014-06-04 14:56:34 +08:00
andyque 54e93f6c41 fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +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
Hanju Kim 28b95bd54a * Skip UTF8 BOM if it exists 
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
 2014-05-31 00:06:56 +02:00
minggo f3de239647 Merge pull request #6616 from xhcnb/fix_callback 
Fix crash: use cocostudio gui editor, create a action in editor, when yo...
 2014-05-27 14:51:36 +08:00
minggo 9d2c765fc0 Merge pull request #6862 from favorcode/v3 
Update UILoadingBar.h doxygen comments
 2014-05-27 13:54:52 +08:00
2youyou2 b0bc406bdc fixed Armature::getBoundingBox() is wrong when bone's display is null 2014-05-26 16:16:06 +08:00
hanbihui 332f75a57c Update CCActionObject.h Doxygen comments 2014-05-26 12:02:14 +08:00
garfield_ho d5d0df6933 The default size of CCMenu in CocosBuilder is 0,0 2014-05-22 16:21:51 +08:00
James Chen 7da07342fe Merge pull request #6734 from 2youyouo2/v3 
fixed no effect with stopping tween between two frames
 2014-05-17 12:17:34 +08:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
minggo 385b2507aa Merge pull request #6615 from xhcnb/fix_ActionObject 
FIx: correct TotalTime of ActionObject.
 2014-05-15 15:39:15 +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
yinkaile e30e05ce92 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-14 15:13:38 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
Ricardo Quesada 31dd70dba2 Matrix::identity() -> IDENTITY 
consistency with the rest of the  cocos2d API
 2014-05-13 10:26:25 -07:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08: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
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
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
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
andyque 74ac5d1d5a issue #5057, refactor UIScrollView 2014-05-12 11:08:10 +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
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -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 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 c5a505ec4c issue #5057, Merge branch 'v3' into refactor5057 
Conflicts:
	cocos/ui/CocosGUI.h
 2014-05-09 15:39:02 +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 3ef1facfb0 issue #5057, replace deprecated enum with strong typed enum 2014-05-09 09:29:07 +08:00
Ricardo Quesada 62d9c24518 moves shaders files from 2d/ to renderer/ 2014-05-08 18:01:48 -07:00
Ricardo Quesada 51f498fc94 fixed deprecation warnings 2014-05-08 16:42:36 -07:00
Ricardo Quesada 580ebf939f working Ok with new API 2014-05-08 15:43:12 -07:00
andyque fd362d2ace issue #5057. deprcated PositionType and make a new enum class instead 2014-05-08 18:25:49 +08:00
CaiWenzhi 0a46b3c8d2 Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-08 15:56:34 +08:00
CaiWenzhi a562f19880 Fixed bug of guireader 2014-05-08 15:15:09 +08:00
Jason Xu 5b09ef9b63 just unschedule, no need release here. 2014-05-08 10:56:59 +08:00
Jason Xu 2b581aba18 Fix crash: use cocostudio gui editor, create a action in editor, when you play like: 
auto _action = getActionByName("action_name");
        _action->play(CallFunc::create([](){
		CCLOG("done.");
        }));
It'll crash.
 2014-05-08 10:52:31 +08:00
Jason Xu 8507fd7f8d FIx: correct TotalTime of ActionObject. 2014-05-08 10:28:41 +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
2youyou2 44b93f3548 change tab to 4 space 2014-05-05 17:46:06 +08:00
2youyou2 d4f644814c change tab to 4 space 2014-05-05 17:43:15 +08:00
2youyou2 f6eac43a0a fixed no effect with stopping tween between two frames 2014-05-05 09:45:06 +08:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Ricardo Quesada 40fe815ab9 Squashed commit of the following: 
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:05:18 2014 -0700

    more linux fixes

commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:04:04 2014 -0700

    more linux fixes

commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:02:07 2014 -0700

    fixes linux isuses

commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:58:50 2014 -0700

    more linux fixes

commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:57:33 2014 -0700

    more linux fixes

commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:53:43 2014 -0700

    more linux fixes

commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:49:28 2014 -0700

    more linux fixes

commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:47:43 2014 -0700

    more linux fixes

commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:46:00 2014 -0700

    more linux fixes

commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:43:15 2014 -0700

    more linux fixes

commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:36:06 2014 -0700

    more fixes for linux

commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:35:29 2014 -0700

    more fixes for linux

commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:34:44 2014 -0700

    more fixes for linux

commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:33:45 2014 -0700

    fixes for linux

commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:16:48 2014 -0700

    compiles on Windows

commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:07:20 2014 -0700

    fix builder
 2014-04-30 19:09:13 -07:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07: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
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
Ricardo Quesada b053a9145a Compiles on Windows32 2014-04-25 22:03:25 -07:00
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2014-04-24 16:58:46 +08:00
CaiWenzhi 4750e8b417 Fixed bug of gui reader 2014-04-23 15:02:35 +08:00
Huabing.Xu e74f8719cf fix warning in compiling 2014-04-21 09:52:59 +08:00
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 2014-04-19 00:30:34 +08:00
CaiWenzhi ed4fcd5d1a Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes 2014-04-17 14:23:08 +08:00
CaiWenzhi 19f6526ef8 Widget supports contentsize 2014-04-17 14:08:25 +08:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
Huabing.Xu e2a24dec84 replace Point with Vector2 2014-04-15 18:08:29 +08:00
Huabing.Xu 5303f50904 Migrate to Vector2 in DrawPrimitive.h 2014-04-15 17:29:23 +08:00
Huabing.Xu 511e868ac4 migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2 2014-04-15 16:59:16 +08:00
Huabing.Xu e351b778c1 migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
Huabing.Xu 6686b657a4 Migrate getPostion and correspondent member variable to Vector2 2014-04-15 16:28:59 +08:00
Huabing.Xu 071cbc7565 migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
 2014-04-14 14:08:19 +08:00
James Chen b715a87791 Memory leak fix in macro IMPLEMENT_CLASS_INFO 2014-04-12 12:58:00 +08:00
Huabing.Xu 866c4ad735 remove kmMat4 in Armature 2014-04-11 17:25:28 +08:00