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

651 Commits

Author SHA1 Message Date
minggo 048d6c09d3 Merge pull request #6701 from heliclei/autotest-autorun 
support auto start cpp-tests
 2014-05-14 18:16:58 +08:00
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
vision dfb016dde3 move the utility from Renderer to UtilsHelper 2014-05-14 16:25:47 +08:00
vision 6213747c41 fix the compile failure on win32. 2014-05-14 19:37:04 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
andyque e6a36fde18 issue #5110, refactor VideoPlayer 2014-05-14 11:18:11 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
vision e7df247d65 replace more tabs with spaces to uniform the code styles. 2014-05-14 10:40:56 +08:00
vision 021be6ef9b Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-14 09:22:36 +08:00
Ricardo Quesada 723938e292 Adds effectNode in ShaderTest2 2014-05-13 18:12:58 -07:00
Ricardo Quesada 0171e27747 Merge pull request #6714 from Dhilan007/v3_nodefix 
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
 2014-05-13 14:14:27 -07:00
Ricardo Quesada 6462a1bf79 Adds simple sample for multitexturing 2014-05-13 12:55:34 -07:00
visiblelight 541d03d668 Now it shoudl run fine on iOS 2014-05-14 01:06:26 +08:00
Dhilan007 ed0ae9d5b3 fix compiling fail on Linux. 2014-05-13 18:51:02 +08:00
minggo 05c16de87a Merge pull request #6715 from dumganhar/iss5160-animation-notification 
closed #5160: Dispatch a custom event after an animation frame is displayed
 2014-05-13 18:38:44 +08:00
visiblelight fe91f46882 The target filename shuld use a writable path. 2014-05-13 18:34:35 +08:00
James Chen 24524cb5be issue #5160: Updates actiontest 2014-05-13 17:30:48 +08:00
heliclei 35b19a239a exit gracefully after running all tests 2014-05-13 17:20:12 +08:00
visiblelight 5459b581b0 replace tab with spaces; remove the 'flipped' parameter; 2014-05-13 17:17:15 +08:00
James Chen 0dd22af688 closed #5160: Updates ActionTest 2014-05-13 17:08:52 +08:00
Dhilan007 fbfbcaffc8 update project 2014-05-13 16:43:19 +08:00
visiblelight 47e4ee4ff2 add a new utility function to capture the screen 2014-05-13 16:23:35 +08:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
heliclei 17cd12f8b1 fix win32 compile 2014-05-13 14:43:11 +08:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
heliclei 13f3c9705a Merge remote-tracking branch 'upstream/v3' into autotest-autorun 2014-05-13 14:24:00 +08:00
heliclei 8cc224dcef change default auto-run config to false 2014-05-13 14:17:43 +08:00
heliclei 45d8547622 add config item 2014-05-13 14:16:06 +08:00
heliclei eaa879a9f3 fix for winrt build 2014-05-13 14:08:49 +08:00
Nite Luo 0b7b9f6131 Merge branch 'v3' into reparentChildren 2014-05-12 22:52:19 -07:00
Nite Luo e1f82c174b add TestCase for reparentChildren bug 2014-05-12 22:50:31 -07:00
heliclei 471f218acf add config item to control whether start autorun 2014-05-13 11:47:32 +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
heliclei 98f1c6768c Merge remote-tracking branch 'upstream/v3' into autotest-autorun 2014-05-13 07:53:49 +08:00
heliclei 1aabedb316 support auto start tests 2014-05-12 21:47:55 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
andyque 9d7d06a1f8 issue #5047, refactor UIVideoPlayer 2014-05-12 11:35:57 +08:00
andyque 4f3c128c4f issue #5057, refator UITextField 2014-05-12 11:29:22 +08:00
andyque eeaf48d3e5 issue #5047, refactor UISlider 2014-05-12 11:17:06 +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
James Chen 4d275f91d0 issue #4660: Updates utf unit test, use c memcmp and run 10000 times 2014-05-11 11:24:32 +08:00
James Chen 945ad2eb04 issue #4660: Adds utf8/16 conversion unit test 2014-05-10 21:52:19 +08:00
Ricardo Quesada 006fe7eb94 Merge pull request #6667 from super626/improved_glprogram 
remove unused shadertest
 2014-05-09 21:42:01 -07:00
