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

665 Commits

Author SHA1 Message Date
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
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
Huabing.Xu 4e94eaabed Merge branch 'v3' into v3Animation 2014-06-13 12:06:11 +08:00
boyu0 ee919b673f issue #4437: config for android and linux. 2014-06-13 11:07:21 +08:00
lvlong 3af0bdfef6 texture 2014-06-13 09:18:25 +08:00
Dale Stammen 2d913470a0 updated fast resume code for app 2014-06-12 16:36:53 -07:00
2youyou2 b36741865c add hd resource 2014-06-12 19:38:08 +08:00
2youyou2 f63939945d change NodeCache to NodeReader 2014-06-12 19:34:22 +08:00
lvlong 14f4b6430f modify 3dloader, you can run animation. 2014-06-12 18:26:42 +08:00
2youyou2 e4f1ac6126 add hd resource 2014-06-12 17:38:26 +08:00
2youyou2 7eda0ae999 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-12 16:43:04 +08:00
lvlong 1ca69d2689 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2014-06-12 16:28:36 +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
boyu0 acb87f414e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx 2014-06-12 14:44:28 +08:00
yangxiao e37c6ab7ee test action sequence 2014-06-12 14:20:38 +08:00
minggo 6845a69655 issue #4693: remove unneede codes 2014-06-12 14:00:41 +08:00
minggo 990c491746 issue #4693: add test case for getName, setName, getChildByName and enumerateChildren 2014-06-12 13:55:23 +08:00
vision dc4cdc9c0f remove the comments 2014-06-12 10:19:08 +08:00
vision 97b578185d new parameter for setting blur shader effect 2014-06-12 09:49:48 +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
Huabing.Xu 65acec013b Merge branch 'v3' into v3Animation 2014-06-11 17:45:31 +08:00
andyque 5515c43bb2 improve lasers 2014-06-11 15:16:08 +08:00
Huabing.Xu 18663609b4 add interface for speed and playback in animate 2014-06-11 15:07:37 +08:00
vision e2c75c1f11 New shader for the blur effect, the old one is ineffecient and difficult to maintain. 2014-06-11 14:54:14 +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
samuele3hu 54379f48a9 Fix the crash of Texture2dTest when `—ndk-mode` is `release` 2014-06-11 11:24:17 +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
yangxiao 6d09b50699 animation bug 2014-06-10 19:53:06 +08:00
andyque 48f7743daa Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-10 15:08:10 +08:00
yangxiao a991940268 debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
minggo 29ac8d746d Merge pull request #7012 from Dhilan007/v3-testcast 
update test cast of label.
 2014-06-09 16:32:32 +08:00
andyque c387ae3bc7 add text effect test 2014-06-09 14:34:46 +08:00
Dhilan007 791737befa update test cast of label. 2014-06-09 13:41:32 +08:00
vision 361bfad5f8 initilization missed. 2014-06-09 11:39:19 +08:00
vision ae16c88538 Save the bound texture unit so that the sampler can be updated dynamiclly. 2014-06-09 10:58:28 +08:00
yangxiao 0c95fe1fbd animation test 2014-06-06 19:12:08 +08:00
boyu0 fc5e58b521 issue #4437: add dirty tag. 2014-06-06 18:03:44 +08:00
boyu0 560053d23c issue #4437: add test and fix transform. 2014-06-06 17:33:27 +08:00
minggo 6cee3fe830 Merge pull request #6979 from visiblelight/TextureOptimize 
Texture Optimize
 2014-06-06 11:38:49 +08:00
vision 39f2669886 remove the new images and use the old ones. 2014-06-06 10:37:45 +08:00
vision f7d5d837bf add new tests for different pixel formats 2014-06-05 16:33:42 +08:00
andyque c96a6086c3 improve parsing code 2014-06-05 11:43:43 +08:00
andyque 3dc6e86c25 add binary file parsing into ui tests 2014-06-05 10:25:45 +08:00
Ricardo Quesada a11740ff29 ouch, more windows compile issues 2014-06-04 10:11:16 -07:00
Ricardo Quesada 59b966731e Compiles on Windows and Android 2014-06-04 09:48:35 -07: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
minggo 7a4d46dc1b Merge pull request #6965 from Dhilan007/v3-wp8fix 
Support Fast App Resume and fixed black screen may arise when using third sdk.
 2014-06-04 17:15:13 +08:00
