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

1200 Commits

Author SHA1 Message Date
andyque 59ff2fbf72 remove dead code 2014-10-10 18:08:25 +08:00
andyque 0f0c3878e5 add more indicator 2014-10-10 17:36:33 +08:00
andyque fb1adb5b90 add issue tests skeleton 2014-10-10 17:07:08 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
 2014-10-10 17:02:45 +08:00
andyque da48649370 fix button title only content size issue 2014-10-10 11:01:51 +08:00
pipu ee624e47cc 1. Modifying UIScale9Sprite 
2. Updating UI Test
3. Updatding resource of ActionTimeline
 2014-10-10 10:44:16 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
minggo f928046f50 Merge pull request #8580 from Dhilan007/v3-labelfix 
issue #8492:fix endless loop when dimensions that are not enough to fit one character
 2014-10-09 17:05:39 +08:00
Ricardo Quesada 27cb6afb5e fixes warnings on Android 2014-10-08 18:55:33 -07:00
Dhilan007 8ea473de7b fix endless loop when dimensions that are not enough to fit one character 2014-10-08 18:22:35 +08:00
Ricardo Quesada 84da993677 more samples using node::schedule(labmda) 2014-10-03 17:11:39 -07:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada 42ace3e59c Adds lambda support in node 
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
 2014-10-02 21:25:55 -07:00
minggo 44aba5b2af Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements 
Scale9Sprite improvements
 2014-09-30 17:09:02 +08:00
Dhilan007 90769ef242 fix compile error on win32 2014-09-30 14:40:24 +08:00
Dhilan007 02fcb6488a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
 2014-09-30 14:19:27 +08:00
Dhilan007 18307d52da fix macro 2014-09-30 09:48:24 +08:00
Dhilan007 7ebe4a5548 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/audio/AudioEngine.cpp
	cocos/audio/apple/AudioPlayer.h
	cocos/audio/include/AudioEngine.h
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
 2014-09-30 09:45:47 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
Ricardo Quesada a16c5d5e43 Adds missing includes 2014-09-29 14:45:43 -03:00
Dhilan007 f2f1331026 New Audio Engine[Win32] 2014-09-29 10:15:41 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
Sergey Perepelitsa 094716a500 Scale9Sprite cropped frames tests 2014-09-28 01:58:26 +04:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao bf84aba47e do not add ambient color by default 2014-09-25 16:27:31 +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
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
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
Guy Kogus 908311ff7f Added tests for opening a URL. 2014-09-22 17:51:05 +04:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +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
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
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 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
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
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +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
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 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
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
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
yangxiao 730ab846c3 code adjustment 2014-09-05 14:59:14 +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 ed63f01c7e seperate billboard test from Sprite3D test 2014-09-04 16:27:18 +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 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
songchengjiang 18d06015c6 Added More Models 
Code optimization
 2014-09-02 11:24:19 +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
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 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
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
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
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
songchengjiang 1a1ccda3ed repaired Action BUG 2014-08-25 13:58:15 +08:00
yangxiao 8bfd56c080 use normal walk 2014-08-25 11:31:38 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08: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
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
minggo a0b19db670 Merge pull request #7840 from minggo/fix-warning 
fix warnings
 2014-08-22 13:41:31 +08:00
yangxiao 2d5431353a engine adjust 2014-08-22 13:25:26 +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
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
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
yangxiao 54423efe9f fix reskin 2014-08-19 15:25:00 +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
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
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 db17084b6d fix warnings 2014-08-15 12:06:16 +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 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
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
yangxiao 6d15c26a61 move create default camera to Scene::initWithSize 2014-08-11 10:55:14 +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
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
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
minggo 4542b1882d Merge pull request #7617 from rny/SpriteFrameCache 
SpriteFrameCache load from plist file content data
 2014-08-07 10:20:36 +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
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +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
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
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +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 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 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
boyu0 1b6cda488a add ParticleResetTotalParticles test. 2014-07-29 11:21:11 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +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
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
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
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
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
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +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
vision c29766a4ad disable FastTileMapTest on WP8 2014-07-17 12:56:58 +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
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
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
andyque 52596dc97f fix Text line wrap issue 2014-07-15 11:46:53 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
minggo 6d063fb97b Merge pull request #7431 from andyque/addTextFieldTTFTest 
add TextField TrueTypeFont tests
 2014-07-14 16:31:36 +08:00
Dhilan007 a5317dde87 fixed using the incorrect res in test case of 'TextureMemoryAlloc'. 2014-07-14 15:50:20 +08:00
andyque 4fe3723edf add TextField TrueTypeFont tests 2014-07-14 14:29:28 +08:00
minggo 3b59b41116 3D:Sprite3D -> Node:Sprite3D 2014-07-12 22:26:46 +08:00
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +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
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
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 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
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
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
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
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
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
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
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
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +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
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
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