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

3418 Commits

Author SHA1 Message Date
ledenis 3d69e5e1d4 Fix copy files in cpp-empty-test in MSVC build 2014-09-29 22:08:41 +02:00
Ricardo Quesada a16c5d5e43 Adds missing includes 2014-09-29 14:45:43 -03:00
Ricardo Quesada 7a1dac5aa6 Fixes audio issues when using CMake on Mac 2014-09-29 14:07:11 -03:00
Dhilan007 f2f1331026 New Audio Engine[Win32] 2014-09-29 10:15:41 +08:00
samuele3hu f00187d3bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-09-29 09:48:35 +08:00
samuele3hu 99e1c6640e Add BillBoardTest and update related bindings files 2014-09-29 09:43:22 +08:00
samuele3hu 6b2acf88fc Modify CameraTest and update related lua-bindings files 2014-09-28 16:47:06 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
samuele3hu e50eaf684f Add CameraTest and update related lua-bindings files 2014-09-28 14:31:58 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
Sergey Perepelitsa 094716a500 Scale9Sprite cropped frames tests 2014-09-28 01:58:26 +04:00
yangxiao abd960725a add to linux project 2014-09-26 16:54:01 +08:00
samuele3hu 2ac96ed06e Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement 2014-09-26 16:39:54 +08:00
samuele3hu 691074eb7c Add Camra3DTest and update sprite3DTest 2014-09-26 16:00:57 +08:00
yangxiao fd35d43510 remove unused resource 2014-09-26 15:57:18 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao db2ff49f26 adjust according to minggo 2014-09-26 14:13:26 +08:00
yangxiao bf84aba47e do not add ambient color by default 2014-09-25 16:27:31 +08:00
yangxiao eab0951c2d reset 2014-09-25 16:07:57 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
samuele3hu 38530772ae Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 15:26:03 +08:00
minggo 2620592d62 Merge pull request #7975 from newnon/v3_openUrl 
openUrl function for all platform but on windows RT empty function
 2014-09-25 13:41:08 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
minggo 6a437d79b1 Merge pull request #8138 from MSOpenTech/wp8-v3.3 
WP8 v3.3 bug fixes
 2014-09-25 10:39:37 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Dale Stammen b9c57f7e28 changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist 2014-09-23 10:39:17 -07:00
Dhilan007 ed4e800d70 Add audio resource. 2014-09-23 15:38:40 +08:00
Sergey b8b5397e4e Tests for Mac/iOS android Linux & Windows 2014-09-22 17:54:49 +04:00
Guy Kogus 908311ff7f Added tests for opening a URL. 2014-09-22 17:51:05 +04:00
Dhilan007 077ffb2b43 update lua binding 2014-09-22 15:54:35 +08:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 
web view win32
 2014-09-22 09:30:29 +08:00
minggo 681621805d Merge pull request #8109 from andyque/fixTests 
fix editbox test
 2014-09-19 16:29:07 +08:00
yangxiao 06c0adcf6d remove unused resource 2014-09-19 14:52:25 +08:00
andyque 7615eb8d39 fix editbox test 2014-09-19 14:21:18 +08:00
yangxiao 650f810815 add obb by default 2014-09-19 11:22:37 +08:00
songchengjiang 62777e9552 compile Android 2014-09-18 18:35:18 +08:00
songchengjiang 3c67515378 Finished light reconstruction 2014-09-18 16:38:35 +08:00
Jeff 418ec69abf compile error 2014-09-18 15:18:30 +08:00
minggo 442f30af1f Merge pull request #8091 from dabingnn/v3_PageTurnZFighting 
new version of avoid z fighting in pageTurn
 2014-09-18 10:50:31 +08:00
Huabing.Xu 39c6f9bfbd remove setDepthTest(true) because it is not needed to be set for pageTurn 2014-09-18 10:00:36 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff 27919dad77 add simple implement of WebView for win32 
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
 2014-09-17 22:30:15 +08:00
Huabing.Xu 3a0e9be97e new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
minggo ccbf694927 Merge pull request #8086 from huangshiwu/v3_test 
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
 2014-09-17 14:50:42 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
huangshiwu c8bdba69ad fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView 2014-09-17 14:00:40 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
minggo 7d97aaeeb3 Merge pull request #8078 from minggo/SchedulerPauseResumeAll-issue 
SchedulerPauseResumeAll can not resume at 5s
 2014-09-16 17:30:20 +08:00
minggo da29b92ff4 Merge pull request #8072 from Dhilan007/v3-audio903 
move AudioEngine to cocos2d:experimental namespace
 2014-09-16 17:12:03 +08:00
minggo 3de82474c0 SchedulerPauseResumeAll can not resume at 5s 2014-09-16 16:38:30 +08:00
huangshiwu 3907e5c1a2 fix ClippingNode's memory leak bug 2014-09-16 14:50:00 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08:00
minggo 27528f3e5f Merge pull request #8061 from minggo/fix-cocostudio-test-crash 
[ci skip]remove unneeded Android.mk
 2014-09-15 22:53:18 +08:00
minggo a61cda04ee remove unneeded Android.mk 2014-09-15 22:47:44 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
minggo 7bb391ce55 Merge pull request #8033 from Dhilan007/v3-audio903 
Lua bindings of AudioEngine.
 2014-09-15 13:43:27 +08:00
Dhilan007 9cc9359b78 fix compile error 2014-09-15 11:16:27 +08:00
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
minggo 70f922d07a Merge pull request #8030 from andyque/fixButtonScaleIssue 
fix button scale issue
 2014-09-15 09:49:06 +08:00
minggo 788f3c5c38 Merge pull request #8025 from andyque/fixEditBoxLuaBinding 
fix Editbox lua binding
 2014-09-15 09:36:36 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
Dhilan007 51e3b1af7b Add lua test case of AudioEngine 2014-09-14 22:54:48 +08:00
Dhilan007 28af7999e5 update test case of AudioEngine 2014-09-14 22:49:27 +08:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
andyque 02d2282b83 add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox 2014-09-12 17:07:06 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
huangshiwu 11d8829b3a Deprecate DrawPrimitives and enhance DrawNode --little modify 2014-09-12 14:50:41 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00
huangshiwu 6182a872c6 Deprecate DrawPrimitives and enhance DrawNode --more modify 2014-09-12 11:12:20 +08:00
huangshiwu 147bb7301b fix wp8 compile error --add BillBoard and BillBoardTest 2014-09-12 09:33:30 +08:00
huangshiwu 8922121ed1 Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +08:00
yangxiao df9ab144fe light work 2014-09-11 15:46:32 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
Dhilan007 fc27c5e32a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-09-10 14:35:33 +08:00
minggo 46d4f487bb Merge pull request #7978 from super626/v3 
Calculate Content Size for Sprite3D
 2014-09-10 14:06:47 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib 
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
 2014-09-10 10:00:15 +08:00