minggo a495747a7c Merge pull request #6971 from andyque/refactorUIFramework 
refactor ObjectFactory
 2014-06-04 17:08:27 +08:00
minggo a31710973c Merge pull request #6962 from visiblelight/AlphaIssues 
Fix a crash in ParticleTest->PremultipliedAlphaTest
 2014-06-04 15:10:54 +08:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +08:00
minggo 7bf2be6033 Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager 
Bugfix autorelease pool manager
 2014-06-04 14:31:30 +08:00
minggo 5432698674 Merge pull request #6969 from boyu0/bug5482_setPhysicsBody 
closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.
 2014-06-04 13:52:43 +08:00
boyu0 368c5b0d3b closed #5482: add a test case for bug 5482. 2014-06-04 11:59:15 +08:00
Dhilan007 52ad2063bd Support Fast App Resume. 2014-06-04 11:19:53 +08:00
vision ad230bb412 fix a crash in ParticleTest->PremultipliedAlphaTest 2014-06-04 10:39:18 +08:00
Kezhu Wang dbca937835 add test case to break buggy code 2014-06-03 17:58:09 +08:00
minggo 691a77b148 Merge pull request #6928 from boyu0/bug5392_scheduleUpdate 
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
 2014-06-03 14:38:07 +08:00
Ricardo Quesada b24c674d25 Little fixes for setNormalized 2014-05-30 21:50:39 -07: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
John_He 5e82d9db4d set libws2_32 as standard library for mingw. 2014-05-30 20:14:22 +08:00
Huabing.Xu 2e42c77b9a fix typo 2014-05-30 11:13:53 +08:00
Huabing.Xu 95b6fb52de only use _backToForeGroundListner when on Android 2014-05-30 10:56:03 +08:00
Huabing.Xu 41d19007eb Merge branch 'v3.1hotfix' into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
 2014-05-30 10:19:56 +08:00
Dhilan007 0739f40726 fix faults of load project on Win 32. 2014-05-29 17:30:55 +08:00
minggo b68525ac1f Merge pull request #6916 from John-He-928/mingw-build 
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
 2014-05-29 15:17:07 +08:00
minggo bfb3567131 Merge pull request #6924 from minggo/remove-test-case 
Remove test case
 2014-05-29 14:54:28 +08:00
minggo e48b14b55d Merge pull request #6932 from Dhilan007/v3-labelfix 
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
 2014-05-29 14:54:16 +08:00
minggo 3182fd56b8 Merge pull request #6931 from VisualSJ/v3 
Test case action name error
 2014-05-29 14:07:23 +08:00
