pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
|
pandamicro
|
fa46a0abb4
|
Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-25 09:52:00 +08:00 |
|
Dale Stammen
|
8940eb829f
|
added missing cocostudio files
|
2015-07-24 04:48:14 -07:00 |
|
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
|
Dale Stammen
|
c3935b921c
|
updated version to 3.7.1
|
2015-07-23 13:02:42 -07:00 |
|
Dale Stammen
|
f91e812924
|
updated version to 3.8
|
2015-07-23 12:40:36 -07:00 |
|
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
|
Neo Kim
|
86cbd59bfd
|
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
|
2015-07-04 09:56:53 +09:00 |
|
Neo Kim
|
a64e50688e
|
Add the new files into CMake and Windows project configurations.
|
2015-07-01 12:21:42 +09:00 |
|
Dale Stammen
|
9ef92b71dd
|
added missing external/clipper files. Removed obsolete files
|
2015-06-17 11:40:38 -07:00 |
|
Dale Stammen
|
0781978788
|
added librecast. Updated build properties
|
2015-06-15 18:44:14 -07:00 |
|
Dale Stammen
|
03fc2eca5e
|
added missing navmesh files
|
2015-06-15 18:19:28 -07:00 |
|
Vincent Yang
|
097bf455c2
|
Rename CCRenderBufferObject to CCRenderBuffer in windows projects.
|
2015-06-11 11:45:10 +08:00 |
|
Dale Stammen
|
3f3ace05a7
|
added ogg support for Windows 10 UWP
|
2015-06-04 14:42:11 -07:00 |
|
Dale Stammen
|
8584f5f399
|
removed old WP8 files
|
2015-05-28 15:03:36 -07:00 |
|
Dale Stammen
|
dadbbc18d6
|
added Windows 10 UWP project files
|
2015-05-28 13:51:25 -07:00 |