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

3425 Commits

Author SHA1 Message Date
Dhilan007 75772af82b fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled. 2014-04-22 23:18:23 +08:00
minggo 506d628619 Merge pull request #6352 from natural-law/develop 
Solve compiling errors when some macros changed in ccConfig.h.
 2014-04-22 17:00:28 +08:00
minggo ccc935137b Merge pull request #6343 from dumganhar/fixed-tilemaptest-crash 
Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32
 2014-04-22 16:53:32 +08:00
zhangbin 2305ba59e6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/2d/CCActionInterval.cpp
 2014-04-22 16:49:27 +08:00
zhangbin 093bd20a74 Solve compiling errors when some macros changed in ccConfig.h. 2014-04-22 16:42:13 +08:00
James Chen b8e77d8968 Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION 2014-04-21 22:38:15 -07:00
James Chen 99654289ed Invokes 'Node::onExit' only when the node is running. 2014-04-21 22:31:34 +08:00
James Chen 8038d3daa5 Fixed tilemaptest crashes when click 'next' button quickly 2014-04-21 22:24:44 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
Huabing.Xu 83ee1b4bdc android OK 2014-04-21 17:38:10 +08:00
Huabing.Xu 68e058b12d IOS/Mac OK: remove kazMath 
Make code compatible with old tests
 2014-04-21 17:37:52 +08:00
minggo 3ac08b7349 Merge pull request #6300 from elvman/develop 
Flipping RenderTexture's sprite instead of scaling it by -1
 2014-04-21 15:23:10 +08:00
CocosRobot 77130708c2 [AUTO]: updating luabinding automatically 2014-04-21 06:45:09 +00:00
minggo 0a5b92c56f Merge pull request #6305 from samuele3hu/developAudio 
fix the bug that exit layer can’t end the SimpleAudioEngine
 2014-04-21 14:40:40 +08:00
minggo 02c2fc8abf Merge pull request #6333 from chuanweizhang2013/luaruntime 
translate
 2014-04-21 14:06:32 +08:00
minggo 8a75bccdc1 Merge pull request #6332 from minggo/develop 
update version
 2014-04-21 13:44:40 +08:00
minggo b53b9ceb3e update version 2014-04-21 13:43:42 +08:00
boyu0 710fe9d940 closed #4771: modify test. 2014-04-21 13:32:47 +08:00
chuanweizhang2013 1fe52b1557 translate 2014-04-21 11:07:14 +08:00
minggo 1c44dbe385 Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios 
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
 2014-04-21 11:02:11 +08:00
boyu0 a1024353f1 issue #4904: fix iOS Image::safeToFile crashes when save jpg file. 2014-04-21 10:25:34 +08:00
Huabing.Xu e74f8719cf fix warning in compiling 2014-04-21 09:52:59 +08:00
Dale Stammen 9792a4708a fixed curl DEBUGASSERT for release builds 2014-04-19 10:33:40 -07:00
Dale Stammen 6646e6c860 input event refactor. console enabled for wp8 2014-04-19 10:12:34 -07:00
Dale Stammen d235539b39 added missing include paths 2014-04-19 10:12:06 -07:00
Dale Stammen 8d6fe7be1a added missing files 2014-04-19 10:11:44 -07:00
Dale Stammen 4a7fa029cc updated property sheet include paths and warnings 2014-04-19 10:09:10 -07:00
Dale Stammen 467ededeff enabled console for wp8 2014-04-19 10:08:01 -07:00
Dale Stammen b0adaee331 added missing WP8 device orientation 2014-04-19 10:06:27 -07:00
Dale Stammen 768e0bd53f updated wp8 precompiled shaders 2014-04-19 10:05:21 -07:00
Dale Stammen 8f14597717 check if _currentUTF16String is null 2014-04-19 09:38:45 -07:00
Dale Stammen 9cf463bf6a start of input queue support 2014-04-19 09:37:54 -07:00
Dale Stammen 12b01dcb25 input events refactor 2014-04-19 09:32:59 -07:00
Dale Stammen 1a56f435fe added missing files 2014-04-19 09:32:12 -07:00
Dale Stammen bebfe31b48 removed input files from refactor 2014-04-19 09:28:37 -07:00
Dale Stammen 66ed186a56 added missing files 2014-04-19 09:27:28 -07:00
Dale Stammen f2b5d7c395 updated winrt project file 2014-04-19 09:26:52 -07:00
Dale Stammen d19e898f21 removed ccset.h 2014-04-19 09:26:38 -07:00
Dale Stammen 4baa7ebacf added CC_PLATFORM_WINRT 2014-04-19 09:25:54 -07:00
Dale Stammen 1403737d2d added functions to display ip address of device 2014-04-19 09:12:20 -07:00
Dale Stammen f233251f4f added functions to display ip address of device 2014-04-19 09:12:04 -07:00
Dale Stammen 008bde1e27 fixed font path when fontname is empty string 2014-04-19 09:11:20 -07:00
Dale Stammen b54a1064fd fixed accelerometer for wp8 2014-04-19 09:10:34 -07: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
minggo 8e83cd7900 Merge pull request #6261 from iSevenDays/patch-9 
Fix memory leak
 2014-04-18 14:19:17 +08:00
