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

2203 Commits

Author SHA1 Message Date
zhangbin 7e7c3a1e55 Merge branch 'v3' into android-dependencies 2014-07-16 13:49:20 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
andyque 714048059c fix loading bar switch loading method issue 2014-07-15 17:03:35 +08:00
samuele3hu 19cc5b9c4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 13:34:46 +08:00
samuele3hu 15a7ab8450 Update the TextureAsyncTest 2014-07-15 13:33:36 +08:00
andyque 52596dc97f fix Text line wrap issue 2014-07-15 11:46:53 +08:00
samuele3hu 55e77d8fd2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 11:34:57 +08:00
samuele3hu 3ab7520667 Delete SceneEditorTest from ExtensionTest and add related binary loading to CocoStudioSceneTest 2014-07-15 11:34:24 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
samuele3hu b3bfa87f51 Fix the TMXOrthoFlipRunTimeTest bugs. 2014-07-14 18:30:59 +08:00
samuele3hu f1ed090f4f Fix the OpenGLTest display bugs. 2014-07-14 18:30:02 +08:00
minggo 6d063fb97b Merge pull request #7431 from andyque/addTextFieldTTFTest 
add TextField TrueTypeFont tests
 2014-07-14 16:31:36 +08:00
minggo 7f68bdf179 Merge pull request #7434 from samuele3hu/v3_hot_fix 
Fix the crash that CocoStudioGuiTest in the Linux platform and error display than Sprite3DTest
 2014-07-14 16:26:42 +08:00
samuele3hu 4cb6c1c74f Add lua bindings for TextureCache::addImageAsync and update the related test cases 2014-07-14 16:05:48 +08:00
Dhilan007 a5317dde87 fixed using the incorrect res in test case of 'TextureMemoryAlloc'. 2014-07-14 15:50:20 +08:00
samuele3hu 5f453d0105 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-14 15:32:03 +08:00
samuele3hu ace0d05bd4 Fix the crash that CocoStudioGuiTest in the Linux platform and errors than Sprite3DTest 2014-07-14 15:28:52 +08:00
andyque 4fe3723edf add TextField TrueTypeFont tests 2014-07-14 14:29:28 +08:00
Dhilan007 8949d90212 update test case of new label[lua]. 2014-07-14 13:48:28 +08:00
zhangbin b0c465d96b Adjust the dependencies between modules on android. 2014-07-14 09:48:16 +08:00
minggo 3b59b41116 3D:Sprite3D -> Node:Sprite3D 2014-07-12 22:26:46 +08:00
minggo 05b485cd41 Merge pull request #7407 from visiblelight/fix_wp8_errors 
Fix compile errors on WP8
 2014-07-11 18:51:23 +08:00
samuele3hu 9c7999d1c2 Fix the tests-lua crash on windows platform 2014-07-11 18:13:08 +08:00
samuele3hu 3c8dc7a596 Update the cocos2d.ini config 2014-07-11 17:21:55 +08:00
samuele3hu 01c3f2a4ed Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
 2014-07-11 16:44:59 +08:00
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
samuele3hu 82070e5205 Remove glView setting form cpp to lua script 2014-07-11 15:34:56 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
andyque 74772e97c9 fix linux compile error 2014-07-11 14:17:57 +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
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 72f8ab8483 Merge pull request #7395 from samuele3hu/v3_controller 
Add Lua bindings for controller and related test case project
 2014-07-11 13:39:30 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
minggo 7cf8cf42d3 Merge pull request #7389 from Dhilan007/v3-gc-nibiru 
Update Nibiru SDK and remove prompt box of install driver .
 2014-07-11 13:36:19 +08:00
samuele3hu 2cbe262842 Add newline for some files 2014-07-11 12:00:43 +08:00
samuele3hu dd76ae93f6 Update controller lua binding and related test cases 2014-07-11 11:52:05 +08:00
Dhilan007 900d4b36fc Enabled nibiru\moga\ouya controller support. 2014-07-11 09:57:26 +08:00
samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/scripting/lua-bindings/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
	tools/tolua/genbindings.py
 2014-07-10 22:42:09 +08:00
minggo e876065d3e Merge pull request #7229 from samuele3hu/v3_VideoPlayer 
Add VideoPlayer Lua bindings and update bindings-generator submodule
 2014-07-10 22:04:46 +08:00
minggo 4895e6d54a Merge pull request #7362 from geron-cn/chukongv3 
Chukongv3
 2014-07-10 21:17:19 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