Ricardo Quesada 4d579892b1 Merge pull request #6668 from dabingnn/v3_fix_accident_changes 
V3 fix accident changes
 2014-05-09 21:38:09 -07:00
Huabing.Xu ba63befa5e roll back target=android-10 2014-05-09 21:36:35 -07:00
yangxiao cb3bd52d9a remove unused shadertest 2014-05-09 21:34:59 -07:00
Ricardo Quesada a8c2fb5431 Fixes deprecated warnings 2014-05-09 21:29:24 -07:00
Ricardo Quesada 1a0ab4bf92 10 tests 2014-05-09 20:51:46 -07:00
Huabing.Xu e84d96234b add two shaderTest case for Trace 
comment out one(it is not working on IOS device)
 2014-05-09 20:35:15 -07:00
Ricardo Quesada 4a49668940 plist are not executable files 2014-05-09 20:11:36 -07:00
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -07:00
yangxiao 1be6ba961c Merge branch 'newcode' into improved_glprogram 2014-05-09 16:05:42 -07:00
yangxiao 877d8dd771 android works!! 2014-05-09 15:59:49 -07:00
Ricardo Quesada 47f6f8871f compiles on windows 2014-05-09 14:43:20 -07:00
Trace 4c4a974287 use STRINGGIFY(A) instead R"" 2014-05-09 12:03:09 -07:00
Trace 4bcdccd302 Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-09 12:01:18 -07:00
Huabing.Xu e72633c066 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram 2014-05-09 11:53:22 -07:00
Trace 0b8aed3536 Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-09 11:51:00 -07:00
Huabing.Xu 168ff78e18 add test case for y flipped coord 2014-05-09 11:49:51 -07:00
Trace 88f1d8ac4e Add ShaderTest sample and shader code 2014-05-09 11:48:11 -07:00
Ricardo Quesada 78dd92a7ef Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-09 11:40:13 -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 451b7a1b6b issue #5057, refactor UICheckBox event callback 2014-05-09 16:04:55 +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 57ce0ee2cf issue #5057, refactor addTouchEventListener to std::function<> 2014-05-09 14:30:39 +08:00
andyque 7d1cb7af47 issue #5057, refactor UILoadingBarTest 2014-05-09 11:52:51 +08:00
Dhilan007 06f264e87d rename VideoWidget to VideoPlayer. 2014-05-09 11:30: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 2e669c1d28 GLProgram::create() returns a linked GLProgram 2014-05-08 16:04:59 -07:00
Ricardo Quesada 580ebf939f working Ok with new API 2014-05-08 15:43:12 -07:00
Ricardo Quesada 8f2ba467ff Yeahhhhhh 
it is working
 2014-05-08 12:34:26 -07:00
Ricardo Quesada 087378926f Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-08 10:16:09 -07:00
Dale Stammen eea1ba6946 added missing files to projects 2014-05-08 10:11:42 -07:00
James Chen 59e1fc39b3 Merge pull request #6638 from Dhilan007/v3_video 
fixed compilation fails on android.
 2014-05-08 21:43:21 +08:00
Dhilan007 24452cada1 fixed compilation fails on android. 2014-05-08 21:39:53 +08:00
James Chen 0ed33cacf4 Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which 
was set in '.user' file
 2014-05-08 21:19:54 +08:00
Dhilan007 972f9447dd issue #4876:Add test case to play video 2014-05-08 18:14:32 +08:00
andyque 0c2fd977ea issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of 
Widget and also simplify the enum value
 2014-05-08 18:10:21 +08:00
minggo 9f0e25d808 Merge pull request #6628 from andyque/refactor5056 
refactor 5056. pull gui tests from ExtensionTest to UITest
 2014-05-08 17:00:38 +08:00
