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

2070 Commits

Author SHA1 Message Date
Dhilan007 83f4e536c5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630 
Conflicts:
	tests/game-controller-test/proj.android/project.properties
 2014-06-30 19:27:01 +08:00
Dhilan007 9bf36a1045 update test case. 2014-06-30 18:43:09 +08:00
minggo a24526fd53 Merge pull request #7258 from andyque/fixSchedulerTest 
call parent onExit method
 2014-06-30 18:20:05 +08:00
andyque 9ef0544953 call parent onExit method 2014-06-30 18:22:58 +08:00
minggo d7cbc2872e Merge pull request #7250 from minggo/fix-compiling 
fix compiling error
 2014-06-30 18:06:54 +08:00
minggo 100968e4e5 Merge pull request #7254 from dabingnn/v3_fix 
fix outline bug
 2014-06-30 17:26:11 +08:00
minggo f85d84f2ef Merge pull request #7252 from visiblelight/beta_test 
Fixing compile errors on WP8
 2014-06-30 17:24:08 +08:00
Huabing.Xu 395e61f977 fix outline bug 2014-06-30 17:21:04 +08:00
minggo 3b13855374 fix compiling error on iOS 2014-06-30 17:20:13 +08:00
Dhilan007 26f3445311 add missing files for the projects 2014-06-30 17:07:55 +08:00
minggo c1e56e62c1 fix compiling error 2014-06-30 15:51:35 +08:00
Dhilan007 2a9e10be2c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630 2014-06-30 13:41:55 +08:00
Huabing.Xu 98d3e22777 re add commented test case back 2014-06-30 11:23:41 +08:00
Dhilan007 a63216d97b issue #4895:Add test case 2014-06-30 03:25:49 +08:00
Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
 2014-06-29 20:23:43 +08:00
minggo 4f79176da2 Merge pull request #7234 from boyu0/iss5614_physics_transform 
closed #5614: add transform support for physics
 2014-06-29 17:23:20 +08:00
minggo 7f28e81d09 Merge pull request #7226 from super626/v3 
Animation3D
 2014-06-29 16:41:13 +08:00
Huabing.Xu 3771654e66 remove deprecated function 
rename enum to static const member of class
remove hex tile map(we do not support it yet)
 2014-06-27 18:00:06 +08:00
samuele3hu 318e39a6d2 Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux 2014-06-27 17:58:59 +08:00
boyu0 fccc517eef add test for physics transform. 2014-06-27 17:30:50 +08:00
yangxiao 4685a8654e Animate3D transition 2014-06-27 17:02:08 +08:00
Huabing.Xu 33a8b6563f windows works for fast tmx 2014-06-27 16:56:26 +08:00
yangxiao 2a6ce26335 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-27 16:36:36 +08:00
yangxiao 343ef9ae55 update sprite3d test 2014-06-27 16:36:01 +08:00
lvlong a497cc0ed2 wrong suffix name 2014-06-27 15:53:25 +08:00
samuele3hu acc1004e28 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-06-27 14:53:25 +08:00
samuele3hu b1d07f2711 Add VideoPlayer Test for Lua 2014-06-27 13:56:39 +08:00
lvlong fac17097a0 add a new model and change girl model to it 2014-06-27 11:44:44 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
yangxiao ccb39e51b2 animation3d transition not finished 2014-06-26 18:35:12 +08:00
minggo 768eb4e1d0 Merge pull request #7222 from minggo/warnings-fix 
fix warnings
 2014-06-26 17:24:13 +08:00
minggo dc635db163 fix warnings 2014-06-26 16:15:02 +08:00
minggo e0e9d3379c Merge pull request #6948 from lite3/v3 
Add immediate send request
 2014-06-26 16:05:58 +08:00
minggo b033f7f664 Merge pull request #7218 from minggo/add-findChildren 
Add utils::findChildren
 2014-06-26 15:19:54 +08:00
minggo 2917596d5e add utils::findChildren() 2014-06-26 14:05:30 +08:00
zhangcheng a6d6287b29 1. remove hungary style. 
2.  fixes build error.
 2014-06-26 10:08:17 +08:00
samuele3hu c892939968 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader 2014-06-26 09:52:41 +08:00
samuele3hu 3bd195d4ef Add Lua binding for ActionTimeline related and related test cases 2014-06-26 09:51:32 +08:00
minggo 46d380b5ac Merge pull request #7204 from andyque/fixListViewTestHorizentalCarsh 
fix ListView addChild problem
 2014-06-25 17:20:17 +08:00