andyque eec40ff2a8 fix linux and android compile 2014-07-10 16:37:15 +08:00
andyque 6de47ea53a update ccs-res and add custom ImageView and custom particle widget support 2014-07-10 16:37:15 +08:00
andyque afe5e7527a update cocostudio resource path 2014-07-10 16:37:15 +08:00
andyque 8b42eb4ce9 add Cocostudio 1.3,1.4, 1.5 ui tests 2014-07-10 16:37:15 +08:00
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
andyque 937b0ab52a add cocostudio parser test template 2014-07-10 16:37:15 +08:00
minggo 831b0b332b Merge pull request #7371 from minggo/enumerateChildren-fix 
Node::enumerateChildren  just searches from itself
 2014-07-10 15:46:04 +08:00
minggo c7856b21fd Merge pull request #7366 from Dhilan007/v3-fixed-warn 
fixed warn and replace NULL with nullptr.
 2014-07-10 15:42:02 +08:00
gero 01e1508239 Merge pull request #3 from cocos2d/v3 
merge V3
 2014-07-10 11:33:59 +08:00
geron-cn 5b7852c5f6 update ccs-res hd csbs 2014-07-10 11:17:01 +08:00
minggo 316564d58a Node::enumerateChildren just searches from itself 2014-07-10 11:07:39 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 
Make clear EVENT_COME_TO_FOREGROUND event.
 2014-07-09 23:03:04 +08:00
samuele3hu 2bc1cd0486 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
 2014-07-09 22:31:05 +08:00
geron-cn 2a64bd8945 udpate ccs-res 2014-07-09 18:35:10 +08:00
samuele3hu 243fa49c09 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-09 18:08:09 +08:00
samuele3hu 3546c131dd Add Lua bindings for controller and related test case project 2014-07-09 18:05:02 +08:00
geron-cn cd84081c37 udpate ccs-res 2014-07-09 18:02:17 +08:00
yangxiao 7b35f36ba3 Merge branch 'newcode' into v3 2014-07-09 09:56:23 +08:00
yangxiao 90b6841e25 adjust api according feedback 2014-07-09 09:53:15 +08:00
pandamicro 85d29ec803 Refactor #5580: Refactor Hungary style code in test case 2014-07-09 09:52:21 +08:00
minggo 0f7968de89 Merge pull request #7339 from super626/v3 
fix android, add 3d files to cocos2d.h and remove unused resources
 2014-07-08 22:09:50 +08:00
minggo f7af8938bd Merge pull request #7277 from darkdukey/fix_rotation3D 
Fix setRotation3D
 2014-07-08 22:05:27 +08:00
samuele3hu bf3e0cb132 Update ini configure and bindings-generator submodule 2014-07-08 15:17:46 +08:00
samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/bindings-generator
	tools/tolua/cocos2dx_physics.ini
 2014-07-08 14:57:19 +08:00
andyque 2a2184331e fix opacity issue when replace Widget textures 2014-07-08 11:30:27 +08:00
yangxiao b19ca902ce Merge branch 'newcode' into v3 2014-07-08 11:19:26 +08:00
yangxiao 75ee088631 resolve conflict Bone in cocos2d and cocostudio 2014-07-08 11:03:29 +08:00
minggo 3344ebbcdd Merge pull request #7267 from andyque/addBinaryFileTests 
add tests to GUI
 2014-07-08 09:51:17 +08:00
XiaoYang b0f5ce36ff Merge pull request #48 from lvlonggame/v3 
delete the cube model file and modify 3DBundle
 2014-07-07 21:51:10 +08:00
minggo e1b29a8ef6 Merge pull request #7329 from Dhilan007/v3-gc-refactor 
issue #4689:Fixed lose disconnected event and incorrect device name/id.
 2014-07-07 18:45:23 +08:00
Dhilan007 9cf01c0e47 update test case 2014-07-07 17:57:08 +08:00
Dhilan007 d1034fdaae 1.fixed lose disconnected event. 
2.fixed incorrect device name and device id;
 2014-07-07 17:47:07 +08:00
lvlong 70b9d9b9ac delete cube_anim 2014-07-07 17:11:37 +08:00
minggo cd77690032 Merge pull request #7326 from Dhilan007/v3-gc-refactor 
issue #4689: support external key.
 2014-07-07 17:04:27 +08:00
andyque 9a77ea9d57 add nested layout 2014-07-07 15:48:50 +08:00
andyque 6f33e4b84f add UIPageView button tests 2014-07-07 15:31:06 +08:00
Dhilan007 68bd717ea7 issue #4689: support external key. 2014-07-07 12:06:24 +08:00
minggo 982d7441a0 Merge pull request #7310 from boyu0/lua_SceneEditorTest 
Add SceneEditorTest for lua
 2014-07-06 16:01:49 +08:00
minggo 9db0f36c33 Merge pull request #7313 from Dhilan007/v3-gc-refactor 
issue #4689: Refactoring game controller API.
 2014-07-05 01:05:48 +08:00