andyque 97ee5cb456 closed #5056. fix windows compile error 2014-05-08 16:18:46 +08:00
minggo a8d728ffc9 Merge pull request #6610 from zawasp/vs2013project 
upgrade win32 projects for Visual Studio 2013
 2014-05-08 15:40:02 +08:00
andyque e48e26cfdc issue #5056. fix linux & android compile error 2014-05-08 15:20:24 +08:00
James Chen 88b0eb3baa Adds missing 'fps_images.png', our test case needs them 2014-05-08 15:09:02 +08:00
andyque 898a66131a issue #5056. move gui test from ExtensionsTest to the outside 2014-05-08 14:35:45 +08:00
andyque f6d0135b9b Merge branch 'v3' into focus3861 2014-05-08 11:27:57 +08:00
andyque 323987beb2 closed #4861, done 2014-05-08 11:26:29 +08:00
Ricardo Quesada 90ec7dd9ec Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-07 20:21:03 -07:00
Ricardo Quesada b401f6adc1 Lots of new code 
Adds GLProgramState
 2014-05-07 20:20:19 -07:00
andyque b5f1f7455b issue #4861, fix a problem when layout focus loops 2014-05-08 10:46:05 +08:00
Huabing.Xu 41f48e7fa9 Merge branch 'v3' into tony_improved_glprogram 2014-05-07 15:30:04 -07:00
Ricardo Quesada 98454eeb69 Adds GLProgram::createXXX() 2014-05-07 14:38:41 -07:00
Ricardo Quesada 02405a8efe Improved samples 2014-05-07 12:41:04 -07:00
Ricardo Quesada b1ed7178fe Improved API for Uniforms 2014-05-07 10:44:45 -07:00
yangxiao 5190fb27c8 use proposed vertex attribute api 2014-05-07 09:27:44 -07: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
andyque 05b7d274c8 issue #4861. fix distance calculation 2014-05-07 18:27:05 +08:00
samuele3hu 8615e13c91 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 17:16:40 +08:00
James Chen 9862fab58f Comments fix in CCRenderTexture.h 2014-05-07 16:37:21 +08:00
andyque 1282252c25 closed #4861, refactor 2014-05-07 14:06:44 +08:00
andyque 657720e509 Merge remote-tracking branch 'upstream/v3' into focus3861 2014-05-07 11:42:09 +08:00
andyque ef44b2687b closed #4861, finished focus 2014-05-07 11:40:01 +08:00
andyque ef70c684de issue #4861, add requestFocus method and the layout current can get focus 2014-05-07 10:23:57 +08:00
andyque 62a66872aa issue #4861, fixed some boundary conditions 2014-05-07 10:05:20 +08:00
Ricardo Quesada db759005e0 Improvements for Attributes and Uniform API 2014-05-06 17:58:14 -07:00
Ricardo Quesada 21dd6fef69 Improves code a little bit 2014-05-06 12:46:35 -07:00
Trace cf9e8ff0bd Merge branch 'newV3' into improved_glprogram 
Conflicts:
	cocos/2d/CCGLProgram.cpp
	cocos/2d/CCGLProgram.h
 2014-05-06 12:07:42 -07:00