Ricardo Quesada f5cd48f154 Android properties back to 10 2014-09-09 18:46:47 -07:00
Ricardo Quesada 4d57e991ea Compiles in Win32 2014-09-09 18:07:24 -07:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
songchengjiang 4099015421 Sprite3D set default _contentSize by AABB 2014-09-09 17:47:34 +08:00
songchengjiang 117c38f806 Sprite3DHitTest use AABB testing 2014-09-09 17:05:33 +08:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
andyque 6a4397a3eb change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
Dhilan007 6697989174 Update test case of AudioEngine. 2014-09-09 10:48:07 +08:00
yangxiao a295159a3a Merge branch 'newcode' into transition 2014-09-09 10:37:08 +08:00
Dhilan007 1b96b2ac87 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 2014-09-09 10:32:56 +08:00
andyque 59dc56bfcb remove chipmunk dependency 2014-09-05 21:59:30 +08:00
huangshiwu 01358f0b62 fix wp8 compile error and modify default resource path 2014-09-05 15:43:08 +08:00
yangxiao 730ab846c3 code adjustment 2014-09-05 14:59:14 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
Dhilan007 6b4b5ed943 Refactoring API: 
1.Remove Singleton Pattern
2.Make AudioProfile clear.
 2014-09-05 11:13:51 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
yangxiao a5e1e692e8 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-04 17:00:49 +08:00
liuliang c42bef1f02 Add a bulletin board test example 2014-09-04 16:58:00 +08:00
yangxiao d114e11a0b android, linux and lua 2014-09-04 16:45:42 +08:00
yangxiao ed63f01c7e seperate billboard test from Sprite3D test 2014-09-04 16:27:18 +08:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +08:00
Ricardo Quesada 047025696c Merge pull request #7680 from andyque/fixNormalizedPosition 
fix normalizedPosition bug
 2014-09-03 10:07:22 -07:00
Dhilan007 a352a10d38 Add test case for new audio engine. 2014-09-03 18:20:31 +08:00
XiaoYang 58f4e84b9a Merge pull request #126 from songchengjiang/billboard 
Billboard
 2014-09-03 18:12:08 +08:00
songchengjiang 68ce6449e8 repaired camera orientation 
Testing RotateBy action
 2014-09-03 17:17:57 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
yangxiao 1bd09f21d0 merge cocos 2014-09-03 15:42:58 +08:00
andyque 58f219fc20 test extension::Scale9Sprite and remove unused file compile flags 2014-09-03 15:00:09 +08:00
andyque 2e27a6865f update project to vs2013 2014-09-03 14:10:38 +08:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
minggo eee9ac626a Merge pull request #7815 from andyque/mergeExtensionEditBox 
merge extension EditBox to ui module
 2014-09-03 11:25:10 +08:00
andyque b00a7b3b38 add Node normalizedPosition bug test 2014-09-03 09:16:31 +08:00
andyque a79d35d08b remove NodeNormalizedPositionTest 2014-09-03 09:16:31 +08:00
andyque fab9a0052b fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
yangxiao 8dff467b27 Merge branch 'newcode' into transition 2014-09-03 09:15:12 +08:00
andyque dafbf28283 fix release mode compile error 2014-09-02 16:42:23 +08:00
andyque fadfa87afd fix vs2013 compile error 2014-09-02 16:42:04 +08:00
songchengjiang 18d06015c6 Added More Models 
Code optimization
 2014-09-02 11:24:19 +08:00
andyque c13e7b7224 Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox 2014-09-02 10:06:17 +08:00
andyque 6dc45f86e4 fix windows compile error 2014-09-02 10:05:22 +08:00
andyque fa33ab76fc remove UIEditBox test 2014-09-01 18:23:45 +08:00
andyque e24192aeb2 fix linux compile 2014-09-01 18:06:21 +08:00
andyque ffee7b27d4 fix linux and android compile error 2014-09-01 17:43:40 +08:00
andyque 85ce801fdd remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
andyque 0076953f97 fix iOS compile error 2014-09-01 15:55:09 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
yangxiao 538fe2e543 Merge branch 'newcode' into transition 2014-09-01 15:14:30 +08:00
songchengjiang 3f8b430b3e deleted Meshcommand 2014-09-01 09:33:08 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
yangxiao a039d6b0fc animate3d transition 2014-08-29 18:25:42 +08:00
songchengjiang 9f715e4e00 Added Sprite3D Model 2014-08-29 18:18:19 +08:00
songchengjiang 8d971054f2 Android -p 10 2014-08-29 18:02:17 +08:00
songchengjiang 0d75998027 pressure test 2014-08-29 17:58:20 +08:00
songchengjiang 4aa4287d28 test on Android 2014-08-29 17:29:15 +08:00
songchengjiang 34070677ad Added testing Model Number 2014-08-29 17:11:18 +08:00
songchengjiang 71d722854c added mesh command 2014-08-29 12:08:28 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-29 10:58:04 +08:00
andyque cd031c4493 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
 2014-08-29 10:25:24 +08:00
songchengjiang f5ea9a2219 tab format 2014-08-29 09:33:28 +08:00
songchengjiang 06e3eb955f repaired BillBoard Depth Test 2014-08-29 09:30:59 +08:00
songchengjiang ac8158c60b Tab Format 2014-08-29 09:14:54 +08:00
songchengjiang e16fb5977e Finished BillBorad 2014-08-29 09:14:22 +08:00
songchengjiang e6f055f3fd calculated Z in View 
Transparent Render
 2014-08-28 19:22:01 +08:00
zhangbin e24a903c88 Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1. 2014-08-28 16:13:11 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo 681c3c06f1 Merge pull request #7558 from newnon/v3_actions_by_tag_improvements 
stopAllActionsByTag && removeAllActionsByTag
 2014-08-28 14:24:37 +08:00
minggo 2fd6cf8f43 fix compiling error 2014-08-28 13:59:56 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
songchengjiang 014ba0d12e Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new 2014-08-28 10:17:32 +08:00
songchengjiang 5067741140 Deleted Plane Model 2014-08-28 10:16:15 +08:00
yangxiao d0943afb62 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-28 09:24:04 +08:00
yangxiao 74f98b36d6 merge cocos 2014-08-28 09:22:57 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Ricardo Quesada dbdd2b3e13 Adds ClippingNode bug test case 2014-08-27 10:54:15 -07:00
songchengjiang 26dc7de802 Repaired Light Shader BUG On ios 2014-08-27 21:03:52 +08:00
songchengjiang 731d1165c3 Spot Light Shader optimization 2014-08-27 17:09:20 +08:00
andyque 3d97ddc739 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/ui/Android.mk
 2014-08-27 14:08:16 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