andyque a4bd3879ac fix ListView addChild problem 2014-06-25 16:17:16 +08:00
samuele3hu 5f63514d6b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus 2014-06-25 15:15:05 +08:00
samuele3hu 3a0e750926 Add deprecated support for lua binding of `getSize` and `setSize` of Widget 2014-06-25 15:13:08 +08:00
samuele3hu 5c765f6883 Add coco studio ui focus test cases for Lua 2014-06-25 15:08:59 +08:00
minggo 986f77a827 Merge pull request #7156 from samuele3hu/v3_keypad_fix 
Update controller.lua for CocosIDE’s need
 2014-06-25 14:40:08 +08:00
zhangcheng bdf7be6fa0 1. add classname = "" log. 2014-06-25 14:32:38 +08:00
minggo 5f569cb423 Merge pull request #7193 from samuele3hu/v3_ui_binary 
Add UI Editor test cases for Lua
 2014-06-25 14:30:34 +08:00
minggo 7eb6ed75b8 Merge pull request #7197 from andyque/dimissListViewFocus 
dimiss ListView focus tests
 2014-06-25 14:11:36 +08:00
andyque 634f1b58c4 add todo to reminder me 2014-06-25 14:10:53 +08:00
andyque 1902fdc9f4 dimiss ListView focus tests 2014-06-25 14:04:32 +08:00
andyque 6df8079fd7 closed #5591, fix UIButton setTitleColor & getTitleColor not match 2014-06-25 13:47:29 +08:00
lvlong 7331ef49b6 don't rotate girl model 2014-06-25 13:29:45 +08:00
lvlong 8cc4520deb add boss.c3b 2014-06-25 13:22:04 +08:00
lvlong 658a955e36 modify skindata binary reading 2014-06-25 13:20:42 +08:00
zhangcheng 644b61e261 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
Huabing.Xu 290897af14 Merge branch 'v3' into fast_tmx 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-25 10:10:08 +08:00
samuele3hu 617e2bc592 Add a newline 2014-06-25 09:36:34 +08:00
samuele3hu ea99c08d0e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary 2014-06-25 09:31:57 +08:00
samuele3hu 300821e61f Add UI Editor test case for Lua 2014-06-25 09:29:06 +08:00
minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 
replace size with contentSize
 2014-06-24 18:43:33 +08:00
lvlong dc0101737c test for tony 2014-06-24 14:43:20 +08:00
lvlong 431378a41e commit for tony test 2014-06-24 14:10:03 +08:00
samuele3hu 03a4e014e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-24 11:04:38 +08:00
minggo 4bb6545250 Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics 
closed #5541: Add rotation action support for physics.
 2014-06-24 10:46:10 +08:00
minggo 66763bd400 Merge pull request #7180 from MSOpenTech/wp8-v3 
WP8 v3 broken build fix
 2014-06-24 10:31:56 +08:00
andyque 199ad9c623 issue #5161, replace deprecated methods 2014-06-24 10:18:01 +08:00
samuele3hu e34fcf05f6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-24 10:14:53 +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 87a6b83001 added missing files for wp8 2014-06-23 08:35:39 -07:00
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
andyque 7eae7625c1 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 18:30:03 +08:00
samuele3hu a339afb2c0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-23 17:53:41 +08:00
samuele3hu 9126608138 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix 2014-06-23 17:30:24 +08:00
samuele3hu dce4c8a0a8 Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases 2014-06-23 17:29:56 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
andyque e72d89ba2f fix windows tests compile error 2014-06-23 15:21:25 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
andyque c9bcbfb265 fix addEventListener hidden problem 2014-06-23 12:09:49 +08:00
samuele3hu 02e0bad3f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-23 10:28:05 +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
lvlong dfd68f128a c3b file 2014-06-23 09:03:53 +08:00
lite3 ebbcb3ea33 change immediateSend to sendImmediate 2014-06-22 11:39:39 +08:00
lite3 7c65968b56 add immediateSend test 2014-06-22 00:11:20 +08:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
yangxiao 2a6dfaf91b Merge branch 'newcode' into v3 2014-06-20 22:55:27 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00
boyu0 2fa266e917 closed #5541: change PhysicsActionTest for rotate action. 2014-06-20 18:42:36 +08:00
lvlong 478ea8949a Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	tools/cocos2d-console
 2014-06-20 16:14:46 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
 2014-06-20 16:02:22 +08:00
lvlong e4bbfad773 1. binary loader is OK. 
2. add some comment.
 2014-06-20 15:30:08 +08: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