LinWenhai 2ca5c01902 issue #4689: Refactoring game controller API[ios] 2014-07-04 21:24:32 +08:00
LinWenhai 27bc3dc640 Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor 2014-07-04 17:56:22 +08:00
Dhilan007 c73a88c4a5 Add resources 2014-07-04 17:55:20 +08:00
samuele3hu b68ee428b0 Remove useless codes 2014-07-04 17:15:34 +08:00
samuele3hu d9ffa33601 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D 2014-07-04 16:25:53 +08:00
samuele3hu 85dd2e55bf Add Lua bindings for utils and CaptureScreen test case 2014-07-04 16:24:00 +08:00
LinWenhai 992245e744 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor 2014-07-04 15:29:40 +08:00
Dhilan007 552a9251c4 issue #4689: Refactor controller API. 2014-07-04 15:22:53 +08:00
minggo 8b00e72f33 Merge pull request #7311 from andyque/fixWindowsError 
fix windows compile and running error
 2014-07-04 13:44:55 +08:00
andyque fc3caa1845 initialize member variable 2014-07-04 11:48:55 +08:00
boyu0 dc81b07998 add new line at the end of the file 2014-07-04 10:27:24 +08:00
boyu0 fc994d5ec0 add SceneEditorTest for lua 2014-07-04 10:08:17 +08:00
minggo 95fe74a34b Merge pull request #7299 from dabingnn/fast_tmx 
Fast tmx
 2014-07-04 09:49:30 +08:00
heliclei 3e75a10362 merge upstream/v3 2014-07-03 16:15:01 +08:00
heliclei 1f768f80aa update curl test url 2014-07-03 16:08:34 +08:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression 
Support regular expression
 2014-07-03 15:20:06 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse 
V3 op binary parse
 2014-07-03 14:00:01 +08:00
Huabing.Xu f3863eb072 add hex tile map test back 2014-07-03 11:31:30 +08:00
minggo d8c9f6a0a6 add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
samuele3hu ff79be2d3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D 2014-07-02 17:01:14 +08:00
samuele3hu 320dc4737b Update Sprite3D test cases for Lua 2014-07-02 17:00:31 +08:00
zhangcheng 1551854c30 revert submodule res-ccs 2014-07-02 17:00:30 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
Dhilan007 e1bb1158bc update test case. 2014-07-02 15:25:18 +08:00
samuele3hu 1271c1b62e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-02 14:29:33 +08:00
samuele3hu 2aee9ed35d Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases 2014-07-02 14:26:56 +08:00
Dhilan007 c5dc7b9cd0 fixed can't get valid value from trigger button. 2014-07-02 14:19:10 +08:00
Huabing.Xu 187646ef3f Merge branch 'v3' into fast_tmx 2014-07-02 11:38:19 +08:00
Dhilan007 bcf2b0e2b6 fixed no response in test case of curl. 2014-07-02 10:18:07 +08:00
andyque 3304bba017 add switch method to all the GUI tests 2014-07-02 10:00:34 +08:00
andyque 21b11cc3c6 add switch method to LoadingBar, ListView , pageView and scrollView 2014-07-02 10:00:34 +08:00
andyque f492643755 add switch method to UILayout and UIIamgeView 2014-07-02 10:00:34 +08:00
andyque 7fdc37a70e add switch method to checkBoxTest 2014-07-02 10:00:34 +08:00
andyque 3326941939 add switch loading method to buttonTest 2014-07-02 10:00:34 +08:00
andyque c3a5692e84 add test frame to UIScene_Editor 2014-07-02 10:00:33 +08:00
Nite Luo 4cb59683e4 Add Sprite3DRotation test 2014-07-01 12:36:53 -07:00
minggo ca7e95b342 Merge pull request #7274 from Dhilan007/v3-320beta 
fixed crash cause by addChild on win 7.
 2014-07-01 22:15:26 +08:00
Dhilan007 6294a3024f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter 2014-07-01 19:10:15 +08:00
Dhilan007 6ba111cbff fixed crash cause by addChild on win 7. 2014-07-01 18:23:20 +08:00
Dhilan007 318962c40a update test case. 2014-07-01 16:46:11 +08:00
Dhilan007 0fbcbec9de Add missing file for game controller support. 
Fix using incorrect library project.
 2014-07-01 16:44:10 +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
minggo cc3a9d0737 fix crash caused by std::regex() 2014-07-01 16:09:25 +08:00
minggo 39650e12c4 Merge pull request #7266 from dabingnn/v3_fix 
V3 fix
 2014-07-01 15:52:50 +08:00
minggo daa5e257df Merge pull request #7259 from Dhilan007/v3-gc0627 
issue #4895:split controller adapter[android]
 2014-07-01 15:51:21 +08:00
Huabing.Xu e1d97ecb59 Merge branch 'v3' into v3_fix 2014-07-01 14:54:28 +08:00
Huabing.Xu 75c7777999 fix Effect3dSprite memory leak 2014-07-01 14:48:46 +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
samuele3hu 1bc0397644 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-01 09:47:41 +08:00
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