minggo d0ca9a4da5 remove unneeded include header files 2014-08-27 13:39:50 +08:00
yangxiao c5515874d5 merge cocos 2014-08-27 11:00:14 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
andyque 4597de069d improve test case and make program more robust 2014-08-27 08:02:22 +08:00
andyque 84c5542a0e Merge branch 'v3' into addWebView 2014-08-26 22:11:35 +08:00
andyque 9449152caf finish WebView Tests 2014-08-26 22:03:55 +08:00
andyque 15815118a2 finish android version 2014-08-26 16:53:37 +08:00
yangxiao 7d6b8ea706 merge cocos 2014-08-26 14:58:58 +08:00
yangxiao 03390a4f46 merge cocos 2014-08-26 14:05:59 +08:00
andyque e12db46866 fix style 2014-08-26 12:08:26 +08:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
songchengjiang 3d59aaf86e Replaced Tab Format 2014-08-26 09:43:11 +08:00
yangxiao cff5b65314 Merge branch 'newcode' into v3 2014-08-25 21:20:49 +08:00
yangxiao dd93439c4b replace model 2014-08-25 19:25:51 +08:00
songchengjiang 00085c157f Added skeleton Model 
Light On/Off
 2014-08-25 16:32:15 +08:00
samuele3hu 07cf4d3526 Fix the win32 and android compile error 2014-08-25 14:10:13 +08:00
songchengjiang 1a1ccda3ed repaired Action BUG 2014-08-25 13:58:15 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
yangxiao 8bfd56c080 use normal walk 2014-08-25 11:31:38 +08:00
minggo e5ac6e204b Merge pull request #7864 from minggo/module-devide 
Module devide
 2014-08-25 11:01:19 +08:00
minggo 74fc9931e7 fix compiling error of cpp-tests on linux 2014-08-24 19:12:36 -07:00
samuele3hu 1126e950b2 Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases 2014-08-25 09:52:48 +08:00
samuele3hu 1b985db2ff adjust android.mk for lua-tests 2014-08-25 09:49:16 +08:00
samuele3hu 25aab05b1f Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform 2014-08-25 09:48:14 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
minggo 0701fe1dfb Merge pull request #7853 from super626/v3 
Better reskin model support
 2014-08-22 19:18:47 +08:00
huangshiwu 07af58c0c2 OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
yangxiao 1db3d14896 reset bone number to 60, put test in alphabetical order 2014-08-22 16:06:36 +08:00
yangxiao 1938817187 reset girl name 2014-08-22 14:24:40 +08:00
samuele3hu 70cba1f64a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	cocos/Android.mk
 2014-08-22 14:01:17 +08:00
minggo aba973b1ea Merge pull request #7834 from andyque/improveUI 
add click event listener to all Widget classes
 2014-08-22 14:00:10 +08:00
yangxiao d90572fc10 engine refactor hide concept of submesh 2014-08-22 13:52:03 +08:00
samuele3hu 1bda276392 Update android.mk for related cpp test cases 2014-08-22 13:49:54 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
minggo a0b19db670 Merge pull request #7840 from minggo/fix-warning 
fix warnings
 2014-08-22 13:41:31 +08:00
minggo 0c9c873edb Merge pull request #7846 from andyque/addUILuaBindings 
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
 2014-08-22 13:40:02 +08:00
yangxiao 2d5431353a engine adjust 2014-08-22 13:25:26 +08:00
andyque 13003fe0a6 add deprecated options for ui, add Scale9Sprite bindings 2014-08-22 11:56:13 +08:00
andyque 84cf0ee834 add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
huangshiwu 7dec715288 OpenGL context attributions setting revise 2014-08-22 10:55:39 +08:00
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
songchengjiang 5bad6e216b Added No Normal Shader 2014-08-21 10:33:16 +08:00
andyque 3f51926c5d add click event listener to Widget 2014-08-21 10:21:07 +08:00
huangshiwu 2369a5900d merge v3 to v3_glviewattrs 2014-08-21 10:18:55 +08:00
yangxiao c26a81bb55 Merge branch 'newcode' into v3 2014-08-21 09:53:06 +08:00
huangshiwu 2a03bea1a4 OpenGL context attributions setting 2014-08-21 09:35:32 +08:00
yangxiao bd4aec4bcd support multi-attribs 2014-08-20 18:20:19 +08:00
songchengjiang 26cb5d8bae Replace Tab Format 2014-08-20 16:43:01 +08:00
songchengjiang 3a1c0583fb optimization 2014-08-20 16:41:45 +08:00
andyque 2d8bec2ba9 remove Extension EditBox 2014-08-20 16:20:57 +08:00
songchengjiang 8b5bd3dbb6 Repaired the errors of Shader PassValue On Android 
Light modification
 2014-08-20 16:20:22 +08:00
andyque 46f3ab9b57 add Scale9Sprite to create method of ui::EditBox 2014-08-20 16:08:28 +08:00
andyque 34629f1014 fix windows & win8 & wp8 compile error 2014-08-20 12:02:12 +08:00
liuliang a27a420a91 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 
Conflicts:
	cocos/3d/CCSprite3D.cpp
 2014-08-20 11:45:48 +08:00
andyque 07eb0d373c Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	cocos/ui/Android.mk
 2014-08-20 09:32:29 +08:00
songchengjiang 58abc4c08f Light Shader modification for Android 2014-08-19 19:24:19 +08:00
andyque a8ab1a85b7 fix linux compile error 2014-08-19 17:42:17 +08:00
Sergey b7fa3624cf stopAllActionsByTag test 2014-08-19 13:31:19 +04:00
songchengjiang 4cf1c6a47c deleted redundant code 
Replace Tab Format
 2014-08-19 16:32:49 +08:00
songchengjiang d9bf2c2b7e Finished Light And Test 2014-08-19 15:51:30 +08:00
minggo cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
yangxiao 54423efe9f fix reskin 2014-08-19 15:25:00 +08:00
andyque 534938d88c fix linux compile error 2014-08-19 15:17:48 +08:00
XiaoYang 9f444b7010 Merge pull request #104 from liuliang2004/Meshv3 
Modification is compatible with the old model
 2014-08-19 14:32:05 +08:00
liuliang 94be97f724 Modify change interface 2014-08-19 14:30:27 +08:00
liuliang 06dfaf9db5 Modify change interface 2014-08-19 14:21:48 +08:00
liuliang 9d3bab3810 Modification is compatible with the old model 2014-08-19 14:03:41 +08:00
songchengjiang 680f089ae1 Shader: Light struct modification 2014-08-19 13:54:30 +08:00
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
minggo 38fdef614a Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling 
add swallow touch and propagation to parent widgets customization
 2014-08-18 23:16:22 +08:00
songchengjiang 9603366fcb Fixed Android compiled Problem 2014-08-18 18:05:13 +08:00
yangxiao 3fd122391c reset sprite3dtest 2014-08-18 18:01:57 +08:00
songchengjiang 10afb9b9af Finished Point Light 
Finished Directional Light
Finished Spot Light
 2014-08-18 17:10:07 +08:00