Trace 69fd841b30 fix the include error 2014-05-06 11:19:51 -07:00
andyque 9d71ae29b9 issue #4861. fixed all widget focus diabled bug 2014-05-06 17:28:12 +08:00
andyque 51a704dcc8 issue #4861, refactor improve nested focus test 2014-05-06 15:11:55 +08:00
andyque 29c57568bf issue #4861, add nested focus test 2014-05-06 14:38:45 +08:00
andyque e52370e1c2 issue #4861, refactor UIFocusTest, simplify code 2014-05-06 14:20:01 +08:00
andyque ad4e1f1e2c issue #4861, improve UIFocusTest, add click event to ImageView 2014-05-06 14:14:22 +08:00
samuele3hu 3017c776e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-06 13:59:44 +08:00
samuele3hu 0ce2a38f17 Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test 2014-05-06 13:59:16 +08:00
andyque e65b144ee6 issue #3861, fixs windows compile error 2014-05-06 10:17:10 +08:00
andyque 16ebe8d41c issue #3861, fix linux compile error 2014-05-06 09:40:50 +08:00
Dale Stammen 703c6c2b39 added missing Assets folder 2014-05-05 13:47:43 -07:00
andyque cb5b2a4f85 issue #4861, Merge branch 'v3' into focus3861 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-05-05 17:40:28 +08:00
James Chen 67b2fbf14b Updates xcode project, add ccs-res folder to Resources folder 2014-05-05 15:24:33 +08:00
James Chen 399f5cf721 Adds submodule for CocoStudio resources (70MB) 2014-05-05 15:11:35 +08:00
James Chen e16d6fa63f Re-adds resources in cpp-tests and lua-tests, but removes some large 
files. We need to reuse some resources when doing some tests.
 2014-05-05 13:27:47 +08:00
andyque 2d0de93baf issue #4861, fixed a widget bug and add VBox test 2014-05-05 11:37:40 +08:00
andyque 852191a928 issue #4861, improve the horizontal layout test 2014-05-05 11:37:39 +08:00
andyque 0dc224a123 issue #4861. fix android compile error 2014-05-05 11:37:39 +08:00
andyque a7fbd590dc issue #4861. add a horizontal focus test 2014-05-05 11:37:39 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
Ricardo Quesada 207e67318d rolling back tests 2014-05-01 16:55:28 -07: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 25213c81f6 linux cmake improvements 
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
 2014-05-01 13:01:51 -07:00
Ricardo Quesada c590bbe547 target is android-10 2014-04-30 13:18:57 -07:00
Ricardo Quesada b5f513ce16 Merge branch 'v3' into improved_directory_structure 2014-04-30 13:15:10 -07:00
Huabing.Xu 16105df503 getNormalize->getNormalized 2014-05-01 01:10:18 +08:00
Huabing.Xu c722b74e36 Merge branch 'v3' into v3_refactor_normalize 2014-04-30 20:08:37 +08:00
Huabing.Xu ea4fee2c31 refactor normalize in Vector2 2014-04-30 18:07:05 +08:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
Huabing.Xu bd93a5cb76 fix bug for renderTexture created which is bigger than screen size 2014-04-29 15:08:44 +08:00
Dhilan007 35f83fc40a fixed compile fail 2014-04-28 11:42:54 +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
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 2014-04-25 16:20:24 +08:00
James Chen 828401a23d Merge pull request #6302 from zifter/FixParticle 
closed #4880: Particle systems loading incorrectly in CocosBuilder
 2014-04-25 14:15:44 +08:00
James Chen 06d9187783 Merge pull request #6270 from andyque/feature4783 
closed #4783, add outline shader files
 2014-04-25 13:50:44 +08:00
James Chen 037c57ef96 Merge branch 'develop' into perf-callback 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-25 12:07:48 +08:00
James Chen cd6fe294b8 Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer 
closed #4771: Move PhysicsWorld to Layer
 2014-04-25 11:52:32 +08:00
James Chen 328408d792 Merge pull request #6263 from Mazyod/develop-cpp11-http-client 
closed #4702: Update HTTPClient to use C++11 callbacks
 2014-04-25 11:06:06 +08:00
James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-04-25 10:59:11 +08:00
James Chen 7beb8b78fe Merge pull request #6325 from MSOpenTech/wp8-3.0-update 
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
 2014-04-25 10:41:58 +08:00
Huabing.Xu c2da6727be fix compile warning after merge 2014-04-24 17:00:28 +08:00
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 2014-04-23 14:46:14 +08:00
Huabing.Xu 560d24545a 3.0hotfix: Node: Clipping->RawStencilTest4-6 2014-04-22 10:58:42 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
zhangbin 440702aa06 Enable depth test in test case : TilemapTest->TMXOrthoVertexZ. 2014-04-21 15:26:57 +08:00
boyu0 710fe9d940 closed #4771: modify test. 2014-04-21 13:32:47 +08:00
James Chen a75432ec35 Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements 
Mac Editbox Text Font and Placeholder features
 2014-04-21 11:18:07 +08:00