VisualSJ dd2b7e036a Test case action name error 2014-05-29 14:00:43 +08:00
Dhilan007 2a6158bae1 Create a test case for issue 4999(label is unsharp if it's created by smaller font). 2014-05-29 14:00:38 +08:00
boyu0 91db87a2f6 closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test. 2014-05-29 13:51:43 +08:00
Huabing.Xu 8633ab9c14 add background/foreground listener for EffectSprite/Effect framework test case 2014-05-29 12:43:04 +08:00
John_He 44950a57f1 fix mingw32/mingw64 build: use system libs and includes rather than prebuilt ones. 2014-05-29 01:30:14 +08:00
Huabing.Xu ad3b1cf827 add background/foreground listener for Effectsprite3d/Effect3d test case 2014-05-28 21:07:12 +08:00
minggo d7cca2a044 closed #4819: remove KeyboardTest 2014-05-28 18:31:00 +08:00
minggo 0acc4cd961 issue #4819: remove KeyPadTest 2014-05-28 18:17:22 +08:00
minggo 0ad0f9c405 issue #4819: remove AccelerometerTest 2014-05-28 18:10:37 +08:00
minggo c44a5a2b3e Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork 
V3 refactor effect3 d frame work
 2014-05-27 20:53:40 +08:00
minggo 99290b83c7 Merge pull request #6871 from asuuma/v3_Repeat_fix 
Fix Repeat will run one more over in rare situations
 2014-05-27 16:22:42 +08:00
Huabing.Xu e59813476a clclosed #5369: Fix wrong logic when setTarget to Effect3D 2014-05-27 15:08:38 +08:00
minggo 0b661d8192 Merge pull request #6907 from visiblelight/screenshot_refactor 
adding comments for the new utility
 2014-05-27 14:52:09 +08:00
Huabing.Xu 453ff81d2a closed #5369: refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite 2014-05-27 14:50:46 +08:00
Ishiguro Yusuke b8f9b1f20b Add test case for reproducing Repeat bug 2014-05-27 15:40:38 +09:00
vision e81db73b0a adding comments for the new utility. 2014-05-27 14:29:52 +08:00
minggo 034e2c6f75 Merge pull request #6809 from heliclei/autotest-stop 
Support autotest stop command
 2014-05-27 14:01:38 +08:00
minggo a01315e2f5 Merge pull request #6726 from visiblelight/screenshot 
Add a new utility function to snap the screen
 2014-05-27 11:18:25 +08:00
vision 363fd8dc2a move the capturen screen interface from Director to ccUtils 2014-05-27 10:44:23 +08:00
minggo f7450730fb Merge pull request #6901 from andyque/fixDpadNavigation 
issue #5176, refactor FocusNavigationController
 2014-05-27 10:40:00 +08:00
andyque 9cef55d62c issue #5176, refactor FocusNavigationController 2014-05-27 10:20:37 +08:00
minggo 866a1cb9aa Merge pull request #6820 from newnon/v3_android_improvements 
Android project improvements
 2014-05-27 10:17:03 +08:00
andyque d8d5139aaf closed #5176, refactor UILayout and focus 2014-05-26 23:04:44 +08:00
vision c72ae9e3c5 merge from the latest v3 2014-05-26 20:18:11 +08:00
vision 20bae53f4a fixing typos 2014-05-26 16:32:13 +08:00
vision 28d30a5c40 fix a typo 2014-05-26 16:24:57 +08:00
andyque 40f2128acd Merge branch 'v3' into 5176 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/UIPageView.cpp
	cocos/ui/UIScrollView.cpp
	cocos/ui/UIScrollView.h
 2014-05-26 14:00:23 +08:00
vision 7edfe78f7d remove the parameter rect 2014-05-26 13:42:47 +08:00
minggo 75cb686573 Merge pull request #6894 from andyque/refactor5183 
refactor Layout, LayoutParameter and LayoutExecutant
 2014-05-26 00:41:04 -05:00
minggo f29654ff6c Merge pull request #6890 from visiblelight/FixTextureCache 
Fix the crash in TextureAsync test
 2014-05-25 20:55:13 -05:00
andyque 634fea7c45 Merge remote-tracking branch 'upstream/v3' into refactor5183 2014-05-26 09:18:32 +08:00
boyu0 80e184312a Roll back test_image_ar.pvr 2014-05-23 17:19:39 +08:00
vision 910099fbe5 add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks. 2014-05-23 17:08:22 +08:00
Ricardo Quesada 5601048829 Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03:00
andyque 1165ba8bc3 issue #5176, readd addChild methods into UIListView 2014-05-22 17:49:19 +08:00
heliclei 5e4f481ae5 capture this instead of reference in lambda 2014-05-22 14:52:19 +08:00
andyque 3b777646c4 issue #5176. fix UIScrollView 2014-05-22 11:01:58 +08:00
andyque 57d5e6f2d5 issue #5176, add ListView focus test 2014-05-22 11:01:58 +08:00
Sergey 4da8ad502f tests release/debug build 2014-05-21 21:13:44 +04:00
andyque fa5d43741c fix keypad test 2014-05-21 10:46:26 +08:00
andyque b07e82f7c3 Revert "Revert "Merge pull request #6752 from andyque/refactorLayout"" 
This reverts commit 1ed9b9749e.
 2014-05-20 16:17:10 +08:00
minggo 9a276c66a0 Merge pull request #6740 from zifter/FixProgressTo 
Fix Progress Action. Not working with charging from 100 to 0.
 2014-05-20 15:36:10 +08:00
andyque 1ed9b9749e Revert "Merge pull request #6752 from andyque/refactorLayout" 
This reverts commit ae118a9d22, reversing
changes made to 6f2f2046c7.
 2014-05-20 14:36:29 +08:00
andyque b6373b5303 Merge branch 'v3' into refactorLayout 2014-05-20 09:30:23 +08:00
minggo cffd53ea94 accelerometer fix 2014-05-19 17:44:28 +08:00
andyque ee24e137f7 issue #5183, refactor obscure functions 2014-05-19 17:18:04 +08:00
andyque 121d6d3109 issue #5183, refactor 2014-05-19 16:51:25 +08:00
heliclei 2ddfc45fee support autotest stop 2014-05-19 13:46:17 +08:00