samuele3hu e0168c373c Add manual lua bindings for 3d and adjust related test case on different platform 2014-08-18 15:04:32 +08:00
yangxiao 79a55286ce refactor to new model 2014-08-18 11:13:08 +08:00
samuele3hu 6259aebdab Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-17 23:45:56 +08:00
songchengjiang 9b3a02f350 Added Light Test 
Added Point Light
 2014-08-17 21:33:33 +08:00
yangxiao 7159914248 old model work 2014-08-16 16:56:04 +08:00
songchengjiang 2b1efc59cb GLProgram Added Light Shader 
GLProgram Added Normal Matrix
 2014-08-15 19:15:14 +08:00
songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
 2014-08-15 17:43:04 +08:00
andyque 0517ceb0dc add scrollView nested tests 2014-08-15 16:21:27 +08:00
songmiao 361770e0f3 add BillBorad and BillBoardTest 2014-08-15 16:15:29 +08:00
minggo f2f8035724 Merge pull request #7708 from super626/obb 
AABB, OBB
 2014-08-15 15:32:14 +08:00
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
minggo 8364e179a4 Merge pull request #7780 from andyque/addOptionsForHardCodedValue 
add customization to UIButton and UIPageView
 2014-08-15 15:16:12 +08:00
songchengjiang 1e9c02dfa3 Added Light Class 2014-08-15 14:51:23 +08:00
minggo 38fb58cf29 Merge pull request #7792 from minggo/fix-warning 
fix warnings
 2014-08-15 13:33:08 +08:00
minggo db17084b6d fix warnings 2014-08-15 12:06:16 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
minggo 3f2fccb999 Merge pull request #7771 from samuele3hu/v3_3_module 
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
 2014-08-14 18:33:53 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
minggo ae11f24cc8 Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline 
V3 fix skinned outline
 2014-08-14 11:26:35 +08:00
andyque 18851d3e81 add customization to UIButton and UIPageView 2014-08-14 11:14:24 +08:00
Huabing.Xu a9a403013c fix skinned outline effect 2014-08-14 10:44:03 +08:00
Huabing.Xu 5d49afec0e fix ios running error 2014-08-14 10:04:01 +08:00
minggo a88504b153 Merge pull request #7756 from andyque/fixTestCase 
fix custom particle tests position
 2014-08-14 09:44:16 +08:00
minggo 0b86e129b0 Merge pull request #7762 from andyque/addAlignmentToUILabel 
add UITextField color & place hold color, fix double delete bug
 2014-08-14 09:38:57 +08:00
samuele3hu 032f5ea781 Adjust lua_debugger.h/c to lua runtime template and adjust related project configure 2014-08-14 00:06:28 +08:00
yangxiao 6ce3b5c20a add mirror test 2014-08-13 17:38:16 +08:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
minggo d223629477 Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture 
add callback for RenderTexture::saveToFile
 2014-08-13 10:05:08 +08:00
andyque e269ad49c1 fix custom particle tests position 2014-08-13 09:56:37 +08:00
minggo cc37780861 Merge pull request #7736 from dabingnn/v3_addSkinnedOutline 
V3 add skinned outline
 2014-08-12 15:07:21 +08:00
boyu0 e4bb0ad3c8 fix some merge errors. 2014-08-12 11:39:56 +08:00
boyu0 5a2564755c change NULL->nullptr 2014-08-12 11:29:37 +08:00
Huabing.Xu 3a7b673164 add callback for RenderTexture::saveToFile 2014-08-12 10:50:57 +08:00
boyu0 790ef9e818 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step 
Conflicts:
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
 2014-08-12 10:20:34 +08:00
Huabing.Xu e387caf763 add create(modelPath) interface for EffectSprite3D 2014-08-12 09:56:25 +08:00
Huabing.Xu 0dff45cfc2 adjust SkinnedEffectCode 2014-08-12 09:51:03 +08:00
Huabing.Xu e66d1f6f69 add skinned outline effect 2014-08-11 18:11:15 +08:00
minggo b34e97cfd6 Merge pull request #7729 from andyque/fixCascadedColor 
fixed Widget's Children reload textures change RGBA issue
 2014-08-11 15:33:36 +08:00
andyque cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
minggo 43a3603a8b Merge pull request #7720 from samuele3hu/v3_module 
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
 2014-08-11 15:01:28 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
yangxiao 6d15c26a61 move create default camera to Scene::initWithSize 2014-08-11 10:55:14 +08:00
samuele3hu 47c034af5d Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure 2014-08-11 10:25:40 +08:00
yangxiao 933439c6ca fix linux 2014-08-09 09:27:48 +08:00
yangxiao1 014b6d06e4 Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb 2014-08-08 18:26:34 +08:00
yangxiao1 e904ee646a windows work 2014-08-08 18:25:36 +08:00
yangxiao 6d5b63ec6a Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb 2014-08-08 18:15:01 +08:00
yangxiao 504ef32b97 linux 2014-08-08 18:14:41 +08:00
Huabing.Xu 7e1adeb3e9 add new test case 2014-08-08 18:01:36 +08:00
lvlong 8101e2ff1a 1. move drawnode3d to Sprite3DTest 
2. add getAABB to sprite3D and mesh
 2014-08-08 17:54:39 +08:00
samuele3hu 2dacbf6f26 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-08 16:59:33 +08:00
samuele3hu 2ffc0e2e53 Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 16:56:22 +08:00
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +08:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
samuele3hu 00865c8abb Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 15:22:12 +08:00
yangxiao 7408250113 add drawline 2014-08-08 15:01:24 +08:00
andyque d00e3349a3 fixed loadingBar change direction affect position issue 2014-08-08 11:17:17 +08:00
lvlong 28769c9b15 add obb sample 2014-08-08 11:16:33 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
 2014-08-07 14:02:50 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00
minggo 7b11c6a74e Merge pull request #7237 from martell/v3 
Cmake update and remove old scripts from build folder
 2014-08-07 10:36:10 +08:00
minggo 4542b1882d Merge pull request #7617 from rny/SpriteFrameCache 
SpriteFrameCache load from plist file content data
 2014-08-07 10:20:36 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
samuele3hu 99c52f0102 Split module for Linux on Lua and adjust related test cases 2014-08-06 00:15:44 +08:00
samuele3hu d86a37110d Split module for win32 and adjust related test cases 2014-08-05 19:46:13 +08:00
samuele3hu da18657f4f Add module Android.mk config and adjust related test cases 2014-08-05 13:29:54 +08:00
minggo cc75a8e860 Merge pull request #7632 from super626/v3 
SubMesh and AttachMement
 2014-08-05 09:59:38 +08:00