Dale Stammen 3930beda40 input event refactor. console enabled for wp8 2014-04-19 10:10:44 -07:00
Dale Stammen 467ededeff enabled console for wp8 2014-04-19 10:08:01 -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 d8d847bd65 Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl 
closed #4903: Build libcurl.a with openssl
 2014-04-18 17:10:53 +08:00
boyu0 9756709473 closed #4903: change HttpClientTest get test 3 to https protocol. 2014-04-18 17:03:06 +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
zifter 08d975268d Fix for issue http://www.cocos2d-x.org/issues/4880. 2014-04-17 03:15:43 +03:00
Huabing.Xu 718f3b3a57 remove warning message---continue 2014-04-16 10:47:29 +08:00
James Chen 60c1ed28dc Removes unused enum in PerformaceCallbackTest 2014-04-16 10:41:42 +08:00
James Chen ec40dda7f3 Adds performance test for callbacks: 1) std::function, 
2) (target->*selector)(), 3) simulate new api of Scheduler
 2014-04-16 10:35:58 +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 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
Huabing.Xu 5303f50904 Migrate to Vector2 in DrawPrimitive.h 2014-04-15 17:29:23 +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
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08: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 a5e900a86b manually enable depth test in test case TMXIsoVertexZ 2014-04-14 17:06:35 +08:00
minggo bb15d0ecf9 Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option 
Add interface setCullingEnabled(), culling is disabled by default
 2014-04-14 14:50:11 +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
andyque 87b437dd3a closed #4783. replace deprecated function call 2014-04-14 13:48:17 +08:00
andyque 10cca8674a closed #4783. remove unused comments in shader file 2014-04-14 12:06:42 +08:00
andyque 00d2bd833f closed #4783. finish the shading effects 2014-04-14 12:03:37 +08:00
andyque 2c1f5da69c issue #4783, add outline shader files 2014-04-14 11:52:17 +08:00
Huabing.Xu d2dd57d412 change indention to space and remove comment code 2014-04-14 11:45:06 +08:00
Huabing.Xu 9935e8ddfb setCullingEnabled set to public access 
changed renderer->culling test case
 2014-04-14 11:33:40 +08:00
Mazyad Alabduljaleel 40e6288ac7 [NEW]: update HTTPClient to use C++11 callbacks 
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
 2014-04-13 01:06:04 +04:00
Mazyad Alabduljaleel 8919931a50 small indentation fix 2014-04-13 00:26:38 +04:00
Mazyad Alabduljaleel b369c24f01 + [NEW]: setting the font for Editbox text 
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
 2014-04-13 00:19:14 +04:00
James Chen 043f86cd6b Memory leak fix in SchedulerTest 2014-04-12 12:59:28 +08:00
James Chen 350f61c4da Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0 
closed #4497: use /z7 to build without .pdb
 2014-04-11 20:20:47 +08:00
zhangbin d611cfb49f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:03:24 +08:00
zhangbin 0eee9bc288 Solve the incorrect effect of some transition test case in lua-tests. 2014-04-11 20:02:11 +08:00
Huabing.Xu 1aa909371d remove kmMat4 in Cpp-tests 2014-04-11 18:03:07 +08:00
James Chen b40773f6d0 Merge pull request #6240 from dabingnn/develop_add_rendererAssert 
Trigger an assert if a command is added while render is rendering.
 2014-04-11 17:37:02 +08:00
andyque 280c2755b3 closed #4761. fix a compile error 2014-04-11 16:47:35 +08:00
andyque 83664e2322 closed #4761. fix a improve super class function call 2014-04-11 16:34:26 +08:00
andyque 4be149e492 closed #4761, fix zfighting between tests 2014-04-11 16:30:25 +08:00
Huabing.Xu 51289e8a4c 1. add assert condition of rendering when adding command 
2. fix bug: renderTexture->SpriteRenderTextureBug
 2014-04-11 16:05:22 +08:00
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-11 11:18:13 +08:00
heliclei 157fce785c fix CCConsole linux crash 2014-04-10 18:31:28 +08:00
James Chen 5d882cea23 Merge pull request #6213 from koowolf/wp8_fix 
fix compiler error in wp8
 2014-04-10 17:10:08 +08:00