andyque 4ca184b58a issue #5161, deprecated getSize 2014-06-20 11:18:53 +08:00
samuele3hu d9848a62d2 Update controller.lua for CocosIDE’s need 2014-06-20 11:09:26 +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 9f0a566b8a Merge pull request #6945 from John-He-928/mingw-build 
Fix MinGW build
 2014-06-19 22:08:28 +08:00
minggo af88cf053b Merge pull request #7022 from samuele3hu/v3_fix 
Add bytecode and encrypted files test cases for Lua
 2014-06-19 21:20:05 +08:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3 
add TimelineAction
 2014-06-19 21:05:15 +08:00
minggo 7553060ba7 Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp 
[ci skip]Add new line at the end of a file to *.[cpp|h]
 2014-06-19 20:47:17 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
gin0606 2c837b0960 add new line at the end of a file to *.mk 2014-06-19 20:43:27 +09:00
boyu0 5f10ff2c29 issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2 2014-06-19 15:57:13 +08:00
lvlong 8493c4579b before switch branch save 2014-06-19 15:43:02 +08:00
samuele3hu 3a350e11ae Add Lua binding for Animation3D and Animate3D ,and add related test case 2014-06-19 14:05:38 +08:00
minggo e60e3c217d Merge pull request #7046 from Dhilan007/v3-label-improve 
1.Support setting up the line height and additional kerning of label.
 2014-06-19 09:44:51 +08:00
geron-cn 797085574c add binary read to test-cpp 2014-06-18 20:13:06 +08:00
geron-cn 6abc9aba0e add binary read to test-cpp 2014-06-18 20:09:12 +08:00
geron-cn d2746f64a6 cpp-tests 2014-06-18 18:11:21 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +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
andyque f614e9a89b fix tests 2014-06-18 15:06:45 +08:00
andyque 95f1bd7e72 update loader 2014-06-18 11:54:25 +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
minggo 246d6f12c9 Merge pull request #7047 from samuele3hu/v3_keypad_fix 
Resolve the compile warning for Lua bindings project
 2014-06-18 11:29:54 +08:00
andyque 2cef0cb437 update ccs-res 2014-06-18 11:26:26 +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 df798baa8b Merge pull request #7059 from Rumist/v3 
BUG FIX : #5553
 2014-06-18 11:18:33 +08:00
Huabing.Xu 2c8c9dea01 use a small texture for sprite3D 2014-06-17 22:31:56 +08:00
minggo 26cca348cb Merge pull request #7085 from super626/v3 
Sprite3D animation
 2014-06-17 21:05:58 +08:00
2youyou2 806d74b6f9 add change play section test 2014-06-17 15:57:30 +08:00
yangxiao 17854cd922 change speed 2014-06-17 13:45:58 +08:00
2youyou2 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
minggo 53963a2441 issue #4693:enumerateChildren() support regular expression 2014-06-17 11:43:03 +08:00
2youyou2 7ee90b4114 add performance test 2014-06-17 11:13:46 +08:00
andyque 9ab45744bb Merge branch 'v3' into cleanupBinaryLoader 2014-06-17 09:45:16 +08:00
Dale Stammen 753167b5f2 updated xaml resources 2014-06-16 09:25:35 -07:00
yangxiao 9acd373a0e make girl up 2014-06-16 19:41:10 +08:00
lvlong 32cc5b12d6 ready 2014-06-16 19:30:45 +08:00
lvlong 4b7f6a6185 static Sprite3D is ok 2014-06-16 19:08:43 +08:00
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00
lvlong 920b358764 new girl.c3t 2014-06-16 16:23:24 +08:00
lvlong 2282c98f2e do some test 2014-06-16 15:38:03 +08:00
lvlong 2840409933 for tony test 2014-06-16 14:09:41 +08:00
2youyou2 fda54a21f1 change test title 2014-06-16 09:45:44 +08:00
2youyou2 414aab8553 update CMakeLists.txt 2014-06-16 09:40:27 +08:00
lvlong 0fa4e921f0 delete girl - 副本.c3t 2014-06-16 09:25:12 +08:00
yangxiao 79d2de3b67 make character up 2014-06-16 00:31:31 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
andyque 1d01fe8bbc refactor 2014-06-15 16:12:24 +08:00
2youyou2 71f74f0825 fixed android compile failed 2014-06-15 13:10:44 +08:00
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
2youyou2 369ed3e6d3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-13 18:00:01 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00
2youyou2 1c5d9ba212 remove resource to use armature resource 2014-06-13 14:41:28 +08:00
samuele3hu 9b3b6c0e53 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-13 14:39:11 +08:00
elsanide 4b7b32e81e BUG FIX : #5553 
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
 2014-06-13 15:24:37 +09:00