andyque f44906d56c fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property 2014-08-05 08:11:37 +08:00
samuele3hu cd0c82f8b7 Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates 2014-08-04 17:11:57 +08:00
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
samuele3hu e5f9c1b488 Adjust common script and related test cases 2014-08-04 15:22:07 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
andyque 5af4657fbb fix windows utf8 source code file can not compile erorr 2014-08-01 21:20:27 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
Ningyu 137de84b05 add test case 2014-08-01 14:39:45 +08:00
yangxiao e03d284e26 merge cocos2d 2014-07-31 18:55:41 +08:00
samuele3hu 2b562ace1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-07-31 17:22:33 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite 
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
 2014-07-31 16:58:56 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +08:00
minggo a77b8e7320 Merge pull request #7608 from andyque/fixTextFieldUtf8Issue 
add utf8 support for TextField widget
 2014-07-31 13:41:57 +08:00
yangxiao cd379ab412 add axe model 2014-07-31 11:26:27 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
yangxiao 44c501ca2a merge cocos2d 2014-07-31 09:56:23 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
Huabing.Xu 428e9b1b1a Merge branch 'v3' into v3_buildAllTarget 2014-07-30 14:12:28 +08:00
andyque f2b0528cc9 refactor 2014-07-30 10:45:35 +08:00
andyque 7abea5dc58 add utf8 support for UITextField 2014-07-30 10:34:37 +08:00
andyque 955da5d3cc move utf8_substr to ui::helper class. 2014-07-30 10:34:37 +08:00
Huabing.Xu d86cc0a811 decouple libcocos2d and cocosdenshion 2014-07-29 18:08:40 +08:00
andyque 5a22636441 fix windows compile error 2014-07-29 17:51:34 +08:00
andyque c5ca0dbf10 fix android and linux compile error 2014-07-29 16:24:27 +08:00
andyque 1daaea1410 remove extension::Scale9Sprite dependency 2014-07-29 16:24:27 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
minggo 5d63ce17ad Merge pull request #7610 from dabingnn/v3_windowChangeModule 
V3 window change module
 2014-07-29 14:29:01 +08:00
Huabing.Xu c722c0fcd0 libcocostudio for windows 2014-07-29 11:31:37 +08:00
boyu0 1b6cda488a add ParticleResetTotalParticles test. 2014-07-29 11:21:11 +08:00
Huabing.Xu d53ce4d664 libcocosbuilder rename for windows 2014-07-29 11:09:17 +08:00
Huabing.Xu 6d0b8852d1 libSpine rename for windows 2014-07-29 10:53:39 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +08:00
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
Huabing.Xu eacf003eed change libExtensions for windows 2014-07-29 10:07:46 +08:00
Huabing.Xu d6bc2f4998 liuGUI->libui for windows 2014-07-28 22:12:07 +08:00
Huabing.Xu c6956504bf change CocosDenshion to libcocosdenshion 2014-07-28 21:35:16 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
minggo b2e705acd8 Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf 
fix remove self in Widget touch callback issue
 2014-07-28 14:04:20 +08:00
Huabing.Xu 2795c10627 rename box2d->libbox2d 2014-07-28 12:05:58 +08:00
Huabing.Xu 7f5782c207 chang module name for windows project file 2014-07-28 09:20:02 +08:00
andyque 7353f8685a Simplify Widget ContentSize cascade change algorithm 2014-07-25 14:59:58 +08:00
andyque e56e015be2 minor modification of tests 2014-07-25 14:40:58 +08:00
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
minggo 20e3a61524 Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2 
mac custom font fix v2
 2014-07-25 11:38:38 +08:00
minggo b0c922d91e Merge pull request #7188 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Add new file&directory apis into FileUtils and test cases
 2014-07-24 22:18:10 +08:00
Sergey 92ac809bfe Mac fonts tests 2014-07-24 12:27:17 +04:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
andyque 21f1624462 minor fix of RichText 2014-07-23 14:10:00 +08:00
minggo 524d9cb8af Merge pull request #7552 from andyque/fixScale9Sprite 
fix scale9Sprite addChild zorder issue
 2014-07-22 18:39:04 +08:00
andyque 1f4c289db4 fix scale9Sprite addChild zorder issue 2014-07-22 16:26:40 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
pandamicro d2c6602dea Refactor #5580: Merge createDirectories to createDirectory 2014-07-21 16:51:48 +08:00
Huabing.Xu e666ab88ed fix windows compile error 2014-07-21 14:59:47 +08:00
minggo aef1e01ce5 Merge pull request #7518 from natural-law/android-dependencies 
Android dependencies
 2014-07-18 17:57:42 +08:00
minggo 21647839b6 Merge pull request #7515 from Dhilan007/v3-320final 
fixed warn and replace 'printf' with 'log';
 2014-07-18 13:56:54 +08:00
LinWenhai c10e49201d fixed compil 2014-07-18 13:44:07 +08:00
Dhilan007 5d22bca240 fixed warn and replace 'printf' with 'log'; 2014-07-18 10:20:37 +08:00
Dale Stammen 88da5d5fdb disabled custom shader tests for WP8 2014-07-17 08:13:49 -07:00
andyque 7ff78c61ba fix richText UTF8 2014-07-17 18:36:09 +08:00
minggo 578af01ef1 Merge pull request #7499 from andyque/fixRichTextUTF8 
fix richText utf8 error
 2014-07-17 17:57:41 +08:00
andyque fc2ab110cc fix richText utf8 error 2014-07-17 17:58:40 +08:00
zhangcheng 6d0bf8e143 Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash 2014-07-17 17:25:32 +08:00
zhangcheng 24d87ad05b 1. fixes ActionManagerEx crashes. 2014-07-17 17:24:41 +08:00
minggo c482e2e14f Merge pull request #7491 from Dhilan007/v3-320final 
fixed text line wrap issue in UITextField.
 2014-07-17 16:48:41 +08:00
minggo d28fdb6752 Merge pull request #7490 from geron-cn/chukongv3 
fix bug: cpp-test  binary load test crash
 2014-07-17 16:38:45 +08:00
Dhilan007 8ac1398037 fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
geron-cn 4e9a710053 fix binary test crash bug 2014-07-17 16:16:49 +08:00
geron-cn 441f0ebca8 fix binary test crash bug 2014-07-17 16:13:12 +08:00
geron-cn 1a2caaeebf fix binary test crash bug 2014-07-17 16:09:17 +08:00
geron-cn 8212ed3822 fix binary test crash bug 2014-07-17 16:01:03 +08:00
samuele3hu e975b0d5f9 Update experimental lua bindings、related test cases and project setting 2014-07-17 14:54:34 +08:00
samuele3hu ab0fe54d32 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 14:11:15 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
minggo 2b3fbd743a Merge pull request #7478 from Dhilan007/v3-320final 
update test case of game controller[lua]
 2014-07-17 13:37:49 +08:00