James Chen 9c07ca5722 Merge pull request #6220 from Dhilan007/develop 
Fixed logical error in TestChangeAnimationInternal::onExit.
 2014-04-10 16:54:38 +08:00
koowolf b5433f05c1 replace LabelTTF with Label 2014-04-10 16:51:25 +08:00
Dhilan007 d583dcc0f0 Fixed logical error in TestChangeAnimationInternal::onExit. 2014-04-10 16:48:51 +08:00
James Chen 8fcf687452 Merge pull request #6216 from Dhilan007/develop 
Fixed logical error in CameraCenterTest::onExit.
 2014-04-10 16:17:10 +08:00
Dhilan007 fce85e08f9 Fixed logical error in CameraCenterTest::onExit. 2014-04-10 16:13:07 +08:00
James Chen 8a66f43f30 closed #4744: Adds test for issue4744. 2014-04-10 15:31:53 +08:00
James Chen efb443dea0 Merge pull request #6200 from dumganhar/iss4729-deprecated-folder 
issue #4729: Move deprecated stuff to deprecated folder
 2014-04-10 11:17:21 +08:00
James Chen ba1f535201 Merge pull request #6199 from Dhilan007/develop_label 
closed #4743: Label:Makes the create functions of Label clearer.
 2014-04-10 11:15:56 +08:00
Huabing.Xu 5475a0fc02 fix compile error after merge 2014-04-10 10:58:43 +08:00
Huabing.Xu 07ac817a7c Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-10 10:52:15 +08:00
Huabing.Xu d865341694 remove kmMat4 interface in cpp-tests 2014-04-10 10:16:16 +08:00
James Chen 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
minggo 2beed5d398 Merge pull request #6166 from dabingnn/develop_fix_rendererBug 
Develop fix renderer bug
 2014-04-10 00:27:33 +08:00
Dhilan007 05b8123803 Label:Makes the create functions of Label just do one thing. 2014-04-09 23:31:05 +08:00
Dhilan007 67652357e1 1.Makes the create functions of Label clear. 2014-04-09 21:35:08 +08:00
zhangbin 43eaccca09 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703 2014-04-09 13:47:18 +08:00
Darragh Coy 50be1ca3ad Fix win32 build 2014-04-08 22:47:08 -07:00
zhangbin ddffa3b120 closed #4703, Solve the incorrect effect of test case : RenderTexture test issue 937. 2014-04-09 13:40:43 +08:00
Darragh Coy d64603a856 Attempt to fix the linux build. 2014-04-08 22:29:40 -07:00
James Chen 8e428d7321 Merge pull request #6163 from heliclei/fix-autotest 
fix autotest touch hang:run test scene constructor in cocos thread
 2014-04-09 13:28:30 +08:00
Darragh Coy 14b210a082 RefPtr<T> - add move semantics 
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
 2014-04-08 11:34:27 -07:00
Darragh Coy 440a0adcde Whoops... Shouldn't remove the test cpp. 2014-04-08 10:40:32 -07:00
Darragh Coy a34b952e8d Revert "Fix Android build for RefPtr addition." 
This reverts commit 586383a05e.
 2014-04-08 10:35:55 -07:00
Huabing.Xu 409b696bab remove kmMat4 interface in class Node 2014-04-08 23:05:33 +08:00
Huabing.Xu 3837c23ebe draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
Huabing.Xu e8596094a4 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-08 16:58:51 +08:00
shujunqiao fb777b1a1d [ci skip], delete ShaderFail sample in ShaderTest.cpp. 2014-04-08 14:52:17 +08:00
shujunqiao fae742c0b8 modify ShaderTest.cpp not crah to autotest. 2014-04-08 14:32:25 +08:00
heliclei 798708f775 fix autotest touch hang:run test scene constructor in cocos thread 2014-04-08 11:29:42 +08:00
Darragh Coy bb85df66b1 Add an event dispatcher test 
Add an event dispatcher test to help reproduce crashes fixed by the previous commit and to verify that the fix still works.
 2014-04-07 16:46:03 -07:00