minggo 0e7280b1ca Merge pull request #6304 from dumganhar/iss4568-crash 
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
 2014-04-18 14:00:40 +08:00
minggo b7e5306275 Merge pull request #6313 from chuanweizhang2013/luaruntime 
update android runtime
 2014-04-18 13:59:32 +08:00
samuele3hu 7e81f32016 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText 2014-04-18 11:55:30 +08:00
samuele3hu 914516a4e0 fix the compile error about luabindings and add the `RichText` test cases. 2014-04-18 11:54:57 +08:00
chuanweizhang2013 2a9c99ff66 Merge pull request #25 from cocos2d/develop 
update cocos2d-x
 2014-04-18 11:45:53 +08:00
CocosRobot a78a1090c3 [AUTO]: updating luabinding automatically 2014-04-18 02:51:14 +00:00
minggo 7399ef2527 Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize 
Develop nutty widgetsupportscontentsize
 2014-04-18 10:47:10 +08:00
minggo a8a8ef85e6 add comment for EventListenerTouchOneByOne::checkAvailable() 2014-04-17 14:46:52 +08:00
CaiWenzhi a8bfa094c0 Remove useless codes 2014-04-17 14:27:21 +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
samuele3hu 11515f6ab3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio 2014-04-17 11:06:20 +08:00
samuele3hu 1331fff62c fix the bug that exit layer can’t end SimpleAudioEngine 2014-04-17 10:36:08 +08:00
James Chen 30e1d41dbf Makes 'compareRenderCommand' as a static function instead of a global function 2014-04-17 10:16:37 +08:00
andyque a9ed075d50 closed #4883. fixed slider hittest problem 2014-04-17 10:15:58 +08:00
James Chen 63f54cb5f7 closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled. 
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
 2014-04-17 10:15:11 +08:00
zifter 08d975268d Fix for issue http://www.cocos2d-x.org/issues/4880. 2014-04-17 03:15:43 +03:00
Elviss Strazdins 5ddef013ba Flipping RenderTexture's sprite instead of scaling it by -1 2014-04-17 02:22:34 +03:00
Huabing.Xu d14d3007d0 remove kazmath include file 2014-04-16 14:08:58 +08:00
Huabing.Xu 346d42f723 remove warning message---finished 2014-04-16 11:20:45 +08:00
Huabing.Xu 6fd7197d96 remove warning message---continue 2014-04-16 11:18:23 +08:00
Huabing.Xu a32bb8cd23 remove warning message---continue 2014-04-16 10:58:34 +08:00
Huabing.Xu b01941b6ac remove warning message---continue 2014-04-16 10:42:39 +08:00
Huabing.Xu 2bb32a8e4b remove warning message 2014-04-16 10:27:17 +08:00
Huabing.Xu 30dec564e6 remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
Huabing.Xu debad86ec1 fix compile error after merge 2014-04-15 22:35:35 +08:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
 2014-04-15 22:21:04 +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 917ae6e88b deprecate Point, using Vector2 instead 2014-04-15 17:46:44 +08:00
Huabing.Xu 5303f50904 Migrate to Vector2 in DrawPrimitive.h 2014-04-15 17:29:23 +08:00
cw 312cd49b1a Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-15 17:10:24 +08:00
cw d361efacae add update 2014-04-15 17:10:11 +08:00
Huabing.Xu 9c33b48b50 remove Point in CCNode.h and CCSprite.h 2014-04-15 17:09:18 +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 ec2ef0f64b migrate convertXXXX to Vector2 step2 2014-04-15 14:41:09 +08:00
Huabing.Xu 633173005b migrate convertXXXX to Vector2 2014-04-15 14:29:12 +08:00
Huabing.Xu 4df714b9d8 Migrate to Vector2 in class Director 2014-04-15 14:18:40 +08:00
Huabing.Xu 44be9a38ec Node convertToNodeSpace and convertToWorldSpace use Vector2 2014-04-15 14:09:46 +08:00
minggo 46e7058587 update version information 2014-04-15 13:58:51 +08:00
Huabing.Xu 11fc8ac308 conversion from Vector2 and Point 2014-04-15 13:58:08 +08:00
minggo 38b982f938 Merge pull request #6286 from dumganhar/rename-listener-method 
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 13:43:25 +08:00
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08:00
James Chen 8134404734 Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' 
-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 12:50:33 +08:00
Huabing.Xu 3f496069b4 add interface in Vector2 for Point 2014-04-15 11:58:08 +08:00
CocosRobot 4f9387447d [AUTO]: updating luabinding automatically 2014-04-15 03:41:34 +00:00
Ricardo Quesada 3978cee2ee compiles on windows 2014-04-14 20:00:06 -07:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
boyu0 c98f50026f issue $4771: move PhysicsWorld to layer. 2014-04-15 03:21:18 +08:00
Huabing.Xu c081fc61aa comment kmMat4 & Matrix conversion code 2014-04-14 17:49:45 +08:00
Huabing.Xu 15cc63c2ba remove kmVec3 in ActionCamera 2014-04-14 15:26:05 +08:00
minggo de5f52857a Merge pull request #6273 from CocosRobot/update_lua_bindings_1397458473 
[AUTO]: updating luabinding automatically
 2014-04-14 14:56:35 +08:00