minggo c6349ef246 Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix 
disable FastTileMapTest on WP8
 2014-07-17 13:35:52 +08:00
samuele3hu 5682a983bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 12:57:31 +08:00
vision c29766a4ad disable FastTileMapTest on WP8 2014-07-17 12:56:58 +08:00
samuele3hu eb8d1d70f7 Update the FastTileMapTest and VideoPlayerTest 2014-07-17 12:55:28 +08:00
Dhilan007 6429cf06fb update test case of game controller[lua] 2014-07-17 11:26:26 +08:00
minggo e58626c11c Merge pull request #7476 from Dhilan007/v3-gc0717 
Fixed bugs[Ouya controller]
 2014-07-17 11:12:31 +08:00
Dhilan007 1ff937aa48 Fixed bugs[Ouya controller]: 
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
 2014-07-17 11:09:08 +08:00
minggo 5a5b245e84 Merge pull request #7474 from andyque/fixFastTileMap 
change FastTiledMap namespace to cocos2d::experimental
 2014-07-17 10:52:40 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
minggo 4c7d777f25 Merge pull request #7471 from visiblelight/wp8_shader_update 
Wp8 shader update
 2014-07-17 10:14:54 +08:00
vision 40951d586c update 2014-07-17 10:10:33 +08:00
vision c47d844d20 update the buildin shaders on WP8. Disable the effect 3d test. 2014-07-17 10:08:49 +08:00
samuele3hu ce4f5f0e96 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 10:02:16 +08:00
minggo a653d0eb28 Merge pull request #7440 from boyu0/add_utils_atof 
Add utils::atof(), fix bug: particle not shown on android.
 2014-07-17 09:59:15 +08:00
samuele3hu d6d182cb59 Fix the action can’t be triggered in the TriggerTest 2014-07-16 23:18:10 +08:00
samuele3hu b782814b4b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-16 22:08:48 +08:00
samuele3hu 1b2d389011 Update ListViewEventType for Lua 2014-07-16 17:18:01 +08:00
zhangcheng 80de57be39 1、 fixes lua TriggerTest bug. 2014-07-16 14:50:35 +08:00
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
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
pandamicro 9d450d6513 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API 2014-06-24 14:57:12 +08:00
pandamicro 415f97b00f Refactor #5580: Add test case for FileUtils' file and directory manipulations 2014-06-24 14:51:35 +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
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
boyu0 1df80a8ce4 closed #5537: add test case 2014-06-12 12:57:29 +08:00
samuele3hu 6c7b538ee1 Add deprecated support for the related UI addEventListener functions 2014-06-12 12:02:22 +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
samuele3hu 2d50df8b01 Update the KeyCodeTest in the NewEventDispatcherTest 2014-06-11 10:19:07 +08:00
samuele3hu d200dd83a4 Update the KeyCodeTest in the NewEventDispatcherTest 2014-06-11 10:15:38 +08:00
samuele3hu 2252bc271b Update the KeyCodeTest in the NewEventDispatcherTest 2014-06-11 10:14:24 +08:00
samuele3hu 4ce2d7f193 Update values of KeyCode used in the Lua to fix related error 2014-06-11 10:10:11 +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
samuele3hu 5a80b4da2e Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget 2014-06-10 11:30:39 +08:00
samuele3hu f6f75e8810 Update controller.lua 2014-06-10 10:01:08 +08:00
samuele3hu cb3af59d38 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-10 09:51:50 +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
samuele3hu eba954b410 Add bytecode and encrypted files test cases for Lua 2014-06-06 17:17:43 +08:00
samuele3hu 890bc20475 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-06 11:44:23 +08:00
samuele3hu 5ab8b81205 Update control.lua for lua-tests 2014-06-06 11:42:18 +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
samuele3hu 919524cf89 Update controller.lua for lua-tests and bindings-generator submoudle 2014-06-05 14:39:09 +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
samuele3hu 90cac02de6 Update lua-template and lua-empty-test for replacing bgMusicPath 2014-05-28 10:27:03 +08:00
samuele3hu c52132179a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-28 10:05:41 +08:00
samuele3hu 04d2d4a22e Update lua-template and lua-empty-test for replacing bgMusicPath 2014-05-28 10:04:29 +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
samuele3hu 006f082f74 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-23 19:15:46 +08:00
samuele3hu 3bd196f077 Update the openGL lua binding and related test case 2014-05-23 19:12:30 +08:00
minggo 1b3a474646 Merge pull request #6891 from boyu0/3.1_test 
Roll back test_image_ar.pvr
 2014-05-23 04:25:56 -05: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
samuele3hu dc03571076 fix some bugs for lua-tests 2014-05-23 16:48:18 +08:00
samuele3hu f76e2a5476 Readd the lua binding for `visit` and modify a requirement for IDE 2014-05-23 10:00:59 +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
samuele3hu a6efd4f650 Move `setSearchPat` operation from cpp to script 2014-05-22 14:00:39 +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
samuele3hu 6c8e38871c issue #5255:Remove Sprite3D effect test 2014-05-22 10:22:10 +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
samuele3hu a2ebe428da Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-20 18:11:28 +08:00
samuele3hu 2d65f9bc6f issue #5255:Add Sprite3D test cases for Lua 2014-05-20 18:09:04 +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
andyque b89a073b90 replace texture resources 2014-05-19 12:09:55 +08:00
andyque 99f17ec88d commnet out the Renderer test in PerformanceTest 2014-05-19 11:46:32 +08:00
Ricardo Quesada 6461e26c9f Squashed commit of the following: 
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 14:03:53 2014 -0700

    More WP8 fixes

commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 12:19:41 2014 -0700

    Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d

commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 12:19:19 2014 -0700

    Adds missing resources for Windows Phone 8

commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:54:15 2014 -0700

    Updates CHANGELOG

commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:48:59 2014 -0700

    Adds Sprite3d files and tests

commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:16:13 2014 -0700

    fixes compiler warnings for windows

commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 10:53:34 2014 -0700

    fixes for Sprite3D

    Adds copyright header
    removes compilation warnings
    cleans code a bit

commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 20:46:26 2014 -0700

    Merge pull request #34 from dumganhar/pull/6731

    fix compilation error of missing bind Mesh for luabindings.

commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:45:12 2014 -0700

    use const & and changed typo

commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date:   Sat May 17 11:43:10 2014 +0800

    fix compilation error of missing bind Mesh for luabindings.

commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94 5c5a6b9
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date:   Sat May 17 11:33:01 2014 +0800

    Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731

commit 5c5a6b9bde410027db948b539bc3111dc243cf0b
Merge: d4285e3 5f41732
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:23:58 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit d4285e336808699f828b82c6b90a83b1b0c0978c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:22:49 2014 -0700

    remove empty lines