Huabing.Xu 1b0c55ef15 issue #4629: test case add a spriteInGroup instead of sprite, the sprite can not be seen now 2014-04-07 22:31:24 +08:00
Huabing.Xu beda294be1 issue #4629: add test case for group command 2014-04-07 22:02:43 +08:00
Ricardo Quesada f1a2db9006 Merge pull request #6140 from dumganhar/render-clean 
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
 2014-04-04 13:34:29 -07:00
Huabing.Xu 29c345bd02 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-04 18:45:21 +08:00
James Chen 541d4dea0c Merge pull request #6105 from andyque/feature3636 
Added create functions with parameters for all ui controls
 2014-04-04 18:34:59 +08:00
Huabing.Xu 6b4451482f remove matrixToKmMat4 function 2014-04-04 18:13:10 +08:00
Huabing.Xu f1b1678900 Director::getMatrix returns Matrix instead of kmMat4 2014-04-04 17:31:21 +08:00
James Chen 7b4a1308ea Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node 
children Test`.
 2014-04-04 12:48:16 +08:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
andyque c501aa2dec issue #4636. replace __String with StringUtils::format 2014-04-03 17:42:04 +08:00
Huabing.Xu 67e62ce73d readied director::getMatrix again. remove kmGLgetMatrix 2014-04-03 17:26:06 +08:00
Huabing.Xu 5e76c6713d migrate cpp-tests to director matrix stack 2014-04-03 15:59:55 +08:00
andyque 0875b4e51f closed #4636. Done 2014-04-03 15:56:45 +08:00
andyque 8996ab1956 issue #4636, finish refactorying UITextFieldTest 2014-04-03 15:52:42 +08:00
andyque ed2c38eb98 issue #4636, finish UITextBMFont 2014-04-03 15:45:06 +08:00
andyque 08bf6c27f4 issue #4636. finish UITextAtlasTest 2014-04-03 15:38:52 +08:00
andyque b59beab61a issue #4636, finish UISlider 2014-04-03 15:33:57 +08:00
James Chen f6859a3ca9 closed #4557: Adds `EventListener::setEnabled/isEnabled`. 2014-04-03 15:32:16 +08:00
andyque a7a1a6b05b issue #4636, finish UIRichTextTest and UIScrollViewTest 2014-04-03 15:22:23 +08:00
andyque 8b9af0e94c issue #4636. finish UIPageViewTest 2014-04-03 11:52:35 +08:00
andyque 48429f5738 issue #4636. finish UILoadingBar 2014-04-03 11:34:06 +08:00
andyque 278e2c3e3b issue #4636. finish UIListViewTest 2014-04-03 11:23:12 +08:00
andyque fe33588038 issue #4636. finish UILayout 2014-04-03 11:14:35 +08:00
andyque 1a97ebdcb0 issue #4636. finish UIImageView 2014-04-03 10:42:30 +08:00
andyque 52bdb840ee issue #4636. finish UICheckBox 2014-04-03 10:34:20 +08:00
andyque 10134ccc65 issue #4636. finish button 2014-04-03 10:31:10 +08:00
andyque 0a6b0a4389 issue #4636. refactor Scale9Sprite 2014-04-03 10:07:47 +08:00
andyque b27fe6ecc2 issue #4636. add parameter create method to UITextBMFont 2014-04-03 10:07:46 +08:00
andyque 0b5c10a0fb issue #4636. add parameter create method to UITextAtlas 2014-04-03 10:07:46 +08:00
andyque a03dc76f7d issue #4636, add parameter create method for UILoadingBar 2014-04-03 10:07:46 +08:00
andyque 92945715eb issue #4636. add parameter create function for UIText 2014-04-03 10:07:46 +08:00
andyque 558abf1a6b issue #4636, add parameter create method to UIImageView 2014-04-03 10:07:46 +08:00
andyque ba9a605568 issue #4636, add parameter create method to UICheckBox 2014-04-03 10:07:46 +08:00
andyque 1b0583214b issue #4636, add parameter create method to UIButton 2014-04-03 10:07:46 +08:00
zhangbin 0e0000e6d5 The projection reset to DEFAULT when a test case onExit(). 2014-04-02 17:12:09 +08:00
Huabing.Xu 45b0ba3871 migrate Vertex2f to Vector2(tests) 2014-04-02 15:25:50 +08:00
Huabing.Xu 56aa50617c migrate Vertex3f to Vector3(Tests) 2014-04-02 15:25:19 +08:00
James Chen 944e752509 fonts/xxx.ttf -> Xxx for old LabelTTF test. 2014-04-01 14:49:02 +08:00
Dhilan007 eadbca8ee7 1.fixed logical error in Label::enableShadow. 
2.Add test case for shadow and outline take effect at the same time.
 2014-04-01 14:15:35 +08:00
minggo 7804fdf0a1 Merge pull request #6078 from boyu0/3.0rc1_test 
1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...
 2014-04-01 11:23:16 +08:00
boyu0 18b0c041b4 1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection. 2014-03-31 18:17:00 +08:00
James Chen bc5a2ff5db Merge pull request #6075 from Dhilan007/develop_label 
fixed warnings in LabelTest.
 2014-03-31 17:40:30 +08:00
Dhilan007 687b2e9f87 update test case. 2014-03-31 17:38:54 +08:00
Dhilan007 51f3833a7e fixed warn. 2014-03-31 17:31:04 +08:00
Dhilan007 72811d8869 fixed warn in test case. 2014-03-31 17:21:56 +08:00
James Chen f4a7da8457 Merge pull request #6069 from Dhilan007/develop_label 
fixed can't type chinese.
 2014-03-31 16:46:43 +08:00
Dhilan007 6c99f992dc fixed can't type chinese. 2014-03-31 16:18:45 +08:00
minggo 98ed579b34 Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301 
Fixed bugs for Editor
 2014-03-31 15:37:45 +08:00
minggo 7840a246b7 Merge pull request #6063 from koowolf/add_bg_wav 
add background.wav to wp8 to play
 2014-03-31 15:20:26 +08:00
James Chen 313108af82 Merge pull request #6065 from boyu0/3.0rc1_test 
fix box2dbed dynamic tree test draw.
 2014-03-31 14:38:00 +08:00
boyu0 48854f4649 delete Time of Impact test which can not shown 2014-03-31 13:41:48 +08:00
boyu0 9b75fc5595 add box2dbed test keyboard event. 2014-03-31 12:07:21 +08:00
koowolf ce78b6369a add background.wav to wp8 to play 2014-03-31 11:46:39 +08:00
boyu0 4fa8d24561 fix some box2d test position 2014-03-31 11:26:11 +08:00
zhangbin 95ab15195c Optimize the performance of BlurSpriteTest in Shader Sprite. 2014-03-31 10:44:48 +08:00
boyu0 530354ca67 fix box2d dynamic tree draws 2014-03-31 10:21:54 +08:00
minggo f80bdfff76 Merge pull request #6055 from MSOpenTech/wp8-3.0 
Cocos2d-x 3.0 Windows Phone 8 support
 2014-03-29 23:21:34 +08:00
Dale Stammen c739956582 added wp8 support files and projects 2014-03-28 15:54:36 -07:00
Dale Stammen 8bd5497ac6 use ResolutionPolicy::SHOW_ALL on WP8 2014-03-28 11:28:48 -07:00
zhangbin 6a1974a78a Solve the error effect of BlurSpriteTest in Shader Sprite. 2014-03-28 20:53:14 +08:00
pipu 733b364b51 Fixed bugs for Editor 2014-03-28 18:54:06 +08:00