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 |
samuele3hu
|
f97a7ae52d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-10-10 09:52:29 +08:00 |
samuele3hu
|
115d81574c
|
Add CameraTest、OBBTest and related lua bindings
|
2014-10-10 09:49:25 +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 |
martell
|
73980195c0
|
wp8: use CC_STATIC because libs are static
|
2014-10-09 06:33:46 +01: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 |
Ricardo Quesada
|
12e9d18ab7
|
Compiles on Windows Phone 8
|
2014-10-01 19:08:34 -07:00 |
minggo
|
44aba5b2af
|
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
Scale9Sprite improvements
|
2014-09-30 17:09:02 +08:00 |
Sergey Perepelitsa
|
d9204b009e
|
scale9Sprite without scale9enabled scale fix
scale9Sprite crop > border tile bug fix
|
2014-09-30 10:59:20 +04: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 |
minggo
|
d1e41c771b
|
Merge pull request #8162 from super626/light
3D Light
|
2014-09-30 11:13:59 +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 |
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 |