commit 5f4173271101e2411ffb6cbf600066e204df98d3
Merge: e272583 ac8cf25
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 20:15:44 2014 -0700

    Merge pull request #33 from dabingnn/mesh3d_work

    Mesh3d work

commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:14:01 2014 -0700

    added mesh3d file to template

commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 19:10:45 2014 -0700

    Merge pull request #32 from dabingnn/mesh3d_work

    Mesh3d work

commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 18:18:13 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 6a1b847065a1b9d369892ab011478c47e80c9195
Merge: 4feae11 4ece4b3
Author: Trace0429 <yangtuo0429@gmail.com>
Date:   Fri May 16 17:15:39 2014 -0700

    Merge pull request #31 from Trace0429/mesh3d_work

    windows work now

commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date:   Sat May 17 08:12:46 2014 +0800

    windows work now

commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 16:32:58 2014 -0700

    Merge pull request #30 from dabingnn/mesh3d_work

    Mesh3d work

commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:32:00 2014 -0700

    fix compile error after merge (MAC can work)

commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:24:11 2014 -0700

    Merge branch 'v3' into mesh3d_work

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/2d/cocos2d.vcxproj
    	cocos/2d/cocos2d.vcxproj.filters
    	cocos/Android.mk
    	cocos/CMakeLists.txt
    	cocos/renderer/CMakeLists.txt

commit 510fc0cea76bdedfae858bb930d98715ce54f7e9
Merge: e098ed7 7fea347
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 16:11:39 2014 -0700

    Merge pull request #29 from dabingnn/mesh3d_work

    Mesh3d work

commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:08:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:05:37 2014 -0700

    bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw

commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 16:02:27 2014 -0700

    bind buffer to 0 when finish draw

commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 14:00:38 2014 -0700

    fix outline width

commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 13:47:17 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 13:47:12 2014 -0700

    make some member protected

commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 13:06:17 2014 -0700

    Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d

commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 13:04:27 2014 -0700

    linux work now

commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:48:34 2014 -0700

    inc drawcall

commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:31:44 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 12:31:31 2014 -0700

    Merge pull request #28 from dabingnn/mesh3d_work

    Mesh3d work

commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:30:01 2014 -0700

    optimize code

commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 12:29:37 2014 -0700

    adjust code style

commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 12:06:53 2014 -0700

    Merge pull request #27 from dabingnn/mesh3d_work

    Mesh3d work

commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 12:06:02 2014 -0700

    fix visual error for outline

commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 11:54:54 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 11:54:47 2014 -0700

    fix shader, add multiple sprite to Sprite3DEffectTest

commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 11:33:31 2014 -0700

    Merge pull request #26 from dabingnn/mesh3d_work

    Mesh3d work

commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:30:34 2014 -0700

    share the same glprogram in effect3DOutline

commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:19:56 2014 -0700

    add class static variable for EffectOutline

commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837cea
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:07:04 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 213bbb0c289e579895e92620153b95a8cf374521
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:55:28 2014 -0700

    add mesh.h in cocos2d.h

commit 94d789610c9d4426b14e655a73197c652afc74f6
Merge: fa69e09 9af9da5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 10:41:24 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 10:41:05 2014 -0700

    remove namespace

commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 10:30:23 2014 -0700

    Merge pull request #25 from dabingnn/mesh3d_work

    Mesh3d work

commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:27:28 2014 -0700

    remove redundant uniform CC_Texture0

commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:20:01 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit ff15926f47edfbb1250440b060c1d887cfecd033
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 09:11:36 2014 -0700

    warning more than one texture

commit 5debbf8d6de4563361974b67aa52e572f7df9dd6
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 08:45:03 2014 -0700

    remove redundant line

commit ed357e7484a63bc3eb208d589943f802b7832e4d
Merge: a1e2306 25dd07e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 22:53:10 2014 -0700

    Merge pull request #24 from dabingnn/mesh3d_work

    Mesh3d work

commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:52:33 2014 -0700

    fix memory leak

commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:49:04 2014 -0700

    remove unused member variable

commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 22:37:16 2014 -0700

    Merge pull request #23 from dabingnn/mesh3d_work

    Mesh3d work

commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:35:48 2014 -0700

    fix memory leak

commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 20:01:49 2014 -0700

    Merge pull request #22 from dabingnn/mesh3d_work

    Mesh3d work

commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 20:01:29 2014 -0700

    android work now

commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:53:39 2014 -0700

    remove sprite3dEffect include

commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:50:17 2014 -0700

    remove unused Sprite3dEffect

commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:48:12 2014 -0700

    remove unused outline shader files

commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:43:17 2014 -0700

    fix error on IOS

commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 18:47:37 2014 -0700

    Merge pull request #21 from dabingnn/mesh3d_work

    Mesh3d work

commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:46:54 2014 -0700

    adjust indent, and line to the end of the file

commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:35:18 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

    Conflicts:
    	cocos/3d/CCSprite3D.cpp
    	cocos/3d/CCSprite3D.h
    	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:31:06 2014 -0700

    add testCase for outline

commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:03:34 2014 -0700

    extract base class Effect3D

commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 18:02:45 2014 -0700

    RendeMeshData member rename

commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 17:57:29 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date:   Thu May 15 17:54:24 2014 -0700

    Merge pull request #20 from Trace0429/mesh3d_work

    Mesh3d work

commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 17:54:03 2014 -0700

    android meshcommand

commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date:   Fri May 16 08:50:38 2014 +0800

    windows work now

commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 17:38:41 2014 -0700

    raw EffectSprite

commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 16:37:20 2014 -0700

    remove SpriteEffect from Sprite3D

commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 16:34:36 2014 -0700

    raw effectSpriteTest

commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 16:14:57 2014 -0700

    use meshcommand

commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 15:38:30 2014 -0700

    use meshcommand

commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 15:31:43 2014 -0700

    comment out effect framework

commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 15:11:25 2014 -0700

    Merge pull request #19 from dabingnn/mesh3d_work

    Mesh3d work

commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:55:06 2014 -0700

    fix compile error in testcases

commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:52:43 2014 -0700

    fix compile error after merge with v3

commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:48:19 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit d6f6f633927eb00df984ec4239555f9ce2c7e44d
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 14:26:40 2014 -0700

    Merge pull request #18 from dabingnn/mesh3d_work

    Mesh3d work

commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:25:40 2014 -0700

    move 3d shaders to shader cache

commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 13:56:00 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 13:55:49 2014 -0700

    meshcommand

commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 13:21:36 2014 -0700

    add mesh rebuild when come to foreground in android

commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 13:13:59 2014 -0700

    android work now

commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 12:21:40 2014 -0700

    Merge pull request #17 from dabingnn/mesh3d_work

    Mesh3d work

commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:19:24 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:18:49 2014 -0700

    commit the changed IOS/MAC project file

commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:17:57 2014 -0700

    remove MeshPart

commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 11:03:54 2014 -0700

    Merge pull request #16 from dabingnn/mesh3d_work

    Mesh3d work

commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 10:59:10 2014 -0700

    raw version of single Mesh

commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 10:44:04 2014 -0700

    fix outline

commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 10:09:45 2014 -0700

    without normal no outline effect

commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 22:39:03 2014 -0700

    android listenBackToForeground

commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:58:09 2014 -0700

    add boss1 with normal

commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:54:20 2014 -0700

    change cache

commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:35:59 2014 -0700

    depress no .mtl crash

commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:58:50 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:58:36 2014 -0700

    merge dabingnn

commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 15:53:58 2014 -0700

    Merge pull request #15 from dabingnn/mesh3d_work

    Mesh3d work

commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:52:58 2014 -0700

    android can work now

commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:33:07 2014 -0700

    refactoring render code

commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 15:27:21 2014 -0700

    Merge pull request #14 from dabingnn/mesh3d_work

    Mesh3d work

commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:26:19 2014 -0700

    Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work

commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:25:55 2014 -0700

    android can compile now(can not work)

commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 14:21:09 2014 -0700

    Merge pull request #13 from dabingnn/mesh3d_work

    Mesh3d work

commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 14:15:16 2014 -0700

    include Sprite3DEffect in the cocos2d header

commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 12:51:09 2014 -0700

    outline sprite

commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 10:48:55 2014 -0700

    meshvertexattrib work

commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 10:40:55 2014 -0700

    use meshvertexattribute

commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 09:41:57 2014 -0700

    Merge pull request #12 from dabingnn/mesh3d_work

    Mesh3d work

commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:40:14 2014 -0700

    remove compile error

commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:31:14 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc
Merge: da24c48 5a2127d
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 00:25:47 2014 -0700

    vertex attrib

commit da24c48c981029493900bcd2143495e546faa75e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 23:49:09 2014 -0700

    mesh vertex attribute

commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd
Merge: d98adb7 5148f76
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 19:06:38 2014 -0700

    Merge pull request #11 from dabingnn/mesh3d_work

    Mesh3d work

commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 19:05:40 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 19:04:15 2014 -0700

    fix texcoord y flipped

commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 18:35:08 2014 -0700

    Merge pull request #10 from dabingnn/mesh3d_work

    Mesh3d work

commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 18:22:16 2014 -0700

    added blendFunc

commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 16:03:01 2014 -0700

    Merge pull request #9 from dabingnn/mesh3d_work

    Mesh3d work

commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 16:01:59 2014 -0700

    fix compile error after merge

commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 15:56:46 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit da7d6a087f22f4a11827ff3410fbcd2561f155fc
Merge: 0caad32 f413b4e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 14:19:24 2014 -0700

    Merge pull request #8 from dabingnn/mesh3d_work

    Mesh3d work

commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 14:17:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 14:15:06 2014 -0700

    add new interface for createSprite3D

commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 13:58:35 2014 -0700

    default GLProgram to object

commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 13:13:24 2014 -0700

    remove compile warning

commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 13:01:20 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 12:59:59 2014 -0700

    rename init->initWithFile in Sprite3D

commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 12:58:23 2014 -0700

    Merge pull request #7 from super626/mesh3d_tmp

    Mesh3d

commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 12:56:06 2014 -0700

    Merge branch 'mesh3d_tmp' into mesh3d

commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:59:46 2014 -0700

    Merge pull request #6 from dabingnn/mesh3d_work

    Mesh3d work

commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:53:17 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:52:41 2014 -0700

    adjust line indent and header file define

commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 11:44:22 2014 -0700

    using vbo

commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:42:10 2014 -0700

    Merge pull request #5 from dabingnn/mesh3d_work

    Mesh3d work

commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:39:06 2014 -0700

    add CCSprite3d include into cocos2d.h

commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:33:18 2014 -0700

    remove cocos2d.h include in Sprite3DTest.h

commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:28:47 2014 -0700

    Merge pull request #4 from dabingnn/mesh3d

    Mesh3d

commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:26:40 2014 -0700

    fix compile error after rename

commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:07:30 2014 -0700

    rename FileXXX to CCFileXXX

commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 10:52:36 2014 -0700

    rename _model to _mesh

commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Mon May 12 22:23:59 2014 -0700

    Merge pull request #3 from dabingnn/mesh3d

    Mesh3d

commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 22:21:22 2014 -0700

    fix retain/release in sprite3D

commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 20:04:16 2014 -0700

    remove compile warnings

commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 19:16:25 2014 -0700

    using glprogramstate work ok

commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 18:38:52 2014 -0700

    add obj

commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 18:33:23 2014 -0700

    use glprogramstate

commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 13:01:56 2014 -0700

    sprite3d

commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Mon May 12 10:52:17 2014 -0700

    Merge pull request #1 from dabingnn/newcode

    Newcode

commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 10:50:14 2014 -0700

    Merge branch 'v3' into newcode

commit 23a5232fe5bb4c0b0bc821d1945426486dafe253
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 09:44:41 2014 -0700

    3d mesh initial code
 2014-05-18 14:49:16 -07:00
vision 81ddbaa7b1 update the calculation of device pixel resolution 2014-05-19 01:12:56 +08:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
minggo e3f2c3985d Merge pull request #6777 from boyu0/physics_rollback_for_lua 
Roll back lua PhysicsTest.
 2014-05-16 21:55:52 +08:00
boyu0 74335a92f7 Roll back lua PhysicsTest. 2014-05-16 17:19:02 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +08:00
Ricardo Quesada 7e4597508c Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
Ricardo Quesada f9f0142842 default value is 0.5 for interpolation 2014-05-15 16:52:15 -07:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
Ricardo Quesada e5494cd9e5 multiple pass sprite 
on ShaderSprite2.cpp
 2014-05-15 13:13:31 -07:00
samuele3hu cde4e4811b Update some GuiConstants and resubmission pr#6361. 2014-05-15 16:54:55 +08:00
samuele3hu 5a14b1d67b fix compile error and synchronizate the UI change for Lua 2014-05-15 15:39:15 +08:00
Ricardo Quesada 1c13f901ae Even better shader test 2014-05-14 16:55:57 -07:00
Ricardo Quesada 839170c147 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
Ricardo Quesada dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
zifter 6fcef92708 Fix Progress Action. 2014-05-14 19:13:14 +03:00
vision 90e2b8a4af move the method from ccUtils to Director 2014-05-14 19:42:24 +08:00
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