Huabing.Xu
|
b4526bd9e0
|
spine runs on android platform
|
2014-10-15 11:48:47 +08:00 |
Huabing.Xu
|
93158a1cfb
|
update spine runtime and test case
|
2014-10-15 11:23:02 +08:00 |
samuele3hu
|
83d210ce7d
|
Update the Xcode project setting for related test cases
|
2014-10-15 11:18:22 +08:00 |
Dale Stammen
|
2ca1479840
|
updated WP8 test project files
|
2014-10-14 16:53:31 -07:00 |
Anton Sokolchenko
|
fc35cc2efe
|
CMake fix for Mac Os X.
You can open project with CLion and see that everything works.
|
2014-10-15 00:19:29 +03:00 |
samuele3hu
|
735e86788e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
|
2014-10-14 21:36:44 +08:00 |
samuele3hu
|
3b4fbd8fff
|
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
|
2014-10-14 21:34:55 +08:00 |
Huabing.Xu
|
a20b8d671c
|
sprite lamp (works on iOS mac and android)
|
2014-10-14 16:54:52 +08:00 |
songchengjiang
|
081196c933
|
fixed BillBoard
Added New Test case
|
2014-10-14 15:08:36 +08:00 |
minggo
|
0ab3017094
|
Merge pull request #8658 from pipu/v3_pipu
V3 pipu
|
2014-10-14 14:25:46 +08:00 |
songchengjiang
|
ecd63db80b
|
Fixing bug
|
2014-10-13 19:10:42 +08:00 |
minggo
|
0351000c97
|
Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap
V3 add staggered tile map
|
2014-10-13 13:50:50 +08:00 |
pipu
|
e7385cd634
|
Merge branch 'v3_pipu' of https://github.com/pipu/cocos2d-x into v3_pipu
|
2014-10-12 17:53:07 +08:00 |
pipu
|
5d2d78c5bb
|
1. 10755-》10644
|
2014-10-12 17:52:51 +08:00 |
pipu
|
7d21dcb095
|
1. fix git error
|
2014-10-12 17:51:34 +08:00 |
pipu
|
9503253a17
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
|
2014-10-12 17:44:28 +08:00 |
pipu
|
50dee1a214
|
Reverting tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
|
2014-10-12 15:53:32 +08:00 |
pipu
|
86aee1e548
|
Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk
|
2014-10-12 15:39:22 +08:00 |
minggo
|
c01d1b1166
|
Merge pull request #8646 from huangshiwu/v3_languagecode
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
|
2014-10-11 16:23:49 +08:00 |
minggo
|
2db8217b09
|
Merge pull request #8543 from Dhilan007/v3-fixwarns
fix warns and memory leak
|
2014-10-11 16:07:54 +08:00 |
huangshiwu
|
4dd9120e67
|
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
|
2014-10-11 15:19:20 +08:00 |
Huabing.Xu
|
7747e2ecf5
|
Merge branch 'v3' into v3_addStaggeredTileMap
|
2014-10-11 15:15:12 +08:00 |
Huabing.Xu
|
55431d6a83
|
add tile map staggered test
|
2014-10-11 15:09:58 +08:00 |
samuele3hu
|
b064d9bbf8
|
Update project setting for Linux and Win32
|
2014-10-11 14:28:07 +08:00 |
Huabing.Xu
|
0e1b680ab2
|
Revert "add test case for staggered map"
This reverts commit 4bbae0d9c5 .
|
2014-10-11 14:24:38 +08:00 |
samuele3hu
|
9b9b9d9700
|
Fix the lua-tests compile error
|
2014-10-11 14:14:08 +08:00 |
pipu
|
b732ce378e
|
Merge branch 'v3_pipu_protocol_buffers' into merge_test
Conflicts:
cocos/ui/UIScale9Sprite.cpp
|
2014-10-11 11:08:46 +08:00 |
pipu
|
ffd83bbdd0
|
Modifying win32 and wp8 protocol buffers lib
|
2014-10-10 22:38:34 +08:00 |
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 |
Huabing.Xu
|
4bbae0d9c5
|
add test case for staggered map
|
2014-10-10 17:29:13 +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 |
minggo
|
01e3ae2c61
|
Merge pull request #8606 from andyque/fixButtonContentSize
fix button title only content size issue
|
2014-10-10 15:23:25 +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 |
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 |